donaldp 2003/04/04 19:57:09
Modified: src/test/org/apache/avalon/phoenix/test
AbstractContainerTestCase.java
Log:
Make sure assembly.xml loaded for tests is validated
Revision Changes Path
1.9 +5 -8
avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java
Index: AbstractContainerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/test/AbstractContainerTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractContainerTestCase.java 23 Mar 2003 00:19:49 -0000 1.8
+++ AbstractContainerTestCase.java 5 Apr 2003 03:57:09 -0000 1.9
@@ -60,6 +60,7 @@
import org.apache.avalon.phoenix.components.deployer.PhoenixProfileBuilder;
import org.apache.avalon.phoenix.containerkit.profile.PartitionProfile;
import org.apache.avalon.phoenix.tools.configuration.ConfigurationBuilder;
+import org.xml.sax.InputSource;
/**
* Abstract class which TestCases can extend.
@@ -80,7 +81,9 @@
{
final PhoenixProfileBuilder assembler = new PhoenixProfileBuilder();
assembler.enableLogging( new ConsoleLogger() );
- final Configuration assembly = loadConfig( config );
+ final URL resource = getClass().getResource( config );
+ assertNotNull( "Config resource: " + config, resource );
+ final Configuration assembly = ConfigurationBuilder.build( new InputSource(
resource.toExternalForm() ), true );
final Map parameters = new HashMap();
parameters.put( ContainerConstants.ASSEMBLY_NAME, "test" );
parameters.put( ContainerConstants.ASSEMBLY_CONFIG, assembly );
@@ -88,10 +91,4 @@
return assembler.buildProfile( parameters );
}
- protected Configuration loadConfig( final String config )
- throws Exception
- {
- final URL resource = getClass().getResource( config );
- return ConfigurationBuilder.build( resource.toExternalForm() );
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
