Merge remote-tracking branch 'origin/MAGETWO-42577' into W1

Maksym Aposov · Maksym Aposov · commit ebbf0e61fae1 · 2016-03-16T16:09:57.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/Model/ResourceModel/Product/Type/Grouped/AssociatedProductsCollectionTest.php
@@ -30,8 +30,9 @@ public function testGetColumnValues()
         $resultData = $collection->getColumnValues('sku');
         $this->assertNotEmpty($resultData);
 
-        foreach (['simple-1', 'virtual-product'] as $skuExpected) {
-            $this->assertTrue(in_array($skuExpected, $resultData));
-        }
+        $expected = ['virtual-product', 'simple-1'];
+        sort($expected);
+        sort($resultData);
+        $this->assertEquals($expected, $resultData);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,9 @@ public function testGetColumnValues()`
`30`	`30`	`$resultData = $collection->getColumnValues('sku');`
`31`	`31`	`$this->assertNotEmpty($resultData);`
`32`	`32`
`33`		`- foreach (['simple-1', 'virtual-product'] as $skuExpected) {`
`34`		`- $this->assertTrue(in_array($skuExpected, $resultData));`
`35`		`- }`
	`33`	`+ $expected = ['virtual-product', 'simple-1'];`
	`34`	`+ sort($expected);`
	`35`	`+ sort($resultData);`
	`36`	`+ $this->assertEquals($expected, $resultData);`
`36`	`37`	`}`
`37`	`38`	`}`