[tests] simplify grouped sortable position test

l3l0 · Jul 30, 2013 · 7ba748c · 7ba748c
1 parent 5a6ab37
commit 7ba748c
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/tests/Gedmo/Sortable/SortableTest.php b/tests/Gedmo/Sortable/SortableTest.php
@@ -118,15 +118,14 @@ public function shouldShiftPositionForward()
         $nodes = $repo->getBySortableGroups(array('path' => '/'));
 
         $this->assertEquals('Node1', $nodes[0]->getName());
-        $this->assertEquals(0, $nodes[0]->getPosition());
         $this->assertEquals('Node3', $nodes[1]->getName());
-        $this->assertEquals(1, $nodes[1]->getPosition());
         $this->assertEquals('Node4', $nodes[2]->getName());
-        $this->assertEquals(2, $nodes[2]->getPosition());
         $this->assertEquals('Node2', $nodes[3]->getName());
-        $this->assertEquals(3, $nodes[3]->getPosition());
         $this->assertEquals('Node5', $nodes[4]->getName());
-        $this->assertEquals(4, $nodes[4]->getPosition());
+
+        for ($i = 0; $i < count($nodes); $i++) {
+            $this->assertSame($i, $nodes[$i]->getPosition());
+        }
     }
 
     /**
@@ -161,20 +160,20 @@ public function shouldShiftPositionBackward()
         $node2->setPosition(1);
         $this->em->persist($node2);
         $this->em->flush();
+        $this->em->clear(); // to reload from database
 
         $repo = $this->em->getRepository(self::NODE);
         $nodes = $repo->getBySortableGroups(array('path' => '/'));
 
         $this->assertEquals('Node1', $nodes[0]->getName());
-        $this->assertEquals(0, $nodes[0]->getPosition());
         $this->assertEquals('Node4', $nodes[1]->getName());
-        $this->assertEquals(1, $nodes[1]->getPosition());
         $this->assertEquals('Node2', $nodes[2]->getName());
-        $this->assertEquals(2, $nodes[2]->getPosition());
         $this->assertEquals('Node3', $nodes[3]->getName());
-        $this->assertEquals(3, $nodes[3]->getPosition());
         $this->assertEquals('Node5', $nodes[4]->getName());
-        $this->assertEquals(4, $nodes[4]->getPosition());
+
+        for ($i = 0; $i < count($nodes); $i++) {
+            $this->assertSame($i, $nodes[$i]->getPosition());
+        }
     }
 
     /**