Changeset 1217

Show
Ignore:
Timestamp:
01/11/08 14:56:01 (6 months ago)
Author:
mikey
Message:

fixed bugs introduced with r1214

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/main/php/net/stubbles/reflection/stubReflectionClass.php

    r1209 r1217  
    88 * @subpackage  reflection 
    99 */ 
    10 stubClassLoader::load('net.stubbles.reflection.annotations.stubAnnotationFactory', 
    11                       'net.stubbles.reflection.stubBaseReflectionClass', 
    12                       'net.stubbles.reflection.stubReflectionExtension', 
    13                       'net.stubbles.reflection.stubReflectionMethod', 
    14                       'net.stubbles.reflection.stubReflectionProperty' 
     10stubClassLoader::load('net::stubbles::reflection::annotations::stubAnnotationFactory', 
     11                      'net::stubbles::reflection::stubBaseReflectionClass', 
     12                      'net::stubbles::reflection::stubReflectionExtension', 
     13                      'net::stubbles::reflection::stubReflectionMethod', 
     14                      'net::stubbles::reflection::stubReflectionProperty' 
    1515); 
    1616/** 
     
    9696     * The result is a short but informative representation about the class and 
    9797     * its values. Per default, this method returns: 
    98      * 'net.stubbles.reflection.stubReflectionClass['[name-of-reflected-class]']  {}' 
     98     * 'net::stubbles::reflection::stubReflectionClass['[name-of-reflected-class]']  {}' 
    9999     * <code> 
    100      * net.stubbles.reflection.stubReflectionClass[MyClass] { 
     100     * net::stubbles::reflection::stubReflectionClass[MyClass] { 
    101101     * } 
    102102     * </code> 
     
    106106    public function __toString() 
    107107    { 
    108         return 'net.stubbles.reflection.stubReflectionClass[' . $this->className . "] {\n}\n"; 
     108        return 'net::stubbles::reflection::stubReflectionClass[' . $this->className . "] {\n}\n"; 
    109109    } 
    110110 
  • trunk/src/main/php/net/stubbles/xml/stubXMLStreamWriterFactory.php

    r1026 r1217  
    88 * @subpackage  xml 
    99 */ 
    10 stubClassLoader::load('net.stubbles.xml.stubXMLException', 
    11                       'net.stubbles.xml.stubXMLStreamWriter' 
     10stubClassLoader::load('net::stubbles::xml::stubXMLException', 
     11                      'net::stubbles::xml::stubXMLStreamWriter' 
    1212); 
    1313/** 
     
    122122    public static function getFqClassName($type) 
    123123    { 
    124         return 'net.stubbles.xml.stub' . $type . 'XMLStreamWriter'; 
     124        return 'net::stubbles::xml::stub' . $type . 'XMLStreamWriter'; 
    125125    } 
    126126 
  • trunk/src/test/php/net/stubbles/integration/stubPageXJConfFactoryTestCase.php

    r1156 r1217  
    77 * @subpackage  test_integration 
    88 */ 
    9 stubClassLoader::load('net.stubbles.websites.stubPageXJConfFactory'); 
     9stubClassLoader::load('net::stubbles::websites::stubPageXJConfFactory'); 
    1010/** 
    1111 * Integration test for xjconf page factory. 
     
    2727        $this->assertIsA($elements['Test'], 'TestXMLPageElement'); 
    2828        $this->assertIsA($elements['cached'], 'stubXMLPageElementCachingDecorator'); 
    29         $this->assertEqual($elements['cached']->getRequiredClassNames(), array('org.stubbles.examples.pageelements.CurrentTimeXMLPageElement')); 
     29        $this->assertEqual($elements['cached']->getRequiredClassNames(), array('org::stubbles::examples::pageelements::CurrentTimeXMLPageElement')); 
    3030        $this->assertIsA($elements['uncached'], 'CurrentTimeXMLPageElement'); 
    3131    } 
  • trunk/src/test/php/net/stubbles/reflection/stubReflectionClassTestCase.php

    r1157 r1217  
    11<?php 
    22/** 
    3  * Test for net.stubbles.reflection.stubReflectionClass. 
     3 * Test for net::stubbles::reflection::stubReflectionClass. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
     
    77 * @subpackage  reflection_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.reflection.stubReflectionClass'); 
     9stubClassLoader::load('net::stubbles::reflection::stubReflectionClass'); 
    1010require_once dirname(__FILE__) . '/stubreflectiontestclasses.php'; 
    1111class stubTestFullLoading {} 
    1212/** 
    13  * Test for net.stubbles.reflection.stubReflectionClass. 
     13 * Test for net::stubbles::reflection::stubReflectionClass. 
    1414 * 
    1515 * @package     stubbles 
     
    6161    public function testToString() 
    6262    { 
    63         $this->assertEqual((string) $this->stubRefClass1, "net.stubbles.reflection.stubReflectionClass[stubTestWithMethodsAndProperties] {\n}\n"); 
    64         $this->assertEqual((string) $this->stubRefClass2, "net.stubbles.reflection.stubReflectionClass[stubTestWithOutMethodsAndProperties] {\n}\n"); 
     63        $this->assertEqual((string) $this->stubRefClass1, "net::stubbles::reflection::stubReflectionClass[stubTestWithMethodsAndProperties] {\n}\n"); 
     64        $this->assertEqual((string) $this->stubRefClass2, "net::stubbles::reflection::stubReflectionClass[stubTestWithOutMethodsAndProperties] {\n}\n"); 
    6565    } 
    6666 
     
    185185    public function testClassLoading() 
    186186    { 
    187         $refClass = new stubReflectionClass('examples.stubTestFullLoading'); 
     187        $refClass = new stubReflectionClass('examples::stubTestFullLoading'); 
    188188        $this->assertEqual($refClass->getFullQualifiedClassName(), 'stubTestFullLoading'); 
    189         $refClass = new stubReflectionClass('org.stubbles.test.TestClassLoading'); 
    190         $this->assertEqual($refClass->getFullQualifiedClassName(), 'org.stubbles.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/xml/stubXMLStreamWriterFactoryTestCase.php

    r1020 r1217  
    11<?php 
    22/** 
    3  * Test for net.stubbles.xml.stubXMLStreamWriterFactory. 
     3 * Test for net::stubbles::xml::stubXMLStreamWriterFactory. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
     
    77 * @subpackage  xml_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.xml.stubXMLStreamWriterFactory', 
    10                       'net.stubbles.xml.stubXMLStreamWriter' 
     9stubClassLoader::load('net::stubbles::xml::stubXMLStreamWriterFactory', 
     10                      'net::stubbles::xml::stubXMLStreamWriter' 
    1111); 
    1212Mock::generate('stubXMLStreamWriter', 'stubMockXMLStreamWriter'); 
    1313/** 
    14  * Test for net.stubbles.xml.stubXMLStreamWriterFactory. 
     14 * Test for net::stubbles::xml::stubXMLStreamWriterFactory. 
    1515 * 
    1616 * @package     stubbles 
     
    4545    public function testGetFqClassNameAsAvailable() 
    4646    { 
    47        $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(), 'net.stubbles.xml.stubDomXMLStreamWriter'); 
    48        $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(array('xmlwriter', 'Dom')), 'net.stubbles.xml.stubLibXmlXMLStreamWriter'); 
    49        $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(array('xmlwriter', 'Dom'), array(stubXMLStreamWriter::FEATURE_IMPORT_WRITER)), 'net.stubbles.xml.stubDomXMLStreamWriter'); 
     47       $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(), 'net::stubbles::xml::stubDomXMLStreamWriter'); 
     48       $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(array('xmlwriter', 'Dom')), 'net::stubbles::xml::stubLibXmlXMLStreamWriter'); 
     49       $this->assertEqual(stubXMLStreamWriterFactory::getFqClassNameAsAvailable(array('xmlwriter', 'Dom'), array(stubXMLStreamWriter::FEATURE_IMPORT_WRITER)), 'net::stubbles::xml::stubDomXMLStreamWriter'); 
    5050       $this->expectException('stubXMLException'); 
    5151       stubXMLStreamWriterFactory::getFqClassNameAsAvailable(array('ExtensionDoesNotExist'));