bloritsch 2002/09/11 13:36:18
Modified: container/src/java/org/apache/excalibur/container/classloader
ComponentClassLoader.java
container/src/test/org/apache/excalibur/container/classloader
full.jar
container/src/test/org/apache/excalibur/container/classloader/test
ComponentClassLoaderTestCase.java
Log:
fix bugs discovered with the testcase
Revision Changes Path
1.3 +6 -5
jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/classloader/ComponentClassLoader.java
Index: ComponentClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/container/src/java/org/apache/excalibur/container/classloader/ComponentClassLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentClassLoader.java 11 Sep 2002 19:58:49 -0000 1.2
+++ ComponentClassLoader.java 11 Sep 2002 20:36:18 -0000 1.3
@@ -138,12 +138,12 @@
while( attrIt.hasNext() )
{
- final String attrName = (String) it.next();
+ final String attrName = attrIt.next().toString();
if ( attrName.equals( BLOCK ) &&
attributes.getValue( attrName ).equals( "true" ) )
{
- m_blocks.add( cleanName( attrName ) );
+ m_blocks.add( cleanName( entry ) );
}
else if ( attrName.equals( AVALON ) )
{
@@ -151,11 +151,11 @@
if ( attrVal.equals( TYPE ) )
{
- m_types.add( cleanName( attrName ) );
+ m_types.add( cleanName( entry ) );
}
else if ( attrVal.equals( SERVICE ) )
{
- m_types.add( cleanName( attrName ) );
+ m_services.add( cleanName( entry ) );
}
else
{
@@ -176,6 +176,7 @@
*/
private final String cleanName( String name )
{
- return name.substring( 0, name.indexOf( ".class" ) );
+ int end = name.indexOf( ".class" );
+ return name.substring( 0, ( end >= 0 ) ? end : name.length() );
}
}
1.2 +2 -3
jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/full.jar
<<Binary file>>
1.3 +7 -8
jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/test/ComponentClassLoaderTestCase.java
Index: ComponentClassLoaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/container/src/test/org/apache/excalibur/container/classloader/test/ComponentClassLoaderTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentClassLoaderTestCase.java 11 Sep 2002 20:09:38 -0000 1.2
+++ ComponentClassLoaderTestCase.java 11 Sep 2002 20:36:18 -0000 1.3
@@ -38,7 +38,6 @@
m_blocks.add("org.apache.avalon.test.AnotherTest");
m_types = new HashSet();
- m_types.add("org.apache.avalon.test.EphemeralComponent");
m_types.add("org.apache.avalon.test.YetAnotherTest");
m_types.add("org.apache.avalon.test.HooHa");
@@ -49,7 +48,7 @@
public void testEmptyManifest()
{
- URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/empty.jar" );
+ URL jar = this.getClass().getClassLoader().getResource(
"org/apache/excalibur/container/classloader/empty.jar" );
assertTrue( jar != null );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
@@ -61,12 +60,12 @@
public void testBlocksManifest()
{
- URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
+ URL jar = this.getClass().getClassLoader().getResource(
"org/apache/excalibur/container/classloader/full.jar" );
assertTrue( jar != null );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] blocks = loader.getBlocks();
- assertEquals( blocks.length, m_blocks.size() );
+ assertEquals( m_blocks.size(), blocks.length );
for ( int i = 0; i < blocks.length; i++ )
{
@@ -76,12 +75,12 @@
public void testServicesManifest()
{
- URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
+ URL jar = this.getClass().getClassLoader().getResource(
"org/apache/excalibur/container/classloader/full.jar" );
assertTrue( jar != null );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] services = loader.getServices();
- assertEquals( services.length, m_services.size() );
+ assertEquals( m_services.size(), services.length );
for ( int i = 0; i < services.length; i++ )
{
@@ -91,12 +90,12 @@
public void testTypesManifest()
{
- URL jar = this.getClass().getClassLoader().getResource(
"/org/apache/excalibur/container/classloader/all.jar" );
+ URL jar = this.getClass().getClassLoader().getResource(
"org/apache/excalibur/container/classloader/full.jar" );
assertTrue( jar != null );
ComponentClassLoader loader = new ComponentClassLoader( new URL[] { jar } );
String[] types = loader.getTypes();
- assertEquals( types.length, m_types.size() );
+ assertEquals( m_types.size(), types.length );
for ( int i = 0; i < types.length; i++ )
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
