minor symfony#32690 [PropertyAccess] Fix PropertyAccessorCollectionTest (fancyweb)

Tobion · Tobion · commit eab5d4fa0a3d · 2019-07-24T07:54:16.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [PropertyAccess] Fix PropertyAccessorCollectionTest | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - In symfony#32627, I (a script actually) removed 2 fixtures classes from this test class. They are actually used but by tests that don't fail without them 😁 (because they were mocked and it's possible to mock non existing classes). This PR restores those 2 classes and remove the unneeded mocks so the tests use the real classes and are actually useful. Commits ------- a310bac [PropertyAccess] Fix PropertyAccessorCollectionTest
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -43,6 +43,28 @@ public function getAxes()
     }
 }
 
+class PropertyAccessorCollectionTest_CarOnlyAdder
+{
+    public function addAxis($axis)
+    {
+    }
+
+    public function getAxes()
+    {
+    }
+}
+
+class PropertyAccessorCollectionTest_CarOnlyRemover
+{
+    public function removeAxis($axis)
+    {
+    }
+
+    public function getAxes()
+    {
+    }
+}
+
 class PropertyAccessorCollectionTest_CarNoAdderAndRemover
 {
     public function getAxes()
@@ -143,25 +165,25 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()
 
     public function testIsWritableReturnsTrueIfAdderAndRemoverExists()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();
+        $car = new PropertyAccessorCollectionTest_Car();
         $this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyAdderExists()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_CarOnlyAdder')->getMock();
+        $car = new PropertyAccessorCollectionTest_CarOnlyAdder();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfOnlyRemoverExists()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_CarOnlyRemover')->getMock();
+        $car = new PropertyAccessorCollectionTest_CarOnlyRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
     public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
+        $car = new PropertyAccessorCollectionTest_CarNoAdderAndRemover();
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
     }
 
@@ -171,7 +193,7 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
      */
     public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
     {
-        $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();
+        $car = new PropertyAccessorCollectionTest_Car();
 
         $this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
     }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,28 @@ public function getAxes()`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
	`46`	`+class PropertyAccessorCollectionTest_CarOnlyAdder`
	`47`	`+{`
	`48`	`+ public function addAxis($axis)`
	`49`	`+ {`
	`50`	`+ }`
	`51`	`+`
	`52`	`+ public function getAxes()`
	`53`	`+ {`
	`54`	`+ }`
	`55`	`+}`
	`56`	`+`
	`57`	`+class PropertyAccessorCollectionTest_CarOnlyRemover`
	`58`	`+{`
	`59`	`+ public function removeAxis($axis)`
	`60`	`+ {`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ public function getAxes()`
	`64`	`+ {`
	`65`	`+ }`
	`66`	`+}`
	`67`	`+`
`46`	`68`	`class PropertyAccessorCollectionTest_CarNoAdderAndRemover`
`47`	`69`	`{`
`48`	`70`	`public function getAxes()`
`@@ -143,25 +165,25 @@ public function testSetValueFailsIfNoAdderNorRemoverFound()`
`143`	`165`
`144`	`166`	`public function testIsWritableReturnsTrueIfAdderAndRemoverExists()`
`145`	`167`	`{`
`146`		`- $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();`
	`168`	`+ $car = new PropertyAccessorCollectionTest_Car();`
`147`	`169`	`$this->assertTrue($this->propertyAccessor->isWritable($car, 'axes'));`
`148`	`170`	`}`
`149`	`171`
`150`	`172`	`public function testIsWritableReturnsFalseIfOnlyAdderExists()`
`151`	`173`	`{`
`152`		`- $car = $this->getMockBuilder(__CLASS__.'_CarOnlyAdder')->getMock();`
	`174`	`+ $car = new PropertyAccessorCollectionTest_CarOnlyAdder();`
`153`	`175`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`154`	`176`	`}`
`155`	`177`
`156`	`178`	`public function testIsWritableReturnsFalseIfOnlyRemoverExists()`
`157`	`179`	`{`
`158`		`- $car = $this->getMockBuilder(__CLASS__.'_CarOnlyRemover')->getMock();`
	`180`	`+ $car = new PropertyAccessorCollectionTest_CarOnlyRemover();`
`159`	`181`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`160`	`182`	`}`
`161`	`183`
`162`	`184`	`public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()`
`163`	`185`	`{`
`164`		`- $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();`
	`186`	`+ $car = new PropertyAccessorCollectionTest_CarNoAdderAndRemover();`
`165`	`187`	`$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));`
`166`	`188`	`}`
`167`	`189`
`@@ -171,7 +193,7 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()`
`171`	`193`	`*/`
`172`	`194`	`public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()`
`173`	`195`	`{`
`174`		`- $car = $this->getMockBuilder(__CLASS__.'_Car')->getMock();`
	`196`	`+ $car = new PropertyAccessorCollectionTest_Car();`
`175`	`197`
`176`	`198`	`$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');`
`177`	`199`	`}`