Skip to content

Commit 9f019e3

Browse files
soerenreichardtjjaderberg
authored andcommitted
Fix failing tests
1 parent e28c46a commit 9f019e3

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

core/src/test/java/org/neo4j/gds/core/utils/progress/BaseTaskRegistryExtensionTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@ void test() throws Exception {
6464

6565
public static class AlgoProc {
6666
@Context
67-
public TaskRegistry taskRegistry;
67+
public TaskRegistryFactory taskRegistryFactory;
6868

6969
@Procedure("gds.test.algo")
7070
public Stream<Bar> foo() {
7171
var task = Tasks.leaf("foo");
72+
var taskRegistry = taskRegistryFactory.newInstance();
7273
taskRegistry.registerTask(task);
7374
return Stream.empty();
7475
}

proc/pregel/src/test/java/org/neo4j/gds/pregel/proc/PregelProcTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,7 @@ void cleanupTaskRegistryWhenTheAlgorithmFailsInStreamMode() {
228228
);
229229

230230
assertThatThrownBy(() -> proc.stream(config, Map.of())).isNotNull();
231-
// TODO: set to 1 once tracking is implemented
232-
assertThat(taskStore.storeTaskCalls()).isEqualTo(0);
231+
assertThat(taskStore.storeTaskCalls()).isEqualTo(1);
233232
}
234233
}
235234

@@ -252,8 +251,7 @@ void cleanupTaskRegistryWhenTheAlgorithmFailsInWriteMode() {
252251
);
253252

254253
assertThatThrownBy(() -> proc.write(config, Map.of())).isNotNull();
255-
// TODO: set to 1 once tracking is implemented
256-
assertThat(taskStore.storeTaskCalls()).isEqualTo(0);
254+
assertThat(taskStore.storeTaskCalls()).isEqualTo(1);
257255
}
258256
}
259257

@@ -277,8 +275,7 @@ void cleanupTaskRegistryWhenTheAlgorithmFailsInMutateMode() {
277275
);
278276

279277
assertThatThrownBy(() -> proc.mutate(graphName, config)).isNotNull();
280-
// TODO: set to 1 once tracking is implemented
281-
assertThat(taskStore.storeTaskCalls()).isEqualTo(0);
278+
assertThat(taskStore.storeTaskCalls()).isEqualTo(1);
282279
}
283280
}
284281

proc/test/src/main/java/org/neo4j/gds/AlgoBaseProcTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.neo4j.gds.core.utils.progress.EmptyTaskRegistryFactory;
4545
import org.neo4j.gds.core.utils.progress.GlobalTaskStore;
4646
import org.neo4j.gds.core.utils.progress.JobId;
47-
import org.neo4j.gds.core.utils.progress.LocalTaskRegistry;
47+
import org.neo4j.gds.core.utils.progress.TaskRegistry;
4848
import org.neo4j.gds.core.utils.progress.tasks.Task;
4949
import org.neo4j.gds.core.write.NativeNodePropertyExporter;
5050
import org.neo4j.gds.core.write.NativeRelationshipExporter;
@@ -292,7 +292,7 @@ default void shouldUnregisterTaskAfterComputation() {
292292
String loadedGraphName = "loadedGraph";
293293
GraphCreateConfig graphCreateConfig = withNameAndRelationshipProjections("", loadedGraphName, relationshipProjections());
294294
applyOnProcedure(proc -> {
295-
proc.taskRegistryFactory = () -> new LocalTaskRegistry("", taskStore);
295+
proc.taskRegistryFactory = () -> new TaskRegistry("", taskStore);
296296

297297
GraphStore graphStore = graphLoader(graphCreateConfig).graphStore();
298298
GraphStoreCatalog.set(

0 commit comments

Comments
 (0)