minor #15961 [Security] Fix tests in 2.8 (WouterJ)

fabpot · fabpot · commit dc937f899e6c · 2015-09-28T10:22:58.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [Security] Fix tests in 2.8 ping @fabpot Commits ------- 20c90f5 Fix tests in 2.8
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/Voter/AbstractVoterTest.php
@@ -54,42 +54,72 @@ public function testVote(array $attributes, $expectedVote, $object, $message)
 
         $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);
     }
+
+    /**
+     * @dataProvider getTests
+     * @group legacy
+     */
+    public function testVoteLegacy(array $attributes, $expectedVote, $object, $message)
+    {
+        $voter = new AbstractVoterTest_LegacyVoter();
+
+        $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \BadMethodCallException
+     */
+    public function testNoOverriddenMethodsThrowsException()
+    {
+        $voter = new AbstractVoterTest_NothingImplementedVoter();
+        $voter->vote($this->token, new \stdClass(), array('EDIT'));
+    }
 }
 
 class AbstractVoterTest_Voter extends AbstractVoter
+{
+    protected function voteOnAttribute($attribute, $object, TokenInterface $token)
+    {
+        return 'EDIT' === $attribute;
+    }
+
+    protected function supports($attribute, $class)
+    {
+        return $this->isClassInstanceOf($class, 'stdClass')
+            && in_array($attribute, array('EDIT', 'CREATE'));
+    }
+}
+
+class AbstractVoterTest_LegacyVoter extends AbstractVoter
 {
     protected function getSupportedClasses()
     {
-        return array('stdClass');
+        return array('AbstractVoterTest_Object');
     }
 
     protected function getSupportedAttributes()
     {
         return array('EDIT', 'CREATE');
     }
 
-    protected function voteOnAttribute($attribute, $object, TokenInterface $token)
+    protected function isGranted($attribute, $object, $user = null)
     {
-        return $attribute === 'foo';
+        return 'EDIT' === $attribute;
     }
 }
 
-class DeprecatedVoterFixture extends AbstractVoter
+class AbstractVoterTest_NothingImplementedVoter extends AbstractVoter
 {
     protected function getSupportedClasses()
     {
-        return array(
-            'Symfony\Component\Security\Core\Tests\Authorization\Voter\ObjectFixture',
-        );
+        return array('AbstractVoterTest_Object');
     }
 
     protected function getSupportedAttributes()
     {
-        return array('foo', 'bar', 'baz');
+        return array('EDIT', 'CREATE');
     }
 
-    protected function isGranted($attribute, $object, $user = null)
-    {
-        return 'EDIT' === $attribute;
-    }
+    // this is a bad voter that hasn't overridden isGranted or voteOnAttribute
 }

Original file line number	Diff line number	Diff line change
`@@ -54,42 +54,72 @@ public function testVote(array $attributes, $expectedVote, $object, $message)`
`54`	`54`
`55`	`55`	`$this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+ /**`
	`59`	`+ * @dataProvider getTests`
	`60`	`+ * @group legacy`
	`61`	`+ */`
	`62`	`+ public function testVoteLegacy(array $attributes, $expectedVote, $object, $message)`
	`63`	`+ {`
	`64`	`+ $voter = new AbstractVoterTest_LegacyVoter();`
	`65`	`+`
	`66`	`+ $this->assertEquals($expectedVote, $voter->vote($this->token, $object, $attributes), $message);`
	`67`	`+ }`
	`68`	`+`
	`69`	`+ /**`
	`70`	`+ * @group legacy`
	`71`	`+ * @expectedException \BadMethodCallException`
	`72`	`+ */`
	`73`	`+ public function testNoOverriddenMethodsThrowsException()`
	`74`	`+ {`
	`75`	`+ $voter = new AbstractVoterTest_NothingImplementedVoter();`
	`76`	`+ $voter->vote($this->token, new \stdClass(), array('EDIT'));`
	`77`	`+ }`
`57`	`78`	`}`
`58`	`79`
`59`	`80`	`class AbstractVoterTest_Voter extends AbstractVoter`
	`81`	`+{`
	`82`	`+ protected function voteOnAttribute($attribute, $object, TokenInterface $token)`
	`83`	`+ {`
	`84`	`+ return 'EDIT' === $attribute;`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ protected function supports($attribute, $class)`
	`88`	`+ {`
	`89`	`+ return $this->isClassInstanceOf($class, 'stdClass')`
	`90`	`+ && in_array($attribute, array('EDIT', 'CREATE'));`
	`91`	`+ }`
	`92`	`+}`
	`93`	`+`
	`94`	`+class AbstractVoterTest_LegacyVoter extends AbstractVoter`
`60`	`95`	`{`
`61`	`96`	`protected function getSupportedClasses()`
`62`	`97`	`{`
`63`		`- return array('stdClass');`
	`98`	`+ return array('AbstractVoterTest_Object');`
`64`	`99`	`}`
`65`	`100`
`66`	`101`	`protected function getSupportedAttributes()`
`67`	`102`	`{`
`68`	`103`	`return array('EDIT', 'CREATE');`
`69`	`104`	`}`
`70`	`105`
`71`		`- protected function voteOnAttribute($attribute, $object, TokenInterface $token)`
	`106`	`+ protected function isGranted($attribute, $object, $user = null)`
`72`	`107`	`{`
`73`		`- return $attribute === 'foo';`
	`108`	`+ return 'EDIT' === $attribute;`
`74`	`109`	`}`
`75`	`110`	`}`
`76`	`111`
`77`		`-class DeprecatedVoterFixture extends AbstractVoter`
	`112`	`+class AbstractVoterTest_NothingImplementedVoter extends AbstractVoter`
`78`	`113`	`{`
`79`	`114`	`protected function getSupportedClasses()`
`80`	`115`	`{`
`81`		`- return array(`
`82`		`- 'Symfony\Component\Security\Core\Tests\Authorization\Voter\ObjectFixture',`
`83`		`- );`
	`116`	`+ return array('AbstractVoterTest_Object');`
`84`	`117`	`}`
`85`	`118`
`86`	`119`	`protected function getSupportedAttributes()`
`87`	`120`	`{`
`88`		`- return array('foo', 'bar', 'baz');`
	`121`	`+ return array('EDIT', 'CREATE');`
`89`	`122`	`}`
`90`	`123`
`91`		`- protected function isGranted($attribute, $object, $user = null)`
`92`		`- {`
`93`		`- return 'EDIT' === $attribute;`
`94`		`- }`
	`124`	`+ // this is a bad voter that hasn't overridden isGranted or voteOnAttribute`
`95`	`125`	`}`