donaldp 2002/09/16 01:12:17
Modified: loader/src/test/org/apache/excalibur/loader/builder/test
ReaderTestCase.java
loader/src/test/org/apache/excalibur/loader/test
AbstractLoaderTestCase.java
loader/src/test/org/apache/excalibur/loader/verifier/test
VerifierTestCase.java
Log:
Update the test cases to latest version.
Revision Changes Path
1.8 +5 -5
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/builder/test/ReaderTestCase.java
Index: ReaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/builder/test/ReaderTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ReaderTestCase.java 13 Sep 2002 11:38:42 -0000 1.7
+++ ReaderTestCase.java 16 Sep 2002 08:12:17 -0000 1.8
@@ -8,7 +8,7 @@
package org.apache.excalibur.loader.builder.test;
import org.apache.excalibur.loader.builder.ClassLoaderSetBuilder;
-import org.apache.excalibur.loader.metadata.ClassLoaderSetDef;
+import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
import org.apache.excalibur.loader.test.AbstractLoaderTestCase;
/**
@@ -27,7 +27,7 @@
public void testConfig1()
throws Exception
{
- final ClassLoaderSetDef defs =
+ final ClassLoaderSetMetaData defs =
buildFromResource( "config1.xml" );
assertEquals( "ClassLoader Predefined Count",
@@ -85,10 +85,10 @@
defs.getClassLoader( "cl1" ).getFilesets()[ 0
].getExcludes()[ 0 ],
"**/unwanted/*" );
assertEquals( "ClassLoader cl1.entrys[0] Location",
- defs.getClassLoader( "cl1" ).getEntrys()[ 0
].getLocation(),
+ defs.getClassLoader( "cl1" ).getEntrys()[ 0 ],
"someFile.jar" );
assertEquals( "ClassLoader cl1.entrys[1] Location",
- defs.getClassLoader( "cl1" ).getEntrys()[ 1
].getLocation(),
+ defs.getClassLoader( "cl1" ).getEntrys()[ 1 ],
"someOtherFile.jar" );
assertEquals( "ClassLoader cl2.entrys Name",
@@ -104,7 +104,7 @@
defs.getClassLoader( "cl2" ).getExtensions().length,
0 );
assertEquals( "ClassLoader cl2.entrys[0] Location",
- defs.getClassLoader( "cl2" ).getEntrys()[ 0
].getLocation(),
+ defs.getClassLoader( "cl2" ).getEntrys()[ 0 ],
"aFile.jar" );
assertEquals( "Join join1.refs Name",
1.3 +4 -4
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/AbstractLoaderTestCase.java
Index: AbstractLoaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/test/AbstractLoaderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractLoaderTestCase.java 13 Sep 2002 11:38:42 -0000 1.2
+++ AbstractLoaderTestCase.java 16 Sep 2002 08:12:17 -0000 1.3
@@ -12,7 +12,7 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.excalibur.loader.builder.ClassLoaderSetBuilder;
-import org.apache.excalibur.loader.metadata.ClassLoaderSetDef;
+import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
/**
*
@@ -22,7 +22,7 @@
*/
public class AbstractLoaderTestCase extends TestCase
{
- protected ClassLoaderSetDef buildFromStream( final InputStream stream )
+ protected ClassLoaderSetMetaData buildFromStream( final InputStream
stream )
throws Exception
{
try
@@ -45,7 +45,7 @@
return builder.build( stream );
}
- protected ClassLoaderSetDef buildFromResource( final String resource )
+ protected ClassLoaderSetMetaData buildFromResource( final String
resource )
throws Exception
{
final InputStream stream = getClass().getResourceAsStream( resource
);
1.3 +4 -4
jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/verifier/test/VerifierTestCase.java
Index: VerifierTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/verifier/test/VerifierTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VerifierTestCase.java 13 Sep 2002 11:38:42 -0000 1.2
+++ VerifierTestCase.java 16 Sep 2002 08:12:17 -0000 1.3
@@ -9,7 +9,7 @@
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.excalibur.loader.builder.ClassLoaderSetBuilder;
-import org.apache.excalibur.loader.metadata.ClassLoaderSetDef;
+import org.apache.excalibur.loader.metadata.ClassLoaderSetMetaData;
import org.apache.excalibur.loader.test.AbstractLoaderTestCase;
import org.apache.excalibur.loader.verifier.ClassLoaderVerifier;
@@ -229,7 +229,7 @@
{
try
{
- final ClassLoaderSetDef defs =
+ final ClassLoaderSetMetaData defs =
buildFromResource( "config13.xml" );
verify( defs );
}
@@ -246,11 +246,11 @@
private void verifyResource( final String resource )
throws Exception
{
- final ClassLoaderSetDef defs = buildFromResource( resource );
+ final ClassLoaderSetMetaData defs = buildFromResource( resource );
verify( defs );
}
- private void verify( final ClassLoaderSetDef defs )
+ private void verify( final ClassLoaderSetMetaData defs )
throws Exception
{
final ClassLoaderVerifier verifier = new ClassLoaderVerifier();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
