cvs commit: xml-axis/java/test/components PackageTests.java TestUUID.java

[di...@apache.org]

dims        2002/10/30 06:32:59

  Modified:    java/src/org/apache/axis/components/uuid UUIDGenFactory.java
  Added:       java/test/components PackageTests.java TestUUID.java
  Removed:     java/src/org/apache/axis/components/uuid TestUUID.java
  Log:
  - Fix default class name in UUIDGenFactory
  - Convert TestUUID into a JUnit TestCase
  
  Revision  Changes    Path
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/components/uuid/UUIDGenFactory.java
  
  Index: UUIDGenFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/uuid/UUIDGenFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UUIDGenFactory.java	30 Oct 2002 00:07:53 -0000	1.1
  +++ UUIDGenFactory.java	30 Oct 2002 14:32:59 -0000	1.2
  @@ -76,7 +76,7 @@
    * @since   JDK1.2.2
    */
   public abstract class UUIDGenFactory {
  -    private static final String defaultUUIDGenClassName = "org.apache.axis.ime.internal.util.uuid.SimpleUUIDGen";
  +    private static final String defaultUUIDGenClassName = "org.apache.axis.components.uuid.SimpleUUIDGen";
   
       /**
        * getInstance
  
  
  
  1.1                  xml-axis/java/test/components/PackageTests.java
  
  Index: PackageTests.java
  ===================================================================
  package test.components;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  /**
   */
  public class PackageTests
  {
      public static void main (String[] args) {
              junit.textui.TestRunner.run (suite());
      }
  
      public static Test suite()
      {
          TestSuite suite = new TestSuite("All axis Components tests");
  
          suite.addTest(TestUUID.suite());
          return suite;
      }
  }
  
  
  
  1.1                  xml-axis/java/test/components/TestUUID.java
  
  Index: TestUUID.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, 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 "Axis" 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 (INCLUDING, 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/>.
   */
  
  /**
   * 
   *  UUIDGen adopted from the juddi project
   *  (http://sourceforge.net/projects/juddi/)
   * 
   */
  
  package test.components;
  
  import junit.framework.Test;
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
  import org.apache.axis.components.uuid.UUIDGen;
  import org.apache.axis.components.uuid.UUIDGenFactory;
  
  public class TestUUID extends TestCase {
  
      public TestUUID(String name) {
          super(name);
      }
  
      public static Test suite() {
          return new TestSuite(TestUUID.class);
      }
  
      public void testUUID() {
          long startTime = 0;
          long endTime = 0;
          UUIDGen uuidgen = null;
  
          uuidgen = UUIDGenFactory.getUUIDGen(null);
          startTime = System.currentTimeMillis();
          for (int i = 1; i <= 10; ++i) {
              String u = uuidgen.nextUUID();
              System.out.println(i + ":  " + u);
          }
          endTime = System.currentTimeMillis();
          System.out.println("UUIDGen took " + (endTime - startTime) + " milliseconds");
  
          UUIDGenFactory.destroyUUIDGen(uuidgen);
      }
  }