avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox/meta/api/src/test/org/apache/avalon/meta/info/test StageDescriptorTestCase.java
Date Fri, 11 Jul 2003 20:22:56 GMT
bloritsch    2003/07/11 13:22:55

  Modified:    meta/api/src/java/org/apache/avalon/meta/info
                        ReferenceDescriptor.java ServiceDescriptor.java
                        StageDescriptor.java
  Added:       meta/api/src/test/org/apache/avalon/meta/info/test
                        StageDescriptorTestCase.java
  Log:
  Fix some comparator logic and add a new TestCase
  
  Revision  Changes    Path
  1.4       +2 -2      avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ReferenceDescriptor.java
  
  Index: ReferenceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ReferenceDescriptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ReferenceDescriptor.java	11 Jul 2003 19:27:28 -0000	1.3
  +++ ReferenceDescriptor.java	11 Jul 2003 20:22:53 -0000	1.4
  @@ -203,7 +203,7 @@
           }
           else if ( other instanceof ServiceDescriptor )
           {
  -            match = ( (Service) other ).matches( this );
  +            match = ( (ServiceDescriptor) other ).getReference().matches( this );
           }
   
           return match;
  
  
  
  1.3       +9 -2      avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ServiceDescriptor.java
  
  Index: ServiceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/ServiceDescriptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ServiceDescriptor.java	10 Jul 2003 21:01:09 -0000	1.2
  +++ ServiceDescriptor.java	11 Jul 2003 20:22:54 -0000	1.3
  @@ -144,6 +144,13 @@
        */
       public int hashCode()
       {
  -        return getReference().hashCode();
  +        return m_designator.hashCode();
  +    }
  +
  +    public boolean equals(Object other)
  +    {
  +        boolean isEqual = super.equals( other ) && other instanceof ServiceDescriptor;
  +        isEqual = isEqual && m_designator.equals( ( (ServiceDescriptor) other ).m_designator
);
  +        return isEqual;
       }
   }
  
  
  
  1.3       +9 -2      avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/StageDescriptor.java
  
  Index: StageDescriptor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/StageDescriptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StageDescriptor.java	10 Jul 2003 21:01:09 -0000	1.2
  +++ StageDescriptor.java	11 Jul 2003 20:22:54 -0000	1.3
  @@ -123,7 +123,14 @@
        */
       public int hashCode()
       {
  -        return getReference().hashCode();
  +        return m_reference.hashCode();
  +    }
  +
  +    public boolean equals(Object other)
  +    {
  +        boolean isEqual = super.equals(other) && other instanceof StageDescriptor;
  +        isEqual = isEqual && m_reference.equals(((StageDescriptor)other).m_reference);
  +        return isEqual;
       }
   
       public String toString()
  
  
  
  1.1                  avalon-sandbox/meta/api/src/test/org/apache/avalon/meta/info/test/StageDescriptorTestCase.java
  
  Index: StageDescriptorTestCase.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
      must not be used to endorse or promote products derived from this  software
      without  prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.avalon.meta.info.test;
  
  import junit.framework.TestCase;
  import org.apache.avalon.meta.info.*;
  import org.apache.avalon.framework.Version;
  
  /**
   * ServiceDescriptorTestCase does XYZ
   *
   * @author <a href="bloritsch.at.apache.org">Berin Loritsch</a>
   * @version CVS $ Revision: 1.1 $
   */
  public class StageDescriptorTestCase extends AbstractDescriptorTestCase
  {
      private ReferenceDescriptor m_reference;
  
      public StageDescriptorTestCase( String name )
      {
          super( name );
      }
  
      protected Descriptor getDescriptor()
      {
          return new StageDescriptor(m_reference, getProperties());
      }
  
      public void setUp()
      {
          m_reference = new ReferenceDescriptor( StageDescriptorTestCase.class.getName(),
Version.getVersion( "1.2.3" ) );
      }
  
  
      public void testConstructor()
      {
          try
          {
              new StageDescriptor( null, getProperties() );
              fail( "Did not throw the expected NullPointerException" );
          }
          catch ( NullPointerException npe )
          {
              // Sucess!
          }
      }
  
      protected void checkDescriptor( Descriptor desc )
      {
          super.checkDescriptor( desc );
          StageDescriptor stage = (StageDescriptor) desc;
  
          assertEquals( m_reference, stage.getReference() );
      }
  }
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message