Merge remote-tracking branch 'origin/MAGETWO-37224-variable-coverage' into MAGETWO-36484-unit-coverage

Dale Sikkema · Dale Sikkema · commit 3002a7eb7dae · 2015-06-11T15:52:18.000-05:00
diff --git a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
@@ -75,7 +75,7 @@ public function testGetValueText()
     }
 
     /**
-     * @dataProvider missingInfoProvider
+     * @dataProvider validateMissingInfoDataProvider
      */
     public function testValidateMissingInfo($code, $name)
     {
@@ -85,7 +85,7 @@ public function testValidateMissingInfo($code, $name)
     }
 
     /**
-     * @dataProvider variableAndIdProvider
+     * @dataProvider validateDataProvider
      */
     public function testValidate($variableArray, $objectId, $expectedResult)
     {
@@ -156,7 +156,7 @@ public function testGetVariablesOptionArrayWithGroup()
         $this->assertEquals($transformedOptions, $mockVariable->getVariablesOptionArray(true));
     }
 
-    public function variableAndIdProvider()
+    public function validateDataProvider()
     {
         $variable = [
             'variable_id' => 'matching_id',
@@ -168,7 +168,7 @@ public function variableAndIdProvider()
         ];
     }
 
-    public function missingInfoProvider()
+    public function validateMissingInfoDataProvider()
     {
         return [
             'Missing code' => ['', 'some-name'],

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function testGetValueText()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`78`		`- * @dataProvider missingInfoProvider`
	`78`	`+ * @dataProvider validateMissingInfoDataProvider`
`79`	`79`	`*/`
`80`	`80`	`public function testValidateMissingInfo($code, $name)`
`81`	`81`	`{`
`@@ -85,7 +85,7 @@ public function testValidateMissingInfo($code, $name)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * @dataProvider variableAndIdProvider`
	`88`	`+ * @dataProvider validateDataProvider`
`89`	`89`	`*/`
`90`	`90`	`public function testValidate($variableArray, $objectId, $expectedResult)`
`91`	`91`	`{`
`@@ -156,7 +156,7 @@ public function testGetVariablesOptionArrayWithGroup()`
`156`	`156`	`$this->assertEquals($transformedOptions, $mockVariable->getVariablesOptionArray(true));`
`157`	`157`	`}`
`158`	`158`
`159`		`- public function variableAndIdProvider()`
	`159`	`+ public function validateDataProvider()`
`160`	`160`	`{`
`161`	`161`	`$variable = [`
`162`	`162`	`'variable_id' => 'matching_id',`
`@@ -168,7 +168,7 @@ public function variableAndIdProvider()`
`168`	`168`	`];`
`169`	`169`	`}`
`170`	`170`
`171`		`- public function missingInfoProvider()`
	`171`	`+ public function validateMissingInfoDataProvider()`
`172`	`172`	`{`
`173`	`173`	`return [`
`174`	`174`	`'Missing code' => ['', 'some-name'],`