improve test readability

jaspernbrouwer · Feb 11, 2016 · 0feaf92 · 0feaf92
1 parent ae78575
commit 0feaf92
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
@@ -384,17 +384,17 @@ public function testManyToManyOrderByIsNotIgnored()
     {
         $user = $this->addCmsUserGblancoWithGroups(1);
 
-        $group = new CmsGroup;
-        $group->name = 'C';
-        $user->addGroup($group);
+        $group1 = new CmsGroup;
+        $group2 = new CmsGroup;
+        $group3 = new CmsGroup;
 
-        $group = new CmsGroup;
-        $group->name = 'A';
-        $user->addGroup($group);
+        $group1->name = 'C';
+        $group2->name = 'A';
+        $group3->name = 'B';
 
-        $group = new CmsGroup;
-        $group->name = 'B';
-        $user->addGroup($group);
+        $user->addGroup($group1);
+        $user->addGroup($group2);
+        $user->addGroup($group3);
 
         $this->_em->persist($user);
         $this->_em->flush();
@@ -405,14 +405,17 @@ public function testManyToManyOrderByIsNotIgnored()
 
         $criteria = Criteria::create()
             ->orderBy(['name' => Criteria::ASC]);
-        $groups   = $user->getGroups()->matching($criteria);
 
-        $existingOrder = [];
-        foreach ($groups as $group) {
-            $existingOrder[] = $group->getName();
-        }
-
-        $this->assertEquals(['A', 'B', 'C', 'Developers_0'], $existingOrder);
+        $this->assertEquals(
+            ['A', 'B', 'C', 'Developers_0'],
+            $user
+                ->getGroups()
+                ->matching($criteria)
+                ->map(function (CmsGroup $group) {
+                    return $group->getName();
+                })
+                ->toArray()
+        );
     }
 
     public function testMatchingWithLimit()