Author: reinhard Date: Fri Mar 11 08:44:34 2005 New Revision: 157111 URL: http://svn.apache.org/viewcvs?view=rev&rev=157111 Log: from red to green
Modified: cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationTestCase.java cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/WiringBuilderTest.java Modified: cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationTestCase.java URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationTestCase.java?view=diff&r1=157110&r2=157111 ============================================================================== --- cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationTestCase.java (original) +++ cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationTestCase.java Fri Mar 11 08:44:34 2005 @@ -34,7 +34,7 @@ public void testObjectCreation() throws Exception { Mapping mapping = new Mapping(); - mapping.loadMapping(Cob10Descriptor.class.getClassLoader(). + mapping.loadMapping(DeploymentConfigurationTestCase.class.getClassLoader(). getResource("org/apache/cocoon/blockdeployer/configuration/DeploymentConfigurationDTO10-mapping.xml")); Unmarshaller unmarshaller = new Unmarshaller(); @@ -42,7 +42,7 @@ unmarshaller.setIgnoreExtraAttributes(true); unmarshaller.setIgnoreExtraElements(true); unmarshaller.setDebug(true); - FileInputStream fis = new FileInputStream(new File("mapping/sample-deploy.xml")); + FileInputStream fis = new FileInputStream(new File("test/sample-descriptors/sample-deploy.xml")); DeploymentConfigurationDTO10 dc = (DeploymentConfigurationDTO10)unmarshaller.unmarshal(new InputSource(fis)); System.out.println("dc: " + dc.getLocators().size()); Modified: cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/WiringBuilderTest.java URL: http://svn.apache.org/viewcvs/cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/WiringBuilderTest.java?view=diff&r1=157110&r2=157111 ============================================================================== --- cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/WiringBuilderTest.java (original) +++ cocoon/whiteboard/block-deployer/test/junit/org/apache/cocoon/blockdeployer/wiring/WiringBuilderTest.java Fri Mar 11 08:44:34 2005 @@ -33,7 +33,7 @@ // create a block mock object File wiringFile = new File(Constants.WIRING_FILE); - Wiring wiring = WiringBuilder.build(wiringFile); + Wiring wiring = Wiring10Builder.build(wiringFile); // some debugging code (to be replaced with asserts ...) Iterator blockDescriptorIterator = wiring.getBlockDescriptors()