avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-components/datasources-impl/src/test/datasources StandardTestCase.java
Date Fri, 21 Nov 2003 10:39:22 GMT
mcconnell    2003/11/21 02:39:22

  Modified:    datasources-impl project.xml
               datasources-impl/conf block.xml
  Added:       datasources-impl/src/test/datasources StandardTestCase.java
  Log:
  Add empty testcase to emable resolution of reposrted NPE.
  
  Revision  Changes    Path
  1.3       +12 -2     avalon-components/datasources-impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/datasources-impl/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	17 Jul 2003 21:12:40 -0000	1.2
  +++ project.xml	21 Nov 2003 10:39:22 -0000	1.3
  @@ -20,7 +20,7 @@
       <dependency>
         <groupId>cornerstone-datasources</groupId>
         <artifactId>cornerstone-datasources-api</artifactId>
  -      <version>SNAPSHOT</version>
  +      <version>1.0</version>
       </dependency>
   
       <!-- excalibur dependencies -->
  @@ -39,13 +39,15 @@
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-api</artifactId>
  -      <version>SNAPSHOT</version>
  +      <version>4.1.5</version>
       </dependency>
  +    <!--
       <dependency>
         <groupId>avalon-framework</groupId>
         <artifactId>avalon-framework-impl</artifactId>
         <version>SNAPSHOT</version>
       </dependency>
  +    -->
   
       <!-- pre JDK 1.4 dependencies -->
   
  @@ -59,6 +61,14 @@
         <id>xerces</id>
         <version>2.2.1</version>
         <url>http://xml.apache.org/xerces2-j/</url>
  +    </dependency>
  +
  +    <!-- testing -->
  +
  +    <dependency>
  +      <groupId>merlin</groupId>
  +      <artifactId>merlin-unit</artifactId>
  +      <version>3.2.3-dev</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.7       +1 -2      avalon-components/datasources-impl/conf/block.xml
  
  Index: block.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/datasources-impl/conf/block.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- block.xml	24 Aug 2003 12:54:51 -0000	1.6
  +++ block.xml	21 Nov 2003 10:39:22 -0000	1.7
  @@ -3,7 +3,7 @@
   Thread Block deployment directive.
   -->
   
  -<container name="threads">
  +<container name="datasources">
   
      <services>
        <service type="org.apache.avalon.cornerstone.services.datasources.DataSourceSelector">
  @@ -14,7 +14,6 @@
      <classloader>
        <classpath>
          <repository>
  -         <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
            <resource id="excalibur-pool:excalibur-pool" version="1.2"/>
            <resource id="excalibur-datasource:excalibur-datasource" version="1.1.1"/>
            <resource id="cornerstone-datasources:cornerstone-datasources-api" version="1.0"/>
  
  
  
  1.1                  avalon-components/datasources-impl/src/test/datasources/StandardTestCase.java
  
  Index: StandardTestCase.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 2002-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", "Apache Avalon", "Avalon Framework" 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 datasources;
  
  import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
  
  import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
  
  /**
   * Hello Test Case.
   *
   * @author mcconnell@apache.org
   */
  public class StandardTestCase extends AbstractMerlinTestCase
  {
  
      //--------------------------------------------------------
      // constructors
      //--------------------------------------------------------
  
     /**
      * @param name the name of the test case
      * @param root the merlin system install directory
      */
      public StandardTestCase( String name )
      {
          super( 
            MAVEN_TARGET_CLASSES_DIR, 
            MERLIN_DEFAULT_CONFIG_FILE, 
            MERLIN_INFO_OFF, 
            MERLIN_DEBUG_ON, 
            name );
      }
  
      //--------------------------------------------------------
      // testcase
      //--------------------------------------------------------
  
      public void testService() throws Exception
      {
          Object dss = resolve( "/datasources/manager" );
          assertNotNull( dss );
          getLogger().info( "Selector established established." );
      }
  }
  
  
  
  

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


Mime
View raw message