cmlenz      2003/06/29 06:53:23

  Modified:    framework/src/test/share/org/apache/cactus TestAll.java
  Added:       framework/src/test/share/org/apache/cactus/util
                        TestUniqueGenerator.java
  Removed:     framework/src/test/share/org/apache/cactus/util
                        UniqueGeneratorTest.java
  Log:
  - the Cactus convention for test classes is TestXXX, not XXXTest
  - add tests to ensure that different test case instances and different test methods 
result in unique IDs
  - add the UniqueGenerator test to the test suite
  
  Revision  Changes    Path
  1.1                  
jakarta-cactus/framework/src/test/share/org/apache/cactus/util/TestUniqueGenerator.java
  
  Index: TestUniqueGenerator.java
  ===================================================================
  /*
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001-2003 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 acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Cactus" 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 [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 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/>.
   *
   */
  package org.apache.cactus.util;
  
  import java.util.ArrayList;
  import java.util.Collections;
  import java.util.HashSet;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Set;
  
  import org.apache.cactus.ServletTestCase;
  
  import junit.framework.TestCase;
  
  /**
   * Smoke test for the unique id generator.
   * 
   * @author <a href="mailto:[EMAIL PROTECTED]>Nicholas Lesiecki</a>
   * @author <a href="mailto:[EMAIL PROTECTED]>Christopher Lenz</a>
   *
   * @version $Id: TestUniqueGenerator.java,v 1.1 2003/06/29 13:53:23 cmlenz Exp $
   */
  public class TestUniqueGenerator extends TestCase
  {
  
      /**
       * @see TestCase#setUp
       */
      protected void setUp()
      {
          // let the generator initialize
          UniqueGenerator.generate(new ServletTestCase("foo"));
      }
  
      /**
       * Simulates several simultaneous id generations using threads.
       * Verifies that there are no duplicates among the generated ids.
       */
      public void testThatSimultaneouslyGeneratedIdsAreUnique()
      {
          final ServletTestCase aTestCase = new ServletTestCase("foo");
  
          Thread[] threads = new Thread[10];
          final List results = Collections.synchronizedList(new ArrayList());
          for (int i = 0; i < threads.length; i++)
          {
              threads[i] = new Thread()
              {
                  public void run()
                  {
                      results.add(UniqueGenerator.generate(aTestCase));
                  }
              };
          }
  
          // loops separate to make their beginning as simultaneous
          // as possible
          for (int i = 0; i < threads.length; i++)
          {
              threads[i].run();
          }
  
          try
          {
              // in case the threads need time to finish
              Thread.sleep(200);
          }
          catch (InterruptedException e)
          {
              throw new ChainedRuntimeException(e);
          }
  
          for (Iterator i = results.iterator(); i.hasNext();)
          {
              String id = (String) i.next();
              System.out.println(id + " (" + id.length() + ")");
          }
  
          Set resultSet = new HashSet(results);
          assertEquals(
              "Results contained duplicate ids.",
              results.size(),
              resultSet.size());
      }
  
      /**
       * Sanity check to verify that different IDs are generated for different
       * instances of the test class.
       */
      public void testThatGeneratedIdsForDifferentTestCasesAreUnique()
      {
          final ServletTestCase firstTestCase = new ServletTestCase("foo");
          final ServletTestCase secondTestCase = new ServletTestCase("foo");
          
          String firstId = UniqueGenerator.generate(firstTestCase, 0);
          System.out.println(firstId);
          String secondId = UniqueGenerator.generate(secondTestCase, 0);
          System.out.println(secondId);
  
          assertFalse("IDs not unique", firstId.equals(secondId));
      }
  
      /**
       * Sanity check to verify that different IDs are generated for different
       * test methods/names.
       */
      public void testThatGeneratedIdsForDifferentTestMethodsAreUnique()
      {
          final ServletTestCase aTestCase = new ServletTestCase("foo");
          
          String firstId = UniqueGenerator.generate(aTestCase, 0);
          System.out.println(firstId);
          aTestCase.setName("bar");
          String secondId = UniqueGenerator.generate(aTestCase, 0);
          System.out.println(secondId);
  
          assertFalse("IDs not unique", firstId.equals(secondId));
      }
  
  }
  
  
  
  1.11      +4 -5      
jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAll.java
  
  Index: TestAll.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/framework/src/test/share/org/apache/cactus/TestAll.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestAll.java      22 Jun 2003 17:57:52 -0000      1.10
  +++ TestAll.java      29 Jun 2003 13:53:23 -0000      1.11
  @@ -107,10 +107,9 @@
           suite.addTestSuite(org.apache.cactus.TestWebRequest.class);
           suite.addTestSuite(
               org.apache.cactus.client.TestWebTestResultParser.class);
  -        suite.addTestSuite(
  -            org.apache.cactus.util.TestStringUtil.class);
  -        suite.addTestSuite(
  -            org.apache.cactus.util.TestCookieUtil.class);
  +        suite.addTestSuite(org.apache.cactus.util.TestStringUtil.class);
  +        suite.addTestSuite(org.apache.cactus.util.TestCookieUtil.class);
  +        suite.addTestSuite(org.apache.cactus.util.TestUniqueGenerator.class);
   
           return suite;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to