bloritsch 2003/07/08 10:45:25
Modified: merlin/assembly/src/test/org/apache/avalon/assembly/engine
ApplianceTestCase.java
Log:
Optimize test and be explicit what we are testing for
Revision Changes Path
1.12 +7 -9
avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java
Index: ApplianceTestCase.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/test/org/apache/avalon/assembly/engine/ApplianceTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ApplianceTestCase.java 4 Jul 2003 07:31:23 -0000 1.11
+++ ApplianceTestCase.java 8 Jul 2003 17:45:24 -0000 1.12
@@ -78,7 +78,7 @@
*/
public class ApplianceTestCase extends TestBase
{
- private DefaultTypeRepository m_manager;
+ //private DefaultTypeRepository m_manager; Uncomment when it is used
protected EngineClassLoader m_engine;
@@ -86,11 +86,6 @@
protected ClassLoader m_loader = Thread.currentThread().getContextClassLoader();
- public ApplianceTestCase()
- {
- this( "ApplianceTestCase" );
- }
-
public ApplianceTestCase( String name )
{
super( name );
@@ -100,9 +95,11 @@
{
super.setUp();
+ /* Uncomment when it is used
DefaultTypeRepository manager = new DefaultTypeRepository( m_loader );
manager.enableLogging( getLogger().getChildLogger( "types" ) );
m_manager = manager;
+ */
m_engine = setUpEngine( true );
}
@@ -120,14 +117,15 @@
final String stage = "org.apache.avalon.playground.Demonstratable";
Appliance appliance = m_engine.resolve( m_graph, new StageDescriptor(
stage ) );
+ assertNotNull( appliance );
getLogger().info( "appliance: " + appliance.getURL() );
- assertTrue( true );
- } catch( Throwable e )
+ }
+ catch( Exception e )
{
final String reason = "Resolution failure.";
String error = ExceptionHelper.packException( reason, e );
getLogger().error( error );
- assertTrue( false );
+ fail();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
