donaldp 2002/10/31 13:20:12
Modified: loader/src/test/org/apache/excalibur/loader/test
IntegrationTestCase.java config1.xml
Log:
Added in a unit test that fails ... now need to fix it.
Revision Changes Path
1.2 +8 -1
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/IntegrationTestCase.java
Index: IntegrationTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/IntegrationTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IntegrationTestCase.java 31 Oct 2002 07:00:05 -0000 1.1
+++ IntegrationTestCase.java 31 Oct 2002 21:20:12 -0000 1.2
@@ -41,6 +41,7 @@
assertPresent( map, "LOADER_3" );
assertPresent( map, "LOADER_4" );
assertPresent( map, "LOADER_5" );
+ assertPresent( map, "LOADER_6" );
assertPresent( map, "JOIN_1" );
final String[] files1 = new String[]{"cl1.jar"};
@@ -49,12 +50,15 @@
final String[] files4 =
new String[]{"SAR-INF/lib/cl3.jar", "SAR-INF/lib/cl4.jar"};
final String[] files5 = new String[]{"SAR-INF/lib/cl4.jar"};
+ final String[] files6 = new String[]{"SAR-INF/lib/cl4.jar"};
assertURLsPresent( map, "LOADER_1", files1 );
assertURLsPresent( map, "LOADER_2", files2 );
assertURLsPresent( map, "LOADER_3", files3 );
assertURLsPresent( map, "LOADER_4", files4 );
assertURLsPresent( map, "LOADER_5", files5 );
+ assertURLsPresent( map, "LOADER_6", files6 );
+
assertClassPresent( map, "LOADER_1", DataConstants.DATA1_CLASS );
assertClassPresent( map, "LOADER_1", DataConstants.DATA1_CLASS2 );
@@ -69,6 +73,9 @@
assertClassPresent( map, "LOADER_5", DataConstants.DATA1_CLASS );
assertClassPresent( map, "LOADER_5", DataConstants.DATA1_CLASS2 );
assertClassPresent( map, "LOADER_5", DataConstants.DATA4_CLASS );
+ assertClassPresent( map, "LOADER_6", DataConstants.DATA1_CLASS );
+ assertClassPresent( map, "LOADER_6", DataConstants.DATA1_CLASS2 );
+ assertClassPresent( map, "LOADER_6", DataConstants.DATA4_CLASS );
assertClassPresent( map, "JOIN_1", DataConstants.DATA1_CLASS );
assertClassPresent( map, "JOIN_1", DataConstants.DATA1_CLASS2 );
assertClassPresent( map, "JOIN_1", DataConstants.DATA2_CLASS );
1.2 +6 -0
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/config1.xml
Index: config1.xml
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/config1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config1.xml 31 Oct 2002 07:00:05 -0000 1.1
+++ config1.xml 31 Oct 2002 21:20:12 -0000 1.2
@@ -28,6 +28,12 @@
</fileset>
</classloader>
+ <classloader name="LOADER_6" parent="LOADER_1">
+ <fileset dir="SAR-INF">
+ <include name="lib/cl4.jar"/>
+ </fileset>
+ </classloader>
+
<join name="JOIN_1">
<classloader-ref name="LOADER_1"/>
<classloader-ref name="LOADER_2"/>
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
