Changeset 65

Show
Ignore:
Timestamp:
01/15/07 16:56:32 (2 years ago)
Author:
mikey
Message:

renamed stubObject to stubBaseObject

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/main/php/events/stubCallbackListener.php

    r63 r65  
    1717 * @subpackage  events 
    1818 */ 
    19 class stubCallbackListener extends stubObject implements stubEventListener 
     19class stubCallbackListener extends stubBaseObject implements stubEventListener 
    2020{ 
    2121    /** 

  • trunk/src/main/php/events/stubEvent.php

    r63 r65  
    1313 * @subpackage  events 
    1414 */ 
    15 class stubEvent extends stubObject 
     15class stubEvent extends stubBaseObject 
    1616{ 
    1717    /** 

  • trunk/src/main/php/events/stubEventDispatcher.php

    r63 r65  
    1818 * @subpackage  events 
    1919 */ 
    20 class stubEventDispatcher extends stubObject 
     20class stubEventDispatcher extends stubBaseObject 
    2121{ 
    2222    /** 

  • trunk/src/main/php/helper/stubXJConfLoader.php

    r63 r65  
    1515 * @subpackage  helper 
    1616 */ 
    17 class stubXJConfLoader extends stubObject implements XJConfClassLoader 
     17class stubXJConfLoader extends stubBaseObject implements XJConfClassLoader 
    1818{ 
    1919    /** 

  • trunk/src/main/php/helper/validators/stubAbstractCompositeValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 abstract class stubAbstractCompositeValidator extends stubObject implements stubCompositeValidator 
     16abstract class stubAbstractCompositeValidator extends stubBaseObject implements stubCompositeValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubEqualValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubEqualValidator extends stubObject implements stubValidator 
     16class stubEqualValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubMaxLengthValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubMaxLengthValidator extends stubObject implements stubValidator 
     16class stubMaxLengthValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubMaxNumberValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubMaxNumberValidator extends stubObject implements stubValidator 
     16class stubMaxNumberValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubMinLengthValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubMinLengthValidator extends stubObject implements stubValidator 
     16class stubMinLengthValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubMinNumberValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubMinNumberValidator extends stubObject implements stubValidator 
     16class stubMinNumberValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubPreSelectValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubPreSelectValidator extends stubObject implements stubValidator 
     16class stubPreSelectValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/helper/validators/stubRegexValidator.php

    r63 r65  
    1414 * @subpackage  helper 
    1515 */ 
    16 class stubRegexValidator extends stubObject implements stubValidator 
     16class stubRegexValidator extends stubBaseObject implements stubValidator 
    1717{ 
    1818    /** 

  • trunk/src/main/php/ioc/injection/InjectionMap.php

    r63 r65  
    1313 * @subpackage  ioc 
    1414 */ 
    15 class InjectionMap extends stubObject implements ArrayAccess, Countable, IteratorAggregate 
     15class InjectionMap extends stubBaseObject implements ArrayAccess, Countable, IteratorAggregate 
    1616{ 
    1717    /** 

  • trunk/src/main/php/ipo/request/filters/stubAbstractFilter.php

    r63 r65  
    1414 * @subpackage  ipo 
    1515 */ 
    16 abstract class stubAbstractFilter extends stubObject implements stubFilter 
     16abstract class stubAbstractFilter extends stubBaseObject implements stubFilter 
    1717{ 
    1818    /** 

  • trunk/src/main/php/ipo/request/stubRequestValueError.php

    r63 r65  
    1414 * @subpackage  ipo 
    1515 */ 
    16 class stubRequestValueError extends stubObject 
     16class stubRequestValueError extends stubBaseObject 
    1717{ 
    1818    /** 

  • trunk/src/main/php/ipo/request/stubXmlRequestValueErrorFactory.php

    r63 r65  
    2121 * @subpackage  ipo 
    2222 */ 
    23 class stubXmlRequestValueErrorFactory extends stubObject implements stubRequestValueErrorFactory 
     23class stubXmlRequestValueErrorFactory extends stubBaseObject implements stubRequestValueErrorFactory 
    2424{ 
    2525    /** 

  • trunk/src/main/php/reflection/stubAbstractAnnotation.php

    r63 r65  
    1313 * @subpackage  reflection 
    1414 */ 
    15 abstract class stubAbstractAnnotation extends stubObject implements stubAnnotation 
     15abstract class stubAbstractAnnotation extends stubBaseObject implements stubAnnotation 
    1616{ 
    1717    /** 

  • trunk/src/main/php/stubBaseObject.php

    r62 r65  
    1313 * @package  stubbles 
    1414 */ 
    15 class stubObject 
     15class stubBaseObject 
    1616{ 
    1717    /** 

  • trunk/src/main/php/stubClassLoader.php

    r64 r65  
    110110 * every other class that should extend it 
    111111 */ 
    112 stubClassLoader::load('stubObject'); 
     112stubClassLoader::load('stubBaseObject'); 
    113113?> 

  • trunk/src/main/php/xml/serializer/stubXMLSerializer.php

    r63 r65  
    1717 * @subpackage  xml_serializer 
    1818 */ 
    19 class stubXMLSerializer extends stubObject { 
     19class stubXMLSerializer extends stubBaseObject { 
    2020     
    2121    /** 

  • trunk/src/main/php/xml/stubXMLDomStreamWriter.php

    r63 r65  
    1616 * @subpackage xml 
    1717 */ 
    18 class stubXMLDomStreamWriter extends stubObject implements stubXMLStreamWriter { 
     18class stubXMLDomStreamWriter extends stubBaseObject implements stubXMLStreamWriter { 
    1919 
    2020    /** 

  • trunk/src/test/php/stubBaseObjectTestCase.php

    r62 r65  
    11<?php 
    22/** 
    3  * Tests for stubObject 
     3 * Tests for stubBaseObject 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  test 
    88 */ 
    9 stubClassLoader::load('stubObject'); 
    10 class stub1stubObject extends stubObject 
     9stubClassLoader::load('stubBaseObject'); 
     10class stub1stubBaseObject extends stubBaseObject 
    1111{ 
    1212    protected $bar = 5; 
    …… 
    1414    public function getClassname() 
    1515    { 
    16         return 'test.stub1stubObject'; 
     16        return 'test.stub1stubBaseObject'; 
    1717    } 
    1818} 
    19 class stub2stubObject extends stubObject 
     19class stub2stubBaseObject extends stubBaseObject 
    2020{ 
    21     public $stubObject; 
     21    public $stubBaseObject; 
    2222     
    2323    private $foo = 'bar'; 
    …… 
    2525    public function getClassname() 
    2626    { 
    27         return 'test.stub2stubObject'; 
     27        return 'test.stub2stubBaseObject'; 
    2828    } 
    2929} 
    3030/** 
    31  * Tests for stubObject 
     31 * Tests for stubBaseObject 
    3232 * 
    3333 * @package     stubbles 
    3434 * @subpackage  test 
    3535 */ 
    36 class stubObjectTestCase extends UnitTestCase 
     36class stubBaseObjectTestCase extends UnitTestCase 
    3737{ 
    3838    /** 
    3939     * instance 1 to be used for tests 
    4040     * 
    41      * @var  stubObject 
     41     * @var  stubBaseObject 
    4242     */ 
    43     protected $stubObject1; 
     43    protected $stubBaseObject1; 
    4444    /** 
    4545     * instance 2 to be used for tests 
    4646     * 
    47      * @var  stubObject 
     47     * @var  stubBaseObject 
    4848     */ 
    49     protected $stubObject2; 
     49    protected $stubBaseObject2; 
    5050     
    5151    /** 
    …… 
    5454    public function setUp() 
    5555    { 
    56         $this->stubObject1 = new stub1stubObject(); 
    57         $this->stubObject2 = new stub2stubObject(); 
    58         $this->stubObject2->stubObject = $this->stubObject1; 
     56        $this->stubBaseObject1 = new stub1stubBaseObject(); 
     57        $this->stubBaseObject2 = new stub2stubBaseObject(); 
     58        $this->stubBaseObject2->stubBaseObject = $this->stubBaseObject1; 
    5959    } 
    6060     
    …… 
    6464    public function testGetClass() 
    6565    { 
    66         $refObject = $this->stubObject1->getClass(); 
     66        $refObject = $this->stubBaseObject1->getClass(); 
    6767        $this->assertIsA($refObject, 'stubReflectionObject'); 
    68         $this->assertEqual($refObject->getName(), 'stub1stubObject'); 
     68        $this->assertEqual($refObject->getName(), 'stub1stubBaseObject'); 
    6969    } 
    7070     
    …… 
    7474    public function testEquals() 
    7575    { 
    76         $this->assertTrue($this->stubObject1->equals($this->stubObject1)); 
    77         $this->assertTrue($this->stubObject2->equals($this->stubObject2)); 
    78         $this->assertFalse($this->stubObject1->equals($this->stubObject2)); 
    79         $this->assertFalse($this->stubObject1->equals('foo')); 
    80         $this->assertFalse($this->stubObject1->equals(6)); 
    81         $this->assertFalse($this->stubObject1->equals(true)); 
    82         $this->assertFalse($this->stubObject1->equals(false)); 
    83         $this->assertFalse($this->stubObject1->equals(null)); 
    84         $this->assertFalse($this->stubObject2->equals($this->stubObject1)); 
    85         $this->assertFalse($this->stubObject1->equals(new stub1stubObject())); 
    86         $this->assertFalse($this->stubObject2->equals(new stub2stubObject())); 
     76        $this->assertTrue($this->stubBaseObject1->equals($this->stubBaseObject1)); 
     77        $this->assertTrue($this->stubBaseObject2->equals($this->stubBaseObject2)); 
     78        $this->assertFalse($this->stubBaseObject1->equals($this->stubBaseObject2)); 
     79        $this->assertFalse($this->stubBaseObject1->equals('foo')); 
     80        $this->assertFalse($this->stubBaseObject1->equals(6)); 
     81        $this->assertFalse($this->stubBaseObject1->equals(true)); 
     82        $this->assertFalse($this->stubBaseObject1->equals(false)); 
     83        $this->assertFalse($this->stubBaseObject1->equals(null)); 
     84        $this->assertFalse($this->stubBaseObject2->equals($this->stubBaseObject1)); 
     85        $this->assertFalse($this->stubBaseObject1->equals(new stub1stubBaseObject())); 
     86        $this->assertFalse($this->stubBaseObject2->equals(new stub2stubBaseObject())); 
    8787    } 
    8888     
    …… 
    9292    public function testToString() 
    9393    { 
    94         $this->assertEqual((string) $this->stubObject1, "test.stub1stubObject {\n    bar(integer): 5\n}\n"); 
    95         $this->assertEqual((string) $this->stubObject2, "test.stub2stubObject {\n    stubObject(test.stub1stubObject): test.stub1stubObject {\n        bar(integer): 5\n    }\n    foo(string): bar\n}\n"); 
     94        $this->assertEqual((string) $this->stubBaseObject1, "test.stub1stubBaseObject {\n    bar(integer): 5\n}\n"); 
     95        $this->assertEqual((string) $this->stubBaseObject2, "test.stub2stubBaseObject {\n    stubBaseObject(test.stub1stubBaseObject): test.stub1stubBaseObject {\n        bar(integer): 5\n    }\n    foo(string): bar\n}\n"); 
    9696    } 
    9797} 

  • trunk/src/test/php/stubTestSuite.php

    r61 r65  
    2222        $dir = dirname(__FILE__); 
    2323        $this->TestSuite('All base classes tests'); 
     24        $this->addTestFile($dir . '/stubBaseObjectTestCase.php'); 
    2425        $this->addTestFile($dir . '/stubClassLoaderTestCase.php'); 
    25         $this->addTestFile($dir . '/stubObjectTestCase.php'); 
    2626    } 
    2727}