Changeset 1157

Show
Ignore:
Timestamp:
12/15/07 19:38:31 (8 months ago)
Author:
mikey
Message:

moves package _test to org::stubbles::test

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/stubbles/build.xml

    r1156 r1157  
    182182        <exclude name="**/star/StarStreamWrapper.php" /> 
    183183        <exclude name="**/star/StarWriter.php" /> 
     184        <exclude name="**/remote/**" /> 
    184185        <exclude name="**/org/**" /> 
    185186        <exclude name="**/stubClassLoader.php" /> 
    186         <exclude name="**/_test/**" /> 
    187187        <exclude name="**/todo/**" /> 
    188188        <exclude name="resources/phing/**" /> 

  • trunk/src/test/php/net/stubbles/reflection/stubReflectionClassTestCase.php

    r749 r1157  
    187187        $refClass = new stubReflectionClass('examples.stubTestFullLoading'); 
    188188        $this->assertEqual($refClass->getFullQualifiedClassName(), 'stubTestFullLoading'); 
    189         $refClass = new stubReflectionClass('_test.TestClassLoading'); 
    190         $this->assertEqual($refClass->getFullQualifiedClassName(), '_test.TestClassLoading'); 
     189        $refClass = new stubReflectionClass('org.stubbles.test.TestClassLoading'); 
     190        $this->assertEqual($refClass->getFullQualifiedClassName(), 'org.stubbles.test.TestClassLoading'); 
    191191    } 
    192192} 

  • trunk/src/test/php/net/stubbles/reflection/stubReflectionPackageTestCase.php

    r698 r1157  
    2828    public function setUp() 
    2929    { 
    30         $this->stubRefPackage = new stubReflectionPackage('_test'); 
     30        $this->stubRefPackage = new stubReflectionPackage('org.stubbles.test'); 
    3131    } 
    3232     
    …… 
    3636    public function testEquals() 
    3737    { 
    38         $stubRefPackage1 = new stubReflectionPackage('_test'); 
     38        $stubRefPackage1 = new stubReflectionPackage('org.stubbles.test'); 
    3939        $this->assertTrue($this->stubRefPackage->equals($stubRefPackage1)); 
    4040        $this->assertTrue($stubRefPackage1->equals($this->stubRefPackage)); 
    …… 
    4949    public function testToString() 
    5050    { 
    51         $this->assertEqual((string) $this->stubRefPackage, "net.stubbles.reflection.stubReflectionPackage[_test] {\n}\n"); 
     51        $this->assertEqual((string) $this->stubRefPackage, "net.stubbles.reflection.stubReflectionPackage[org.stubbles.test] {\n}\n"); 
    5252    } 
    5353 
    …… 
    5757    public function testName() 
    5858    { 
    59         $this->assertEqual($this->stubRefPackage->getName(), '_test'); 
     59        $this->assertEqual($this->stubRefPackage->getName(), 'org.stubbles.test'); 
    6060    } 
    6161 
    …… 
    7676        $refClass = $this->stubRefPackage->getClass('FooProcessor'); 
    7777        $this->assertIsA($refClass, 'stubReflectionClass'); 
    78         $this->assertEqual($refClass->getFullQualifiedClassName(), '_test.FooProcessor'); 
     78        $this->assertEqual($refClass->getFullQualifiedClassName(), 'org.stubbles.test.FooProcessor'); 
    7979    } 
    8080 
    …… 
    8484    public function testGetClasses() 
    8585    { 
    86         $stubRefPackage = new stubReflectionPackage('_test.package1'); 
     86        $stubRefPackage = new stubReflectionPackage('org.stubbles.test.package1'); 
    8787        $this->assertEqual(count($stubRefPackage->getClasses(false)), 2); 
    8888        $this->assertEqual(count($stubRefPackage->getClasses(true)), 3); 
    8989         
    90         $stubRefPackage = new stubReflectionPackage('_test.package2'); 
     90        $stubRefPackage = new stubReflectionPackage('org.stubbles.test.package2'); 
    9191        $this->assertEqual(count($stubRefPackage->getClasses(false)), 0); 
    9292        $this->assertEqual(count($stubRefPackage->getClasses(true)), 0); 
    …… 
    109109        $refPackage = $this->stubRefPackage->getPackage('package2'); 
    110110        $this->assertIsA($refPackage, 'stubReflectionPackage'); 
    111         $this->assertEqual($refPackage->getName(), '_test.package2'); 
     111        $this->assertEqual($refPackage->getName(), 'org.stubbles.test.package2'); 
    112112    } 
    113113 

  • trunk/src/test/php/net/stubbles/stubClassLoaderTestCase.php

    r698 r1157  
    3333    { 
    3434        $this->assertFalse(class_exists('WithStatic', false)); 
    35         stubClassLoader::load('_test.WithStatic'); 
     35        stubClassLoader::load('org.stubbles.test.WithStatic'); 
    3636        $this->assertEqual(WithStatic::getCalled(), 1); 
    3737        $this->assertTrue(class_exists('WithStatic', false)); 
    38         $this->assertEqual(stubClassLoader::getFullQualifiedClassName('WithStatic'), '_test.WithStatic'); 
    39         $this->assertEqual(stubClassLoader::getNonQualifiedClassName('_test.WithStatic'), 'WithStatic'); 
    40         stubClassLoader::load('_test.WithStatic'); 
     38        $this->assertEqual(stubClassLoader::getFullQualifiedClassName('WithStatic'), 'org.stubbles.test.WithStatic'); 
     39        $this->assertEqual(stubClassLoader::getNonQualifiedClassName('org.stubbles.test.WithStatic'), 'WithStatic'); 
     40        stubClassLoader::load('org.stubbles.test.WithStatic'); 
    4141        $this->assertEqual(WithStatic::getCalled(), 1); 
    4242    } 
    …… 
    4848    { 
    4949        $this->expectException('stubClassNotFoundException'); 
    50         stubClassLoader::load('_test.DoesNotExist'); 
     50        stubClassLoader::load('org.stubbles.test.DoesNotExist'); 
    5151    } 
    5252} 

  • trunk/src/test/php/net/stubbles/util/log/stubLogDataFactoryTestCase.php

    r1088 r1157  
    5050    public function testWithLoading() 
    5151    { 
    52         stubRegistry::setConfig('net.stubbles.util.log.class', '_test.TestLogData'); 
     52        stubRegistry::setConfig('net.stubbles.util.log.class', 'org.stubbles.test.TestLogData'); 
    5353        $logData = stubLogDataFactory::create('foo'); 
    5454        $this->assertIsA($logData, 'TestLogData'); 

  • trunk/src/test/php/net/stubbles/websites/processors/stubAbstractProcessorResolverTestCase.php

    r737 r1157  
    9393    public function testFalseProcessor() 
    9494    { 
    95         $this->abstractProcessorResolver->setReturnValue('doResolve', '_test.BazProcessor'); 
     95        $this->abstractProcessorResolver->setReturnValue('doResolve', 'org.stubbles.test.BazProcessor'); 
    9696        $this->expectException('stubProcessorException'); 
    9797        $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 
    …… 
    103103    public function testCorrectProcessor() 
    104104    { 
    105         $this->abstractProcessorResolver->setReturnValue('doResolve', '_test.FooProcessor'); 
     105        $this->abstractProcessorResolver->setReturnValue('doResolve', 'org.stubbles.test.FooProcessor'); 
    106106        $processor = $this->abstractProcessorResolver->resolve($this->mockRequest, $this->mockSession, $this->mockResponse); 
    107107        $this->assertIsA($processor, 'FooProcessor'); 

  • trunk/src/test/php/net/stubbles/websites/processors/stubDefaultProcessorResolverTestCase.php

    r737 r1157  
    6868    protected function addProcessors() 
    6969    { 
    70         $this->defaultProcessorResolver->addProcessor('foo', '_test.FooProcessor', 'interceptors-foo'); 
    71         $this->defaultProcessorResolver->addProcessor('bar', '_test.BarProcessor', 'interceptors-bar'); 
    72         $this->defaultProcessorResolver->addProcessor('baz', '_test.BazProcessor', 'interceptors-baz'); 
     70        $this->defaultProcessorResolver->addProcessor('foo', 'org.stubbles.test.FooProcessor', 'interceptors-foo'); 
     71        $this->defaultProcessorResolver->addProcessor('bar', 'org.stubbles.test.BarProcessor', 'interceptors-bar'); 
     72        $this->defaultProcessorResolver->addProcessor('baz', 'org.stubbles.test.BazProcessor', 'interceptors-baz'); 
    7373        $this->defaultProcessorResolver->setDefaultProcessor('foo'); 
    7474    } 
    …… 
    8282        $this->mockRequest->setReturnValue('hasValue', false); 
    8383        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse); 
    84         $this->assertEqual($processor, '_test.FooProcessor'); 
     84        $this->assertEqual($processor, 'org.stubbles.test.FooProcessor'); 
    8585    } 
    8686 
    …… 
    9494        $this->mockRequest->setReturnValue('getValidatedValue', 'bar'); 
    9595        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse); 
    96         $this->assertEqual($processor, '_test.BarProcessor'); 
     96        $this->assertEqual($processor, 'org.stubbles.test.BarProcessor'); 
    9797    } 
    9898 
    …… 
    106106        $this->mockRequest->setReturnValue('getValidatedValue', null); 
    107107        $processor = $this->defaultProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse); 
    108         $this->assertEqual($processor, '_test.FooProcessor'); 
     108        $this->assertEqual($processor, 'org.stubbles.test.FooProcessor'); 
    109109    } 
    110110 
    …… 
    123123    public function testWrongDefaultProcessors() 
    124124    { 
    125         $this->defaultProcessorResolver->addProcessor('foo', '_test.FooProcessor'); 
     125        $this->defaultProcessorResolver->addProcessor('foo', 'org.stubbles.test.FooProcessor'); 
    126126        $this->defaultProcessorResolver->setDefaultProcessor('bar'); 
    127127        $this->expectException('stubProcessorException'); 

  • trunk/src/test/php/net/stubbles/websites/processors/stubSimpleProcessorResolverTestCase.php

    r559 r1157  
    6868    public function testWithProcessor() 
    6969    { 
    70         $this->simpleProcessorResolver->setProcessor('_test.FooProcessor'); 
     70        $this->simpleProcessorResolver->setProcessor('org.stubbles.test.FooProcessor'); 
    7171        $processor = $this->simpleProcessorResolver->getDoResolveReturnValue($this->mockRequest, $this->mockSession, $this->mockResponse); 
    72         $this->assertEqual($processor, '_test.FooProcessor'); 
     72        $this->assertEqual($processor, 'org.stubbles.test.FooProcessor'); 
    7373    } 
    7474}