TESTS

- Fixing the Zend_Reflection _files changes that were made
- Fixing the order of parameters in the assertions of ClassTest.php


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

tests/Zend/Reflection/ClassTest.php

@@ -59,13 +59,13 @@ class Zend_Reflection_ClassTest extends PHPUnit_Framework_TestCase
         $reflectionClass = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass2');
         
         $methodByName = $reflectionClass->getMethod('getProp1');
-        $this->assertEquals(get_class($methodByName), 'Zend_Reflection_Method');
+        $this->assertEquals('Zend_Reflection_Method', get_class($methodByName));
         
         $methodsAll = $reflectionClass->getMethods();
-        $this->assertEquals(count($methodsAll), 3);
+        $this->assertEquals(3, count($methodsAll));
         
         $firstMethod = array_shift($methodsAll);
-        $this->assertEquals($firstMethod->getName(), 'getProp1');
+        $this->assertEquals('getProp1', $firstMethod->getName());
     }
     
     public function testPropertyReturns()
@@ -73,13 +73,13 @@ class Zend_Reflection_ClassTest extends PHPUnit_Framework_TestCase
         $reflectionClass = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass2');
         
         $propertyByName = $reflectionClass->getProperty('_prop1');
-        $this->assertEquals(get_class($propertyByName), 'Zend_Reflection_Property');
+        $this->assertEquals('Zend_Reflection_Property', get_class($propertyByName));
         
         $propertiesAll = $reflectionClass->getProperties();
-        $this->assertEquals(count($propertiesAll), 2);
+        $this->assertEquals(2, count($propertiesAll));
         
         $firstProperty = array_shift($propertiesAll);
-        $this->assertEquals($firstProperty->getName(), '_prop1');
+        $this->assertEquals('_prop1', $firstProperty->getName());
     }
     
     public function testParentReturn()
@@ -87,8 +87,8 @@ class Zend_Reflection_ClassTest extends PHPUnit_Framework_TestCase
         $reflectionClass = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass');
         
         $parent = $reflectionClass->getParentClass();
-        $this->assertEquals(get_class($parent), 'Zend_Reflection_Class');
-        $this->assertEquals($parent->getName(), 'ArrayObject');
+        $this->assertEquals('Zend_Reflection_Class', get_class($parent));
+        $this->assertEquals('ArrayObject', $parent->getName());
         
     }
     
@@ -97,10 +97,10 @@ class Zend_Reflection_ClassTest extends PHPUnit_Framework_TestCase
         $reflectionClass = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass4');
         
         $interfaces = $reflectionClass->getInterfaces();
-        $this->assertEquals(count($interfaces), 1);
+        $this->assertEquals(1, count($interfaces));
         
         $interface = array_shift($interfaces);
-        $this->assertEquals($interface->getName(), 'Zend_Reflection_TestSampleClassInterface');
+        $this->assertEquals('Zend_Reflection_TestSampleClassInterface', $interface->getName());
         
     }
     
@@ -138,8 +138,8 @@ EOS;
     {
         $reflectionClass = new Zend_Reflection_Class('Zend_Reflection_TestSampleClass5');
         
-        $this->assertEquals($reflectionClass->getStartLine(), 87);
-        $this->assertEquals($reflectionClass->getStartLine(true), 76);
+        $this->assertEquals(87, $reflectionClass->getStartLine());
+        $this->assertEquals(76, $reflectionClass->getStartLine(true));
     }
     
 

tests/Zend/Reflection/_files/TestSampleClass.php

@@ -1,23 +1,10 @@
 <?php
 /**
- * Zend Framework
+ * License Info
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Reflection
- * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
+ * This is a test File docblock
+ * 
+ * @author Ralph Schindler
  */
 
 /**
@@ -32,6 +19,8 @@ require_once 'Zend/Reflection/File.php';
 
 /**
  * This is a sample class docblock
+ * 
+ * blah
  */
 class Zend_Reflection_TestSampleClass extends ArrayObject
 {