ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type TypeFactoryTest.java
Date Fri, 01 Mar 2002 08:54:35 GMT
donaldp     02/03/01 00:54:35

  Modified:    proposal/myrmidon/src/testcases/org/apache/antlib/core
                        PropertyTest.java
               proposal/myrmidon/src/testcases/org/apache/antlib/vfile
                        CopyFilesTaskTest.java
               proposal/myrmidon/src/testcases/org/apache/aut/vfs
                        AbstractFileSystemTest.java
                        AbstractWritableFileSystemTest.java
               proposal/myrmidon/src/testcases/org/apache/aut/zip
                        ZipEntryTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon
                        AbstractMyrmidonTest.java AbstractProjectTest.java
                        DependencyMetricsTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer
                        ConfigTest4.java ConfigTestMultiTypedAdder.java
                        ConfigTestPrimConvert.java
                        DefaultConfigurerTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer
                        DefaultDeployerTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor
                        DefaultEmbeddorTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role
                        DefaultRoleManagerTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service
                        InstantiatingServiceManagerTest.java
               proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type
                        TypeFactoryTest.java
  Log:
  restyle via IDEA
  
  Revision  Changes    Path
  1.2       +4 -5      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java
  
  Index: PropertyTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PropertyTest.java	26 Feb 2002 23:26:55 -0000	1.1
  +++ PropertyTest.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -12,13 +12,12 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.AbstractProjectTest;
   import org.apache.myrmidon.LogMessageTracker;
  -import org.apache.myrmidon.components.configurer.DefaultConfigurer;
   
   /**
    * Test cases for <property> task.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/26 23:26:55 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:34 $
    */
   public class PropertyTest
       extends AbstractProjectTest
  @@ -42,17 +41,17 @@
   
           // Set by attribute
           LogMessageTracker tracker = new LogMessageTracker();
  -        tracker.addExpectedMessage( "set-attr", "test-prop = [some value]");
  +        tracker.addExpectedMessage( "set-attr", "test-prop = [some value]" );
           executeTarget( projectFile, "set-attr", tracker );
   
           // Set by text content
           tracker = new LogMessageTracker();
  -        tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]");
  +        tracker.addExpectedMessage( "set-content", "test-prop2 = [some value]" );
           executeTarget( projectFile, "set-content", tracker );
   
           // Set by nested element
           tracker = new LogMessageTracker();
  -        tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]");
  +        tracker.addExpectedMessage( "set-element", "test-prop3 = [value=[some value]]"
);
           executeTarget( projectFile, "set-element", tracker );
       }
   
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java
  
  Index: CopyFilesTaskTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CopyFilesTaskTest.java	21 Feb 2002 03:26:23 -0000	1.1
  +++ CopyFilesTaskTest.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -7,14 +7,14 @@
    */
   package org.apache.antlib.vfile;
   
  -import org.apache.myrmidon.AbstractProjectTest;
   import java.io.File;
  +import org.apache.myrmidon.AbstractProjectTest;
   
   /**
    * Test cases for the <v-copy> task.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/21 03:26:23 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:34 $
    */
   public class CopyFilesTaskTest
       extends AbstractProjectTest
  
  
  
  1.3       +10 -13    jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java
  
  Index: AbstractFileSystemTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractFileSystemTest.java	10 Feb 2002 02:34:13 -0000	1.2
  +++ AbstractFileSystemTest.java	1 Mar 2002 08:54:34 -0000	1.3
  @@ -9,14 +9,11 @@
   
   import java.io.ByteArrayOutputStream;
   import java.io.InputStream;
  -import java.io.Reader;
  -import java.io.StringWriter;
   import java.util.ArrayList;
   import java.util.Arrays;
   import java.util.HashMap;
   import java.util.List;
   import java.util.Map;
  -import junit.framework.TestCase;
   import org.apache.aut.vfs.impl.DefaultFileSystemManager;
   import org.apache.myrmidon.AbstractMyrmidonTest;
   
  @@ -203,21 +200,21 @@
       /**
        * Checks that a relative name resolves to the expected absolute path.
        */
  -    private void assertSameName(String expectedPath,
  -                                FileName baseName,
  -                                String relName ) throws Exception
  +    private void assertSameName( String expectedPath,
  +                                 FileName baseName,
  +                                 String relName ) throws Exception
       {
  -        FileName name = baseName.resolveName(relName);
  +        FileName name = baseName.resolveName( relName );
           assertEquals( expectedPath, name.getPath() );
   
           // Replace the separators
  -        relName.replace('\\', '/');
  -        name = baseName.resolveName(relName);
  +        relName.replace( '\\', '/' );
  +        name = baseName.resolveName( relName );
           assertEquals( expectedPath, name.getPath() );
   
           // And again
  -        relName.replace('/', '\\');
  -        name = baseName.resolveName(relName);
  +        relName.replace( '/', '\\' );
  +        name = baseName.resolveName( relName );
           assertEquals( expectedPath, name.getPath() );
       }
   
  @@ -457,12 +454,12 @@
           // Test non-empty file
           FileObject file = m_baseFolder.resolveFile( "file1.txt" );
           FileContent content = file.getContent();
  -        assertSameContent(m_charContent, content);
  +        assertSameContent( m_charContent, content );
   
           // Test empty file
           file = m_baseFolder.resolveFile( "empty.txt" );
           content = file.getContent();
  -        assertSameContent("", content);
  +        assertSameContent( "", content );
       }
   
       /**
  
  
  
  1.3       +0 -1      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java
  
  Index: AbstractWritableFileSystemTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractWritableFileSystemTest.java	10 Feb 2002 02:34:13 -0000	1.2
  +++ AbstractWritableFileSystemTest.java	1 Mar 2002 08:54:34 -0000	1.3
  @@ -7,7 +7,6 @@
    */
   package org.apache.aut.vfs;
   
  -import java.io.Writer;
   import java.io.OutputStream;
   import java.util.HashSet;
   import java.util.Set;
  
  
  
  1.2       +1 -1      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java
  
  Index: ZipEntryTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ZipEntryTest.java	2 Feb 2002 07:39:53 -0000	1.1
  +++ ZipEntryTest.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -7,8 +7,8 @@
    */
   package org.apache.aut.zip;
   
  -import junit.framework.TestCase;
   import java.util.NoSuchElementException;
  +import junit.framework.TestCase;
   
   /**
    * JUnit testcases ZipEntry.
  
  
  
  1.6       +3 -3      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
  
  Index: AbstractMyrmidonTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractMyrmidonTest.java	26 Feb 2002 23:26:55 -0000	1.5
  +++ AbstractMyrmidonTest.java	1 Mar 2002 08:54:34 -0000	1.6
  @@ -39,9 +39,9 @@
           final String baseDirProp = System.getProperty( "test.basedir" );
           m_baseDir = new File( baseDirProp );
           String packagePath = getClass().getName();
  -        int idx = packagePath.lastIndexOf('.');
  -        packagePath = packagePath.substring(0, idx);
  -        packagePath = packagePath.replace('.', File.separatorChar);
  +        int idx = packagePath.lastIndexOf( '.' );
  +        packagePath = packagePath.substring( 0, idx );
  +        packagePath = packagePath.replace( '.', File.separatorChar );
           m_testBaseDir = new File( m_baseDir, packagePath );
       }
   
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java
  
  Index: AbstractProjectTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractProjectTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractProjectTest.java	26 Feb 2002 23:26:55 -0000	1.3
  +++ AbstractProjectTest.java	1 Mar 2002 08:54:34 -0000	1.4
  @@ -20,7 +20,7 @@
    * A base class for test cases which need to execute projects.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/02/26 23:26:55 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/01 08:54:34 $
    */
   public class AbstractProjectTest
       extends AbstractMyrmidonTest
  @@ -77,7 +77,7 @@
                                                final String targetName,
                                                final String message )
       {
  -        executeTargetExpectError( projectFile, targetName, new String[] { message } );
  +        executeTargetExpectError( projectFile, targetName, new String[]{message} );
       }
   
       /**
  
  
  
  1.3       +11 -11    jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java
  
  Index: DependencyMetricsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/DependencyMetricsTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DependencyMetricsTest.java	7 Feb 2002 09:24:35 -0000	1.2
  +++ DependencyMetricsTest.java	1 Mar 2002 08:54:34 -0000	1.3
  @@ -20,7 +20,7 @@
    * fall in acceptable limits.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/07 09:24:35 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:34 $
    */
   public class DependencyMetricsTest
       extends TestCase
  @@ -171,17 +171,17 @@
        * Make sure that antlib package does not have any
        * unwanted dependencies.
        */
  -/*
  -    public void testAntlibDecoupled()
  -    {
  -        final String packageName = "org.apache.antlib";
  -        final String[] badEfferents = new String[]
  +    /*
  +        public void testAntlibDecoupled()
           {
  -            "org.apache.tools.ant"
  -        };
  -        doTestDecoupled( packageName, badEfferents );
  -    }
  -*/
  +            final String packageName = "org.apache.antlib";
  +            final String[] badEfferents = new String[]
  +            {
  +                "org.apache.tools.ant"
  +            };
  +            doTestDecoupled( packageName, badEfferents );
  +        }
  +    */
       /**
        * Make sure there are no circular dependencies between packages because
        * circular dependencies are evil!!!
  
  
  
  1.3       +1 -3      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java
  
  Index: ConfigTest4.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTest4.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConfigTest4.java	25 Feb 2002 10:42:44 -0000	1.2
  +++ ConfigTest4.java	1 Mar 2002 08:54:34 -0000	1.3
  @@ -7,13 +7,11 @@
    */
   package org.apache.myrmidon.components.configurer;
   
  -
  -
   /**
    * Simple class to test typed adder.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $ $Date: 2002/02/25 10:42:44 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:34 $
    */
   public class ConfigTest4
   {
  
  
  
  1.2       +1 -3      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java
  
  Index: ConfigTestMultiTypedAdder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestMultiTypedAdder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigTestMultiTypedAdder.java	25 Feb 2002 10:42:45 -0000	1.1
  +++ ConfigTestMultiTypedAdder.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -7,13 +7,11 @@
    */
   package org.apache.myrmidon.components.configurer;
   
  -
  -
   /**
    * Simple class with more than one typed adder method.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/25 10:42:45 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:34 $
    */
   public class ConfigTestMultiTypedAdder
   {
  
  
  
  1.2       +1 -1      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java
  
  Index: ConfigTestPrimConvert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestPrimConvert.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConfigTestPrimConvert.java	25 Feb 2002 10:42:45 -0000	1.1
  +++ ConfigTestPrimConvert.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -36,7 +36,7 @@
           {
               return false;
           }
  -        if ( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) )
  +        if( !AbstractComponentTest.equals( m_integerProp, test.m_integerProp ) )
           {
               return false;
           }
  
  
  
  1.17      +4 -4      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java
  
  Index: DefaultConfigurerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultConfigurerTest.java	25 Feb 2002 10:42:45 -0000	1.16
  +++ DefaultConfigurerTest.java	1 Mar 2002 08:54:34 -0000	1.17
  @@ -103,7 +103,7 @@
           // Check result
           final ConfigTestPrimConvert expected = new ConfigTestPrimConvert();
           expected.setIntProp( 90 );
  -        expected.setIntegerProp( new Integer(-401) );
  +        expected.setIntegerProp( new Integer( -401 ) );
           assertEquals( expected, test );
       }
   
  @@ -381,7 +381,7 @@
           final ConfigTestInterfaceProp test = new ConfigTestInterfaceProp();
   
           // Configure object
  -        m_configurer.configure( test, config,  m_context );
  +        m_configurer.configure( test, config, m_context );
   
           // Check result
           final ConfigTestInterfaceProp expected = new ConfigTestInterfaceProp();
  @@ -442,7 +442,7 @@
                   REZ.getString( "bad-configure-element.error", "test" ),
                   REZ.getString( "multiple-adder-methods-for-element.error",
                                  ConfigTestMultiTypedAdder.class.getName(),
  -                               "")
  +                               "" )
               };
               assertSameMessage( messages, ce );
           }
  @@ -541,7 +541,7 @@
           config.setAttribute( "my-role1", "some value" );
   
           // Set up the converter and role
  -        registerRole( new RoleInfo("my-role1", MyRole1.class ) );
  +        registerRole( new RoleInfo( "my-role1", MyRole1.class ) );
           registerConverter( ObjectToMyRole1Converter.class, String.class, MyRole1.class
);
   
           final ConfigTestTypedProp test = new ConfigTestTypedProp();
  
  
  
  1.11      +4 -4      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java
  
  Index: DefaultDeployerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultDeployerTest.java	25 Feb 2002 10:42:45 -0000	1.10
  +++ DefaultDeployerTest.java	1 Mar 2002 08:54:34 -0000	1.11
  @@ -69,13 +69,13 @@
           // Determine the shorthand for the DataType role
   
           // Create the type definition
  -        final TypeDefinition typeDef =  new TypeDefinition( typeName, DATA_TYPE_ROLE, classname
);
  +        final TypeDefinition typeDef = new TypeDefinition( typeName, DATA_TYPE_ROLE, classname
);
   
           final ClassLoader classLoader = getClass().getClassLoader();
           final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader );
   
           // Make sure the test types have not been deployed
  -        assertTypesNotRegistered( );
  +        assertTypesNotRegistered();
   
           // Deploy the type
           typeDeployer.deployType( typeDef );
  @@ -103,7 +103,7 @@
           final TypeDeployer typeDeployer = m_deployer.createDeployer( classLoader );
   
           // Make sure the test types have not been deployed
  -        assertTypesNotRegistered( );
  +        assertTypesNotRegistered();
   
           // Deploy the type
           typeDeployer.deployType( typeDef );
  @@ -176,7 +176,7 @@
        * Ensures the types from the test typelib descriptor have been correctly
        * deployed.
        */
  -    private void assertTypesRegistered( ) throws Exception
  +    private void assertTypesRegistered() throws Exception
       {
           // Check the data-type
           TypeFactory typeFactory = getTypeManager().getFactory( DataType.class );
  
  
  
  1.4       +3 -3      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java
  
  Index: DefaultEmbeddorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultEmbeddorTest.java	26 Feb 2002 23:26:56 -0000	1.3
  +++ DefaultEmbeddorTest.java	1 Mar 2002 08:54:34 -0000	1.4
  @@ -21,7 +21,7 @@
    * Test cases for the default embeddor.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/02/26 23:26:56 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/01 08:54:34 $
    */
   public class DefaultEmbeddorTest
       extends AbstractProjectTest
  @@ -50,11 +50,11 @@
   
           final Target implicitTarget = project.getImplicitTarget();
           assertEquals( 1, implicitTarget.getTasks().length );
  -        assertEquals( "property", implicitTarget.getTasks()[0].getName() );
  +        assertEquals( "property", implicitTarget.getTasks()[ 0 ].getName() );
   
           final Target target = project.getTarget( "main-target" );
           assertEquals( 1, target.getTasks().length );
  -        assertEquals( "log", target.getTasks()[0].getName() );
  +        assertEquals( "log", target.getTasks()[ 0 ].getName() );
       }
   
       /**
  
  
  
  1.2       +6 -6      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java
  
  Index: DefaultRoleManagerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultRoleManagerTest.java	21 Feb 2002 12:52:07 -0000	1.1
  +++ DefaultRoleManagerTest.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -7,19 +7,19 @@
    */
   package org.apache.myrmidon.components.role;
   
  +import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.AbstractMyrmidonTest;
   import org.apache.myrmidon.api.Task;
  -import org.apache.myrmidon.interfaces.role.RoleManager;
  -import org.apache.myrmidon.interfaces.role.RoleInfo;
   import org.apache.myrmidon.interfaces.role.RoleException;
  -import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  +import org.apache.myrmidon.interfaces.role.RoleInfo;
  +import org.apache.myrmidon.interfaces.role.RoleManager;
   
   /**
    * Test cases for the DefaultRoleManager.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/21 12:52:07 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:34 $
    */
   public class DefaultRoleManagerTest
       extends AbstractMyrmidonTest
  @@ -51,7 +51,7 @@
   
           // Lookup the role
           RoleInfo role = m_roleManager.getRole( roleName );
  -        assertTrue( origRole.equals(role) );
  +        assertTrue( origRole.equals( role ) );
   
           // Lookup the role by shorthand
           role = m_roleManager.getRoleByShorthandName( shorthand );
  
  
  
  1.2       +2 -2      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java
  
  Index: InstantiatingServiceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InstantiatingServiceManagerTest.java	24 Feb 2002 07:43:38 -0000	1.1
  +++ InstantiatingServiceManagerTest.java	1 Mar 2002 08:54:34 -0000	1.2
  @@ -22,7 +22,7 @@
    * Test cases for the default service manager.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/24 07:43:38 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/01 08:54:34 $
    */
   public class InstantiatingServiceManagerTest
       extends AbstractComponentTest
  @@ -113,7 +113,7 @@
       {
           // Make sure that hasService() works correctly
           final String serviceRole = "some-unknown-service";
  -        assertTrue( ! m_serviceManager.hasService( serviceRole ) );
  +        assertTrue( !m_serviceManager.hasService( serviceRole ) );
   
           // Make sure that lookup() fails
           try
  
  
  
  1.4       +1 -2      jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java
  
  Index: TypeFactoryTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeFactoryTest.java	21 Feb 2002 03:23:38 -0000	1.3
  +++ TypeFactoryTest.java	1 Mar 2002 08:54:35 -0000	1.4
  @@ -9,14 +9,13 @@
   
   import java.io.File;
   import java.net.URL;
  -import junit.framework.TestCase;
   import org.apache.myrmidon.AbstractMyrmidonTest;
   
   /**
    * These are unit tests that test the basic operation of TypeFactories.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.3 $ $Date: 2002/02/21 03:23:38 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/01 08:54:35 $
    */
   public class TypeFactoryTest
       extends AbstractMyrmidonTest
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message