merged branch jakzal/no-underscored-methods-in-tests-master (PR #6885)

fabpot · fabpot · commit 60cf0aa1814a · 2013-02-04T21:27:45.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6885). Commits ------- c5d15f8 [PropertyAccess] Removed underscores from test method names to be consistent with other components. Discussion ---------- [PropertyAccess] Removed underscores from test method names Removed underscores from test method names to be consistent with other components. This was previously done in #6695, but was partly lost when merging with master (PropertyAccess component was created, so the location of tests has changed). | Q | A | |--------------|--------------------------------| | Bug fix? | no | |New feature? | no | |BC breaks? | no | |Deprecations? | no | |Tests pass? | yes | |Fixed tickets | n/a | |License | MIT | |Doc PR | n/a |
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
@@ -27,71 +27,71 @@ public function testToString()
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
      */
-    public function testInvalidPropertyPath_noDotBeforeProperty()
+    public function testDotIsRequiredBeforeProperty()
     {
         new PropertyPath('[index]property');
     }
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
      */
-    public function testInvalidPropertyPath_dotAtTheBeginning()
+    public function testDotCannotBePresentAtTheBeginning()
     {
         new PropertyPath('.property');
     }
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
      */
-    public function testInvalidPropertyPath_unexpectedCharacters()
+    public function testUnexpectedCharacters()
     {
         new PropertyPath('property.$foo');
     }
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
      */
-    public function testInvalidPropertyPath_empty()
+    public function testPathCannotBeEmpty()
     {
         new PropertyPath('');
     }
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException
      */
-    public function testInvalidPropertyPath_null()
+    public function testPathCannotBeNull()
     {
         new PropertyPath(null);
     }
 
     /**
      * @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException
      */
-    public function testInvalidPropertyPath_false()
+    public function testPathCannotBeFalse()
     {
         new PropertyPath(false);
     }
 
-    public function testValidPropertyPath_zero()
+    public function testZeroIsValidPropertyPath()
     {
         new PropertyPath('0');
     }
 
-    public function testGetParent_dot()
+    public function testGetParentWithDot()
     {
         $propertyPath = new PropertyPath('grandpa.parent.child');
 
         $this->assertEquals(new PropertyPath('grandpa.parent'), $propertyPath->getParent());
     }
 
-    public function testGetParent_index()
+    public function testGetParentWithIndex()
     {
         $propertyPath = new PropertyPath('grandpa.parent[child]');
 
         $this->assertEquals(new PropertyPath('grandpa.parent'), $propertyPath->getParent());
     }
 
-    public function testGetParent_noParent()
+    public function testGetParentWhenThereIsNoParent()
     {
         $propertyPath = new PropertyPath('path');
 

Original file line number	Diff line number	Diff line change
`@@ -27,71 +27,71 @@ public function testToString()`
`27`	`27`	`/**`
`28`	`28`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException`
`29`	`29`	`*/`
`30`		`- public function testInvalidPropertyPath_noDotBeforeProperty()`
	`30`	`+ public function testDotIsRequiredBeforeProperty()`
`31`	`31`	`{`
`32`	`32`	`new PropertyPath('[index]property');`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`	`36`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException`
`37`	`37`	`*/`
`38`		`- public function testInvalidPropertyPath_dotAtTheBeginning()`
	`38`	`+ public function testDotCannotBePresentAtTheBeginning()`
`39`	`39`	`{`
`40`	`40`	`new PropertyPath('.property');`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException`
`45`	`45`	`*/`
`46`		`- public function testInvalidPropertyPath_unexpectedCharacters()`
	`46`	`+ public function testUnexpectedCharacters()`
`47`	`47`	`{`
`48`	`48`	`new PropertyPath('property.$foo');`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`	`52`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException`
`53`	`53`	`*/`
`54`		`- public function testInvalidPropertyPath_empty()`
	`54`	`+ public function testPathCannotBeEmpty()`
`55`	`55`	`{`
`56`	`56`	`new PropertyPath('');`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException`
`61`	`61`	`*/`
`62`		`- public function testInvalidPropertyPath_null()`
	`62`	`+ public function testPathCannotBeNull()`
`63`	`63`	`{`
`64`	`64`	`new PropertyPath(null);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`	`68`	`* @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException`
`69`	`69`	`*/`
`70`		`- public function testInvalidPropertyPath_false()`
	`70`	`+ public function testPathCannotBeFalse()`
`71`	`71`	`{`
`72`	`72`	`new PropertyPath(false);`
`73`	`73`	`}`
`74`	`74`
`75`		`- public function testValidPropertyPath_zero()`
	`75`	`+ public function testZeroIsValidPropertyPath()`
`76`	`76`	`{`
`77`	`77`	`new PropertyPath('0');`
`78`	`78`	`}`
`79`	`79`
`80`		`- public function testGetParent_dot()`
	`80`	`+ public function testGetParentWithDot()`
`81`	`81`	`{`
`82`	`82`	`$propertyPath = new PropertyPath('grandpa.parent.child');`
`83`	`83`
`84`	`84`	`$this->assertEquals(new PropertyPath('grandpa.parent'), $propertyPath->getParent());`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function testGetParent_index()`
	`87`	`+ public function testGetParentWithIndex()`
`88`	`88`	`{`
`89`	`89`	`$propertyPath = new PropertyPath('grandpa.parent[child]');`
`90`	`90`
`91`	`91`	`$this->assertEquals(new PropertyPath('grandpa.parent'), $propertyPath->getParent());`
`92`	`92`	`}`
`93`	`93`
`94`		`- public function testGetParent_noParent()`
	`94`	`+ public function testGetParentWhenThereIsNoParent()`
`95`	`95`	`{`
`96`	`96`	`$propertyPath = new PropertyPath('path');`
`97`	`97`