From ac5c79a80f34e92475428fc60282213c1fe4c41a Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 25 Jan 2002 11:23:21 +0000 Subject: [PATCH] Updated test case to reflect latest changes Submitted By: "Adam Murdoch" git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270848 13f79535-47bb-0310-9956-ffa450edef68 --- .../configurer/DefaultConfigurerTest.java | 24 +++++++++++-------- .../configurer/DefaultConfigurerTest.java | 24 +++++++++++-------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index da509e05f..6fafeb3d7 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -101,13 +101,17 @@ public class DefaultConfigurerTest m_componentManager.put( Configurer.ROLE, component ); components.add( component ); + // Setup a context + m_context = new DefaultTaskContext(); + components.add( m_context ); + // Log enable the components for( Iterator iterator = components.iterator(); iterator.hasNext(); ) { - component = (Component)iterator.next(); - if( component instanceof LogEnabled ) + Object obj = iterator.next(); + if( obj instanceof LogEnabled ) { - final LogEnabled logEnabled = (LogEnabled)component; + final LogEnabled logEnabled = (LogEnabled)obj; logEnabled.enableLogging( m_logger ); } } @@ -115,21 +119,21 @@ public class DefaultConfigurerTest // Compose the components for( Iterator iterator = components.iterator(); iterator.hasNext(); ) { - component = (Component)iterator.next(); - if( component instanceof Composable ) + Object obj = iterator.next(); + if( obj instanceof Composable ) { - final Composable composable = (Composable)component; + final Composable composable = (Composable)obj; composable.compose( m_componentManager ); } } + // Configure the context + final File baseDir = new File( "." ).getAbsoluteFile(); + m_context.setProperty( TaskContext.BASE_DIRECTORY, baseDir ); + // Find the configurer m_configurer = (Configurer)m_componentManager.lookup( Configurer.ROLE ); - // Setup a context - m_context = new DefaultTaskContext(); - final File baseDir = new File( "." ).getAbsoluteFile(); - m_context.setProperty( TaskContext.BASE_DIRECTORY, baseDir ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java index da509e05f..6fafeb3d7 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java @@ -101,13 +101,17 @@ public class DefaultConfigurerTest m_componentManager.put( Configurer.ROLE, component ); components.add( component ); + // Setup a context + m_context = new DefaultTaskContext(); + components.add( m_context ); + // Log enable the components for( Iterator iterator = components.iterator(); iterator.hasNext(); ) { - component = (Component)iterator.next(); - if( component instanceof LogEnabled ) + Object obj = iterator.next(); + if( obj instanceof LogEnabled ) { - final LogEnabled logEnabled = (LogEnabled)component; + final LogEnabled logEnabled = (LogEnabled)obj; logEnabled.enableLogging( m_logger ); } } @@ -115,21 +119,21 @@ public class DefaultConfigurerTest // Compose the components for( Iterator iterator = components.iterator(); iterator.hasNext(); ) { - component = (Component)iterator.next(); - if( component instanceof Composable ) + Object obj = iterator.next(); + if( obj instanceof Composable ) { - final Composable composable = (Composable)component; + final Composable composable = (Composable)obj; composable.compose( m_componentManager ); } } + // Configure the context + final File baseDir = new File( "." ).getAbsoluteFile(); + m_context.setProperty( TaskContext.BASE_DIRECTORY, baseDir ); + // Find the configurer m_configurer = (Configurer)m_componentManager.lookup( Configurer.ROLE ); - // Setup a context - m_context = new DefaultTaskContext(); - final File baseDir = new File( "." ).getAbsoluteFile(); - m_context.setProperty( TaskContext.BASE_DIRECTORY, baseDir ); } /**