mcconnell 2003/02/27 15:17:50
Modified: assembly/src/test/org/apache/avalon/assembly/engine
ApplianceTestCase.java EngineTestCase.java
assembly/src/test/org/apache/avalon/assembly/engine/profile
ProfileManagerTestCase.java
assembly/src/test/org/apache/avalon/assembly/engine/service
DefaultServiceRepositoryTestCase.java
assembly/src/test/org/apache/avalon/assembly/engine/type
TypeManagerTestCase.java
assembly/src/test/org/apache/avalon/playground/basic
BasicContextImp.java
Added: assembly/src/test/org/apache/avalon/assembly TestBase.java
Removed: assembly/src/test/org/apache/avalon/assembly
TestCaseBase.java
Log:
General updates to support changes implemented under the appliance framework.
Revision Changes Path
1.1
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/TestBase.java
Index: TestBase.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.assembly;
import java.io.File;
import junit.framework.TestCase;
import org.apache.avalon.assembly.logging.LoggingManager;
import org.apache.avalon.assembly.logging.TargetDescriptor;
import org.apache.avalon.assembly.logging.LoggingDescriptor;
import org.apache.avalon.assembly.logging.DefaultLoggingManager;
import org.apache.avalon.assembly.locator.DefaultLocator;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.meta.model.Category;
/**
* A testcase for the @link{TypeManager}.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
public abstract class TestBase extends TestCase
{
protected LoggingManager m_logManager;
protected File m_base;
public TestBase( String name )
{
super( name );
}
protected void setUp() throws Exception
{
setUpLogging( "WARN" );
}
protected void setUpLogging( String priority ) throws Exception
{
m_base = new File( System.getProperty( "user.dir" ) );
LoggingDescriptor logging =
new LoggingDescriptor(
"", priority, null,
new TargetDescriptor[ 0 ],
new Category( "logging", "WARN" ) );
DefaultLocator context = new DefaultLocator();
context.put( "urn:assembly:home", m_base );
context.put( "urn:assembly:logging.descriptor", logging );
context.makeReadOnly();
DefaultLoggingManager manager = new DefaultLoggingManager();
manager.contextualize( context );
manager.initialize();
m_logManager = manager;
}
protected Logger getLogger()
{
return m_logManager.getLoggerForCategory("test");
}
}
1.3 +11 -8
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java
Index: ApplianceTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplianceTestCase.java 7 Feb 2003 15:39:14 -0000 1.2
+++ ApplianceTestCase.java 27 Feb 2003 23:17:49 -0000 1.3
@@ -17,7 +17,7 @@
import org.apache.avalon.assembly.locator.DefaultLocator;
import org.apache.avalon.meta.info.*;
import org.apache.avalon.meta.model.*;
-import org.apache.avalon.assembly.TestCaseBase;
+import org.apache.avalon.assembly.TestBase;
import org.apache.avalon.assembly.engine.Engine;
import org.apache.avalon.assembly.engine.type.TypeManager;
import org.apache.avalon.assembly.appliance.Appliance;
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
-public class ApplianceTestCase extends TestCaseBase
+public class ApplianceTestCase extends TestBase
{
private TypeManager m_manager;
@@ -75,16 +75,18 @@
try
{
final String classname = "org.apache.avalon.playground.DemoManager";
- final String stage = "org.apache.avalon.playground.Demonstratable";
m_engine.register( classname );
- m_engine.register( stage );
+
+ final String stage = "org.apache.avalon.playground.Demonstratable";
Appliance appliance = m_engine.resolve( m_graph, new StageDescriptor(
stage ) );
getLogger().info("appliance: " + appliance.getURL() );
assertTrue( true );
}
catch( Throwable e )
{
- ExceptionHelper.printException( "Resolution failure.", e, this, true );
+ final String reason = "Resolution failure.";
+ String error = ExceptionHelper.packException( reason, e );
+ getLogger().error( error );
assertTrue( false );
}
}
@@ -106,9 +108,10 @@
}
catch( Exception e )
{
- ExceptionHelper.printException( "Engine setup failure.", e, this, true
);
- assertTrue( false );
- throw e;
+ final String reason = "Engine setup failure.";
+ String error = ExceptionHelper.packException( reason, e );
+ getLogger().error( error );
+ throw new Exception( reason );
}
}
1.18 +9 -5
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java
Index: EngineTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/EngineTestCase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EngineTestCase.java 23 Feb 2003 14:06:02 -0000 1.17
+++ EngineTestCase.java 27 Feb 2003 23:17:49 -0000 1.18
@@ -17,7 +17,7 @@
import org.apache.avalon.assembly.locator.DefaultLocator;
import org.apache.avalon.meta.info.*;
import org.apache.avalon.meta.model.*;
-import org.apache.avalon.assembly.TestCaseBase;
+import org.apache.avalon.assembly.TestBase;
import org.apache.avalon.assembly.engine.Engine;
import org.apache.avalon.assembly.appliance.Appliance;
import org.apache.avalon.assembly.appliance.ApplianceContext;
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
-public class EngineTestCase extends TestCaseBase
+public class EngineTestCase extends TestBase
{
protected EngineClassLoader m_engine;
@@ -65,7 +65,7 @@
final String exploitation =
"org.apache.avalon.playground.ExploitationManager";
final String simple = "org.apache.avalon.playground.SimpleComponent";
final String basic = "org.apache.avalon.playground.basic.BasicComponent";
- final String context =
"org.apache.avalon.assembly.lifecycle.context.DefaultContextManager";
+ final String context =
"org.apache.avalon.assembly.lifecycle.context.AvalonContextualizer";
final String[] classnames = new String[]{
complex, demo, exploitation, simple, basic, context };
@@ -98,7 +98,9 @@
}
catch( Throwable e )
{
- ExceptionHelper.printException( "Resolution failure.", e, appliance,
true );
+ final String reason = "Resolution failure.";
+ String error = ExceptionHelper.packException( reason, e );
+ getLogger().error( error );
assertTrue( false );
}
@@ -114,7 +116,9 @@
}
catch( Throwable e )
{
- ExceptionHelper.printException( "Access failure.", e, appliance, true );
+ final String reason = "Access failure.";
+ String error = ExceptionHelper.packException( reason, e );
+ getLogger().error( error );
assertTrue( false );
}
}
1.3 +2 -2
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/profile/ProfileManagerTestCase.java
Index: ProfileManagerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/profile/ProfileManagerTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfileManagerTestCase.java 7 Feb 2003 15:39:15 -0000 1.2
+++ ProfileManagerTestCase.java 27 Feb 2003 23:17:50 -0000 1.3
@@ -18,14 +18,14 @@
import org.apache.avalon.assembly.engine.profile.*;
import org.apache.avalon.meta.info.*;
import org.apache.avalon.meta.model.*;
-import org.apache.avalon.assembly.TestCaseBase;
+import org.apache.avalon.assembly.TestBase;
/**
* A testcase for the @link{ProfileManager}.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
-public class ProfileManagerTestCase extends TestCaseBase
+public class ProfileManagerTestCase extends TestBase
{
private ProfileManager m_manager;
1.3 +2 -2
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/service/DefaultServiceRepositoryTestCase.java
Index: DefaultServiceRepositoryTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/service/DefaultServiceRepositoryTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceRepositoryTestCase.java 7 Feb 2003 15:39:15 -0000 1.2
+++ DefaultServiceRepositoryTestCase.java 27 Feb 2003 23:17:50 -0000 1.3
@@ -16,14 +16,14 @@
import org.apache.avalon.assembly.engine.service.*;
import org.apache.avalon.assembly.engine.type.*;
import org.apache.avalon.meta.info.*;
-import org.apache.avalon.assembly.TestCaseBase;
+import org.apache.avalon.assembly.TestBase;
/**
* A testcase for the @link{DefaultServiceRepository}.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
-public class DefaultServiceRepositoryTestCase extends TestCaseBase
+public class DefaultServiceRepositoryTestCase extends TestBase
{
private ServiceRepository m_manager;
1.4 +2 -2
avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/type/TypeManagerTestCase.java
Index: TypeManagerTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/assembly/engine/type/TypeManagerTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TypeManagerTestCase.java 23 Feb 2003 14:06:14 -0000 1.3
+++ TypeManagerTestCase.java 27 Feb 2003 23:17:50 -0000 1.4
@@ -15,7 +15,7 @@
import org.apache.avalon.assembly.engine.service.*;
import org.apache.avalon.assembly.engine.type.*;
import org.apache.avalon.meta.info.*;
-import org.apache.avalon.assembly.TestCaseBase;
+import org.apache.avalon.assembly.TestBase;
import org.apache.avalon.assembly.util.ExceptionHelper;
/**
@@ -23,7 +23,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
-public class TypeManagerTestCase extends TestCaseBase
+public class TypeManagerTestCase extends TestBase
{
private TypeManager m_manager;
1.3 +2 -2
avalon-sandbox/assembly/src/test/org/apache/avalon/playground/basic/BasicContextImp.java
Index: BasicContextImp.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/assembly/src/test/org/apache/avalon/playground/basic/BasicContextImp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicContextImp.java 7 Feb 2003 15:39:26 -0000 1.2
+++ BasicContextImp.java 27 Feb 2003 23:17:50 -0000 1.3
@@ -75,9 +75,9 @@
* @param map the context name/value map
* @param parent a possibly parent context
*/
- public BasicContextImp( Map map, Context parent )
+ public BasicContextImp( Map map )
{
- super( map, parent );
+ super( map );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
