ZF-6726

- Test cleanup, ensure all Reflection tests pass with changes to Sample _files.
- Added testdox friendly names to TagTest

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18120 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Reflection/Docblock/TagTest.php

@@ -47,7 +47,7 @@ class Zend_Reflection_Docblock_TagTest extends PHPUnit_Framework_TestCase
         }
     }
     
-    public function testTagDescription()
+    public function testTagDescriptionIsReturned()
     {
         $classReflection = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass5');
 
@@ -55,7 +55,7 @@ class Zend_Reflection_Docblock_TagTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($authorTag->getDescription(), 'Ralph Schindler <ralph.schindler@zend.com>');
     }
 
-    public function testAllowsJustTagNameInDocblockTagLine()
+    public function testTagShouldAllowJustTagNameInDocblockTagLine()
     {
     	$classReflection = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass6');
     	
@@ -63,7 +63,7 @@ class Zend_Reflection_Docblock_TagTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($tag->getName(), 'emptyTag', 'Factory First Match Failed');
     }
     
-    public function testAllowsMultipleWhitespacesBeforeDescription()
+    public function testTagShouldAllowMultipleWhitespacesBeforeDescription()
     {
 		$classReflection = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass6');
     	

tests/Zend/Reflection/FileTest.php

@@ -65,7 +65,7 @@ class Zend_Reflection_FileTest extends PHPUnit_Framework_TestCase
         require_once $fileToRequire;
         $reflectionFile = new Zend_Reflection_File($fileToRequire);
         $this->assertEquals(get_class($reflectionFile), 'Zend_Reflection_File');
-        $this->assertEquals(count($reflectionFile->getClasses()), 6);
+        $this->assertEquals(count($reflectionFile->getClasses()), 7);
         $this->assertEquals(get_class($reflectionFile->getClass('Zend_Reflection_TestSampleClass2')), 'Zend_Reflection_Class');
     }
     
@@ -115,7 +115,7 @@ class Zend_Reflection_FileTest extends PHPUnit_Framework_TestCase
         require_once $fileToRequire;
         $reflectionFile = new Zend_Reflection_File($fileToRequire);
         $this->assertEquals(9, $reflectionFile->getStartLine());
-        $this->assertEquals(138, $reflectionFile->getEndLine());
+        $this->assertEquals(169, $reflectionFile->getEndLine());
     }
     
     public function testFileGetDocblockReturnsFileDocblock()

tests/Zend/Reflection/MethodTest.php

@@ -71,7 +71,7 @@ class Zend_Reflection_MethodTest extends PHPUnit_Framework_TestCase
     {
         $reflectionMethod = new Zend_Reflection_Method('Zend_Reflection_TestSampleClass5', 'doSomething');
         
-        $this->assertEquals($reflectionMethod->getStartLine(), 105);
+        $this->assertEquals($reflectionMethod->getStartLine(), 106);
         $this->assertEquals($reflectionMethod->getStartLine(true), 89);
     }
     

tests/Zend/Reflection/_files/TestSampleClass.php

@@ -84,7 +84,8 @@ class Zend_Reflection_TestSampleClass4 implements Zend_Reflection_TestSampleClas
  * 
  * @author Ralph Schindler <ralph.schindler@zend.com>
  */
-class Zend_Reflection_TestSampleClass5 {
+class Zend_Reflection_TestSampleClass5
+{
 
     /**
      * Method ShortDescription
@@ -133,20 +134,21 @@ class Zend_Reflection_TestSampleClass5 {
  * 
  * @author Carlton Gibson <carlton.gibson@noumenal.co.uk>
  */
-class Zend_Reflection_TestSampleClass6 {
+class Zend_Reflection_TestSampleClass6
+{
 
     /**
      * Method ShortDescription
      * 
      * Notice the multiple spaces aligning the columns in the docblock
      * tags. (This long description should be longer than 3 lines.
-	 * It indeed is longer than 3 lines
-	 * now.)
-	 *
-	 * @emptyTag
-	 * @descriptionTag           A tag with just a description
-	 * @param   int     $var     Description of $var
-	 * @return  string           Description of return value
+     * It indeed is longer than 3 lines
+     * now.)
+     *
+     * @emptyTag
+     * @descriptionTag           A tag with just a description
+     * @param   int     $var     Description of $var
+     * @return  string           Description of return value
      */
     public function doSomething($var)
     {