Changeset 119
- Timestamp:
- 11/11/07 16:17:05 (1 year ago)
- Files:
-
- trunk/examples/ClassLoader.php (modified) (1 diff)
- trunk/examples/Example1.php (modified) (1 diff)
- trunk/examples/Example2.php (modified) (1 diff)
- trunk/examples/Example3.php (modified) (1 diff)
- trunk/examples/ExampleClassLoader.php (modified) (1 diff)
- trunk/examples/ExampleCollection.php (modified) (1 diff)
- trunk/examples/ExampleExtension.php (modified) (1 diff)
- trunk/examples/ExampleMethods.php (modified) (1 diff)
- trunk/examples/MathExtension.php (modified) (1 diff)
- trunk/examples/TestAttributesRequired.php (modified) (1 diff)
- trunk/examples/TestCDataSetter.php (modified) (1 diff)
- trunk/examples/TestConstructor.php (modified) (1 diff)
- trunk/examples/TestDynamicSetters.php (modified) (1 diff)
- trunk/examples/TestDynamicTypes.php (modified) (1 diff)
- trunk/examples/TestEmptyConstructor.php (modified) (1 diff)
- trunk/examples/TestInterfaces.php (modified) (1 diff)
- trunk/examples/TestPrimitives.php (modified) (1 diff)
- trunk/examples/TestPrimitivesFactory.php (modified) (1 diff)
- trunk/examples/TestStaticClass.php (modified) (1 diff)
- trunk/examples/TestXInclude.php (modified) (1 diff)
- trunk/examples/Test__setExplicit.php (modified) (1 diff)
- trunk/examples/Test__setImplicit.php (modified) (1 diff)
- trunk/examples/Test__setPublicProperties.php (modified) (1 diff)
- trunk/tests/integration/Example1TestCase.php (modified) (1 diff)
- trunk/tests/integration/Example2TestCase.php (modified) (1 diff)
- trunk/tests/integration/Example3TestCase.php (modified) (1 diff)
- trunk/tests/integration/ExampleClassLoaderTestCase.php (modified) (1 diff)
- trunk/tests/integration/ExampleCollectionTestCase.php (modified) (1 diff)
- trunk/tests/integration/ExampleExtensionTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestAttributesRequiredTestCase.php (modified) (2 diffs)
- trunk/tests/integration/TestAutoPrimitivesTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestCDataSetterTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestConstructorTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestDynamicSettersTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestDynamicTypesTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestEmptyConstructorTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestInterfacesTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestPrimitivesFactoryTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestPrimitivesTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestStaticClassTestCase.php (modified) (1 diff)
- trunk/tests/integration/TestXIncludeTestCase.php (modified) (1 diff)
- trunk/tests/integration/Test__setExplicitTestCase.php (modified) (1 diff)
- trunk/tests/integration/Test__setImplicitTestCase.php (modified) (1 diff)
- trunk/tests/integration/Test__setPublicPropertiesTestCase.php (modified) (1 diff)
- trunk/tests/runIntegration.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/examples/ClassLoader.php
r89 r119 5 5 * @author Frank Kleine <frank.kleine@schlund.de> 6 6 */ 7 use net::xjconf::XJConfClassLoader; 7 8 /** 8 9 * Basic example to show how the class loader may be used. trunk/examples/Example1.php
r28 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 require 'Color.php'; 13 12 require 'Complex.php'; trunk/examples/Example2.php
r30 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 require 'Color.php'; 13 12 require 'Complex.php'; trunk/examples/Example3.php
r31 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 require 'Color.php'; 13 12 require 'Complex.php'; trunk/examples/ExampleClassLoader.php
r46 r119 6 6 */ 7 7 require_once '../XJConf/XJConfLoader.php'; 8 XJConfLoader::load('DefinitionParser', 9 'XmlParser', 10 'XJConfClassLoader' 11 ); 8 use net::xjconf::DefinitionParser; 9 use net::xjconf::XmlParser; 10 use net::xjconf::XJConfClassLoader; 12 11 require 'ClassLoader.php'; 13 12 /** trunk/examples/ExampleCollection.php
r32 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 require 'Color.php'; 13 12 require 'Complex.php'; trunk/examples/ExampleExtension.php
r34 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser', 11 'ext.Extension' 12 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 11 use net::xjconf::ext::Extension; 13 12 require 'MathExtension.php'; 14 13 /** trunk/examples/ExampleMethods.php
r94 r119 7 7 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 13 12 class Properties { trunk/examples/MathExtension.php
r34 r119 6 6 * @author Frank Kleine <frank.kleine@schlund.de> 7 7 */ 8 use net::xjconf::GenericTag; 9 use net::xjconf::Tag; 10 use net::xjconf::XmlParser; 11 use net::xjconf::ext::Extension; 8 12 /** 9 13 * Basic example to show how extensions may return values. trunk/examples/TestAttributesRequired.php
r43 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser', 11 'ext.Extension' 12 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 13 11 require 'Color.php'; 14 12 /** trunk/examples/TestCDataSetter.php
r55 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser', 11 'ext.Extension' 12 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 13 11 require 'Complex2.php'; 14 12 /** trunk/examples/TestConstructor.php
r109 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser', 11 'ext.Extension' 12 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 13 11 require 'ConstructorColor.php'; 14 12 require 'CDataColor.php'; trunk/examples/TestDynamicSetters.php
r43 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 13 12 require_once 'DynamicSetterClass.php'; trunk/examples/TestDynamicTypes.php
r53 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser' 11 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 12 11 13 12 require_once 'AnotherClass.php'; trunk/examples/TestEmptyConstructor.php
r89 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/examples/TestInterfaces.php
r41 r119 7 7 */ 8 8 require_once '../XJConf/XJConfLoader.php'; 9 XJConfLoader::load('DefinitionParser', 10 'XmlParser', 11 'ext.Extension' 12 ); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 13 11 require 'MyClass.php'; 14 12 /** trunk/examples/TestPrimitives.php
r18 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/examples/TestPrimitivesFactory.php
r24 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/examples/TestStaticClass.php
r89 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 require 'Registry.php'; trunk/examples/TestXInclude.php
r89 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser', 5 'ext.xinc.XInclude' 6 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 5 use net::xjconf::ext::xinc::XInclude; 7 6 error_reporting(E_ALL | E_STRICT); 8 7 trunk/examples/Test__setExplicit.php
r103 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/examples/Test__setImplicit.php
r103 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/examples/Test__setPublicProperties.php
r103 r119 1 1 <?php 2 2 require_once '../XJConf/XJConfLoader.php'; 3 XJConfLoader::load('DefinitionParser', 4 'XmlParser' 5 ); 3 use net::xjconf::DefinitionParser; 4 use net::xjconf::XmlParser; 6 5 error_reporting(E_ALL | E_STRICT); 7 6 trunk/tests/integration/Example1TestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Color.php'; 10 12 require_once EXAMPLES_DIR . '/Complex.php'; trunk/tests/integration/Example2TestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Color.php'; 10 12 require_once EXAMPLES_DIR . '/Complex.php'; trunk/tests/integration/Example3TestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Color.php'; 10 12 require_once EXAMPLES_DIR . '/Complex.php'; trunk/tests/integration/ExampleClassLoaderTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/ClassLoader.php'; 10 12 /** trunk/tests/integration/ExampleCollectionTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 /** 10 12 * Integration test with ExampleCollection. trunk/tests/integration/ExampleExtensionTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 XJConfLoader::load('ext.Extension'); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 11 use net::xjconf::ext::Extension; 10 12 require_once EXAMPLES_DIR . '/MathExtension.php'; 11 13 /** trunk/tests/integration/TestAttributesRequiredTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Color.php'; 10 12 /** … … 26 28 $conf = new XmlParser(); 27 29 $conf->setTagDefinitions($defs); 28 $this->expectException(' MissingAttributeException');30 $this->expectException('net::xjconf::exceptions::MissingAttributeException'); 29 31 $conf->parse(EXAMPLES_DIR . '/xml/test-attributes-required.xml'); 30 32 } trunk/tests/integration/TestAutoPrimitivesTestCase.php
r92 r119 7 7 * @subpackage test_integration 8 8 */ 9 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 10 11 /** 11 12 * Integration test with TestPrimitives. trunk/tests/integration/TestCDataSetterTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Complex2.php'; 10 12 /** trunk/tests/integration/TestConstructorTestCase.php
r109 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/ConstructorColor.php'; 10 12 require_once EXAMPLES_DIR . '/CDataColor.php'; trunk/tests/integration/TestDynamicSettersTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/DynamicSetterClass.php'; 10 12 /** trunk/tests/integration/TestDynamicTypesTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/AnotherClass.php'; 10 12 require_once EXAMPLES_DIR . '/MyClass.php'; trunk/tests/integration/TestEmptyConstructorTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/EmptyConstructorClass.php'; 10 12 /** trunk/tests/integration/TestInterfacesTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/MyClass.php'; 10 12 /** trunk/tests/integration/TestPrimitivesFactoryTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/ColorPrimitives.php'; 10 12 require_once EXAMPLES_DIR . '/ColorPrimitivesFactory.php'; trunk/tests/integration/TestPrimitivesTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/ColorPrimitives.php'; 10 12 /** trunk/tests/integration/TestStaticClassTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Registry.php'; 10 12 /** trunk/tests/integration/TestXIncludeTestCase.php
r89 r119 7 7 * @subpackage test_integration 8 8 */ 9 XJConfLoader::load('ext.xinc.XInclude'); 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 11 use net::xjconf::ext::xinc::XInclude; 10 12 require_once EXAMPLES_DIR . '/ColorPrimitives.php'; 11 13 /** trunk/tests/integration/Test__setExplicitTestCase.php
r103 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Dog.php'; 10 12 /** trunk/tests/integration/Test__setImplicitTestCase.php
r103 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/Dog.php'; 10 12 /** trunk/tests/integration/Test__setPublicPropertiesTestCase.php
r103 r119 7 7 * @subpackage test_integration 8 8 */ 9 use net::xjconf::DefinitionParser; 10 use net::xjconf::XmlParser; 9 11 require_once EXAMPLES_DIR . '/AnotherDog.php'; 10 12 /** trunk/tests/runIntegration.php
r103 r119 10 10 require_once TEST_CWD . '/../simpletest/unit_tester.php'; 11 11 require_once TEST_CWD . '/../XJConf/XJConfLoader.php'; 12 XJConfLoader::load('DefinitionParser',13 'XmlParser'14 );15 12 /** 16 13 * Test runner for XJConf. … … 34 31 $test->addTestFile(TEST_CWD . '/integration/Test__setPublicPropertiesTestCase.php'); 35 32 $test->addTestFile(TEST_CWD . '/integration/TestAttributesRequiredTestCase.php'); 33 $test->addTestFile(TEST_CWD . '/integration/TestAutoPrimitivesTestCase.php'); 36 34 $test->addTestFile(TEST_CWD . '/integration/TestCDataSetterTestCase.php'); 37 35 $test->addTestFile(TEST_CWD . '/integration/TestConstructorTestCase.php'); … … 40 38 $test->addTestFile(TEST_CWD . '/integration/TestEmptyConstructorTestCase.php'); 41 39 $test->addTestFile(TEST_CWD . '/integration/TestInterfacesTestCase.php'); 42 $test->addTestFile(TEST_CWD . '/integration/Test AutoPrimitivesTestCase.php');40 $test->addTestFile(TEST_CWD . '/integration/TestPrimitivesFactoryTestCase.php'); 43 41 $test->addTestFile(TEST_CWD . '/integration/TestPrimitivesTestCase.php'); 44 $test->addTestFile(TEST_CWD . '/integration/TestPrimitivesFactoryTestCase.php');45 42 $test->addTestFile(TEST_CWD . '/integration/TestStaticClassTestCase.php'); 46 43 $test->addTestFile(TEST_CWD . '/integration/TestXIncludeTestCase.php');
