ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer DefaultConfigurerTest.java
Date Fri, 01 Feb 2002 06:46:49 GMT
adammurdoch    02/01/31 22:46:49

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer
                        DefaultObjectConfigurer.java Resources.properties
               proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer
                        DefaultConfigurerTest.java
  Log:
  Got rid of some detail from an error message, so that the mesage
  is independent of the method introspection order.  This is to get
  the unit tests to pass with the IBM JVM.
  
  Revision  Changes    Path
  1.9       +2 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java
  
  Index: DefaultObjectConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/DefaultObjectConfigurer.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultObjectConfigurer.java	28 Jan 2002 00:49:13 -0000	1.8
  +++ DefaultObjectConfigurer.java	1 Feb 2002 06:46:49 -0000	1.9
  @@ -26,7 +26,7 @@
    * of a class.
    *
    * @author <a href="mailto:adammurdoch_ml@yahoo.com">Adam Murdoch</a>
  - * @version $Revision: 1.8 $ $Date: 2002/01/28 00:49:13 $
  + * @version $Revision: 1.9 $ $Date: 2002/02/01 06:46:49 $
    */
   class DefaultObjectConfigurer
       implements ObjectConfigurer
  @@ -195,9 +195,7 @@
                       // Both are string, or both are not string
                       final String message =
                           REZ.getString( "multiple-typed-adder-methods-for-element.error",
  -                                       m_class.getName(),
  -                                       type.getName(),
  -                                       currentType.getName() );
  +                                       m_class.getName() );
                       throw new ConfigurationException( message );
                   }
                   else if( currentType != String.class && type == String.class )
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/configurer/Resources.properties,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Resources.properties	1 Feb 2002 00:37:58 -0000	1.8
  +++ Resources.properties	1 Feb 2002 06:46:49 -0000	1.9
  @@ -4,7 +4,7 @@
   mismatch-ref-types.error=Mismatched type for reference "{0}".  Was expecting an object
of type {1}, instead found an object of type {2}.
   incompatible-element-types.error=Incompatible creator and adder/setter methods found in
class {0} for property "{1}".
   multiple-adder-methods-for-element.error=Multiple adder/setter methods found in class {0}
for property "{1}".
  -multiple-typed-adder-methods-for-element.error=Multiple typed add() methods found in class
{0} that accept different types {1} and {2}.
  +multiple-typed-adder-methods-for-element.error=Multiple typed add() methods found in class
{0}.
   multiple-creator-methods-for-element.error=Multiple creator methods found in class {0}
for property "{1}".
   multiple-content-setter-methods.error=Multiple content setter methods found in class {0}.
   pending-property-value.error=An object created using the creator method has not been set
using the adder/setter method.
  
  
  
  1.8       +1 -3      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultConfigurerTest.java	1 Feb 2002 00:37:59 -0000	1.7
  +++ DefaultConfigurerTest.java	1 Feb 2002 06:46:49 -0000	1.8
  @@ -409,9 +409,7 @@
           catch( final ConfigurationException ce )
           {
               final String message = REZ.getString( "multiple-typed-adder-methods-for-element.error",
  -                                                  ConfigTest5.class.getName(),
  -                                                  MyRole1.class.getName(),
  -                                                  MyRole2.class.getName() );
  +                                                  ConfigTest5.class.getName() );
               assertSameMessage( message, ce );
           }
       }
  
  
  

--
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