Fix assertions on Sets

Author: clue

tests/GroupsTest.php

@@ -14,7 +14,7 @@ public function testGraphEmpty()
         $this->assertEquals(array(), $alg->getGroups());
         $this->assertEquals(0, $alg->getNumberOfGroups());
 
-        $this->assertEquals(array(), $alg->getVerticesGroup(123));
+        $this->assertTrue($alg->getVerticesGroup(123)->isEmpty());
 
         $this->assertFalse($alg->isBipartit());
     }
@@ -32,8 +32,8 @@ public function testGraphPairIsBipartit()
         $this->assertEquals(array(1, 2), $alg->getGroups());
         $this->assertEquals(2, $alg->getNumberOfGroups());
 
-        $this->assertEquals(array(), $alg->getVerticesGroup(123));
-        $this->assertEquals(array(1 => $v1), $alg->getVerticesGroup(1));
+        $this->assertTrue($alg->getVerticesGroup(123)->isEmpty());
+        $this->assertEquals(array(1 => $v1), $alg->getVerticesGroup(1)->getMap());
 
         $this->assertTrue($alg->isBipartit());
     }
@@ -54,8 +54,8 @@ public function testGraphTriangleCycleIsNotBipartit()
         $this->assertEquals(array(1, 2), $alg->getGroups());
         $this->assertEquals(2, $alg->getNumberOfGroups());
 
-        $this->assertEquals(array(), $alg->getVerticesGroup(123));
-        $this->assertEquals(array(1 => $v1, 3 => $v3), $alg->getVerticesGroup(1));
+        $this->assertTrue($alg->getVerticesGroup(123)->isEmpty());
+        $this->assertEquals(array(1 => $v1, 3 => $v3), $alg->getVerticesGroup(1)->getMap());
 
         $this->assertFalse($alg->isBipartit());
     }

tests/ParallelTest.php

@@ -27,8 +27,8 @@ public function testDirectedCycleIsNotConsideredParallel()
         $alg = new AlgorithmParallel($graph);
 
         $this->assertFalse($alg->hasEdgeParallel());
-        $this->assertEquals(array(), $alg->getEdgesParallelEdge($e1));
-        $this->assertEquals(array(), $alg->getEdgesParallelEdge($e2));
+        $this->assertEquals(array(), $alg->getEdgesParallelEdge($e1)->getVector());
+        $this->assertEquals(array(), $alg->getEdgesParallelEdge($e2)->getVector());
     }
 
     public function testDirectedParallelEdge()
@@ -44,8 +44,8 @@ public function testDirectedParallelEdge()
         $alg = new AlgorithmParallel($graph);
 
         $this->assertTrue($alg->hasEdgeParallel());
-        $this->assertEquals(array($e2), $alg->getEdgesParallelEdge($e1));
-        $this->assertEquals(array($e1), $alg->getEdgesParallelEdge($e2));
+        $this->assertEquals(array($e2), $alg->getEdgesParallelEdge($e1)->getVector());
+        $this->assertEquals(array($e1), $alg->getEdgesParallelEdge($e2)->getVector());
     }
 
     public function testMixedParallelEdge()
@@ -61,8 +61,8 @@ public function testMixedParallelEdge()
         $alg = new AlgorithmParallel($graph);
 
         $this->assertTrue($alg->hasEdgeParallel());
-        $this->assertEquals(array($e2), $alg->getEdgesParallelEdge($e1));
-        $this->assertEquals(array($e1), $alg->getEdgesParallelEdge($e2));
+        $this->assertEquals(array($e2), $alg->getEdgesParallelEdge($e1)->getVector());
+        $this->assertEquals(array($e1), $alg->getEdgesParallelEdge($e2)->getVector());
     }
 
     public function testMixedParallelEdgesMultiple()
@@ -86,12 +86,12 @@ public function testMixedParallelEdgesMultiple()
         $alg = new AlgorithmParallel($graph);
 
         $this->assertTrue($alg->hasEdgeParallel());
-        $this->assertEquals(array($e2, $e3, $e4), $alg->getEdgesParallelEdge($e1));
-        $this->assertEquals(array($e1, $e3, $e4), $alg->getEdgesParallelEdge($e2));
-        $this->assertEquals(array($e1, $e2, $e4, $e5, $e6), $alg->getEdgesParallelEdge($e3));
-        $this->assertEquals(array($e1, $e2, $e3, $e5, $e6), $alg->getEdgesParallelEdge($e4));
-        $this->assertEquals(array($e3, $e4, $e6), $alg->getEdgesParallelEdge($e5));
-        $this->assertEquals(array($e3, $e4, $e5), $alg->getEdgesParallelEdge($e6));
+        $this->assertEquals(array($e2, $e3, $e4), $alg->getEdgesParallelEdge($e1)->getVector());
+        $this->assertEquals(array($e1, $e3, $e4), $alg->getEdgesParallelEdge($e2)->getVector());
+        $this->assertEquals(array($e1, $e2, $e4, $e5, $e6), $alg->getEdgesParallelEdge($e3)->getVector());
+        $this->assertEquals(array($e1, $e2, $e3, $e5, $e6), $alg->getEdgesParallelEdge($e4)->getVector());
+        $this->assertEquals(array($e3, $e4, $e6), $alg->getEdgesParallelEdge($e5)->getVector());
+        $this->assertEquals(array($e3, $e4, $e5), $alg->getEdgesParallelEdge($e6)->getVector());
     }
 
 }

tests/Property/PropertyGraphTest.php

@@ -7,7 +7,7 @@ class PropertyGraphTest extends TestCase
 {
     public function testEmptyIsEdgeless()
     {
-        $graph = new Graph($graph);
+        $graph = new Graph();
 
         $alg = new GraphProperty($graph);
 

tests/Property/WalkPropertyTest.php

@@ -94,7 +94,7 @@ public function testCircuit()
         // 1 -> 2 -> 2 -> 1
         $walk = Walk::factoryFromEdges(array($e1, $e3, $e2), $v1);
 
-        $this->assertEquals(array(1, 2, 2, 1), $walk->getVerticesSequenceId());
+        $this->assertEquals(array(1, 2, 2, 1), $walk->getVertices()->getIds());
 
         $alg = new WalkProperty($walk);
 
@@ -116,7 +116,7 @@ public function testNonCircuit()
         // 1 -> 2 -> 2 -> 2 -> 1
         $walk = Walk::factoryFromEdges(array($e1, $e3, $e3, $e2), $v1);
 
-        $this->assertEquals(array(1, 2, 2, 2, 1), $walk->getVerticesSequenceId());
+        $this->assertEquals(array(1, 2, 2, 2, 1), $walk->getVertices()->getIds());
 
         $alg = new WalkProperty($walk);