Merge pull request #9172 from IoannisPanagiotas/minor-test-rewr

clean up test
neo4j · Jun 10, 2024 · fb88eab · fb88eab
2 parents 22ca67e + f0214ad
commit fb88eab
Showing 1 changed file with 33 additions and 26 deletions.
diff --git a/algo/src/test/java/org/neo4j/gds/dag/topologicalsort/TopologicalSortTest.java b/algo/src/test/java/org/neo4j/gds/dag/topologicalsort/TopologicalSortTest.java
@@ -26,6 +26,7 @@
 import org.neo4j.gds.collections.ha.HugeLongArray;
 import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.compat.TestLog;
+import org.neo4j.gds.core.concurrency.Concurrency;
 import org.neo4j.gds.core.utils.progress.EmptyTaskRegistryFactory;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.extension.GdlExtension;
@@ -43,14 +44,7 @@
 
 @GdlExtension
 class TopologicalSortTest {
-    private static final TopologicalSortBaseConfig CONFIG = new TopologicalSortStreamConfigImpl.Builder()
-        .concurrency(4)
-        .computeMaxDistanceFromSource(true)
-        .build();
-    private static final TopologicalSortBaseConfig BASIC_CONFIG = new TopologicalSortStreamConfigImpl.Builder()
-        .concurrency(4)
-        .build();
-
+
     @GdlGraph(graphNamePrefix = "basic")
     private static final String basicQuery =
         "CREATE" +
@@ -71,8 +65,8 @@ void shouldSortRight() {
         TopologicalSort ts = new TopologicalSort(
             basicGraph,
             ProgressTracker.NULL_TRACKER,
-            CONFIG.concurrency(),
-            CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            true,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -120,8 +114,8 @@ void allCycleShouldGiveEmptySorting() {
         TopologicalSort ts = new TopologicalSort(
             allCycleGraph,
             ProgressTracker.NULL_TRACKER,
-            BASIC_CONFIG.concurrency(),
-            BASIC_CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            false,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -135,8 +129,8 @@ void shouldNotAllocateArraysOnBasicConfig() {
         TopologicalSort ts = new TopologicalSort(
             allCycleGraph,
             ProgressTracker.NULL_TRACKER,
-            BASIC_CONFIG.concurrency(),
-            BASIC_CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            false,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -161,8 +155,8 @@ void shouldNotAllocateArraysOnBasicConfig() {
     void ShouldExcludeSelfLoops() {
         TopologicalSort ts = new TopologicalSort(selfLoopGraph,
             ProgressTracker.NULL_TRACKER,
-            CONFIG.concurrency(),
-            CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            true,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -245,8 +239,8 @@ void hundredShouldComeLast() {
         long nodeCount = lastGraph.nodeCount();
         TopologicalSort ts = new TopologicalSort(lastGraph,
             ProgressTracker.NULL_TRACKER,
-            CONFIG.concurrency(),
-            CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            true,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -335,8 +329,8 @@ void hundredShouldComeLast() {
     void shouldNotIncludeCycles() {
         TopologicalSort ts = new TopologicalSort(cyclesGraph,
             ProgressTracker.NULL_TRACKER,
-            CONFIG.concurrency(),
-            CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            true,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -378,8 +372,8 @@ void randomShouldContainAllNodesOnDag() {
 
         TopologicalSort ts = new TopologicalSort(graph,
             ProgressTracker.NULL_TRACKER,
-            BASIC_CONFIG.concurrency(),
-            BASIC_CONFIG.computeMaxDistanceFromSource(),
+            new Concurrency(4),
+            false,
             TerminationFlag.RUNNING_TRUE
         );
         TopologicalSortResult result = ts.compute();
@@ -397,24 +391,37 @@ void stableShouldContainAllNodesOnDag() {
             .build()
             .generate();
 
-        TopologicalSort ts = new TopologicalSortFactory<>().build(graph, BASIC_CONFIG, ProgressTracker.NULL_TRACKER);
+        TopologicalSort ts =  new TopologicalSort(
+            graph,
+            ProgressTracker.NULL_TRACKER,
+            new Concurrency(4),
+            false,
+            TerminationFlag.RUNNING_TRUE
+        );
+
         TopologicalSortResult result = ts.compute();
         assertEquals(1000_000, result.size());
     }
 
     @Test
     void shouldLogProgress() {
         var tsFactory = new TopologicalSortFactory<>();
-        var progressTask = tsFactory.progressTask(lastGraph, BASIC_CONFIG);
+        var progressTask = tsFactory.progressTask(lastGraph, null);
         var log = Neo4jProxy.testLog();
         var testTracker = new TestProgressTracker(
             progressTask,
             log,
-            BASIC_CONFIG.concurrency(),
+            new Concurrency(4),
             EmptyTaskRegistryFactory.INSTANCE
         );
 
-        TopologicalSort ts = tsFactory.build(lastGraph, BASIC_CONFIG, testTracker);
+        TopologicalSort ts =  new TopologicalSort(
+            lastGraph,
+            testTracker,
+            new Concurrency(4),
+            false,
+            TerminationFlag.RUNNING_TRUE
+        );
         ts.compute();
 
         String taskName = tsFactory.taskName();