You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sc...@apache.org on 2003/10/05 23:23:21 UTC

cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestPredicateUtils.java TestSequencedHashMap.java TestSetUtils.java TestNodeCachingLinkedList.java TestStaticBucketMap.java TestReferenceMap.java TestUnboundedFifoBuffer.java TestTreeBag.java TestTransformerUtils.java TestTypedCollection.java TestTreeMap.java

scolebourne    2003/10/05 14:23:21

  Modified:    collections/src/test/org/apache/commons/collections
                        TestPredicateUtils.java TestSequencedHashMap.java
                        TestSetUtils.java TestNodeCachingLinkedList.java
                        TestStaticBucketMap.java TestReferenceMap.java
                        TestUnboundedFifoBuffer.java TestTreeBag.java
                        TestTransformerUtils.java TestTypedCollection.java
                        TestTreeMap.java
  Log:
  Update licence and version
  
  Revision  Changes    Path
  1.3       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/TestPredicateUtils.java
  
  Index: TestPredicateUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestPredicateUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestPredicateUtils.java	31 Aug 2003 17:28:43 -0000	1.2
  +++ TestPredicateUtils.java	5 Oct 2003 21:23:21 -0000	1.3
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.22      +23 -18    jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java
  
  Index: TestSequencedHashMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSequencedHashMap.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- TestSequencedHashMap.java	2 Oct 2003 23:01:09 -0000	1.21
  +++ TestSequencedHashMap.java	5 Oct 2003 21:23:21 -0000	1.22
  @@ -1,9 +1,10 @@
  -package org.apache.commons.collections;
  -
  -/* ====================================================================
  +/*
  + * $Header$
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -18,21 +19,21 @@
    *    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 acknowledgement:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowledgement:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgement may appear in the software itself,
    *    if and wherever such third-party acknowledgements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names 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
  @@ -52,7 +53,9 @@
    * 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.commons.collections;
   
   import java.io.IOException;
   import java.io.Serializable;
  @@ -68,10 +71,12 @@
    * Be sure to use the "labRat" instance whenever possible,
    * so that subclasses will be tested correctly.
    * 
  - * @author <a href="mailto:morgand@apache.org">Morgan Delagrange</a>
  - * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
  - * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
  - * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  + * @version $Revision$ $Date$
  + * 
  + * @author Morgan Delagrange
  + * @author Daniel Rall
  + * @author Henning P. Schmiedehausen
  + * @author James Strachan
    */
   public class TestSequencedHashMap extends AbstractTestMap {
       /**
  
  
  
  1.11      +5 -6      jakarta-commons/collections/src/test/org/apache/commons/collections/TestSetUtils.java
  
  Index: TestSetUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestSetUtils.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestSetUtils.java	2 Oct 2003 22:48:41 -0000	1.10
  +++ TestSetUtils.java	5 Oct 2003 21:23:21 -0000	1.11
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -71,6 +68,8 @@
   
   /**
    * Tests for SetUtils.
  + * 
  + * @version $Revision$ $Date$
    * 
    * @author Stephen Colebourne
    * @author Neil O'Toole
  
  
  
  1.6       +6 -6      jakarta-commons/collections/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java
  
  Index: TestNodeCachingLinkedList.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestNodeCachingLinkedList.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestNodeCachingLinkedList.java	5 Oct 2003 06:41:08 -0000	1.5
  +++ TestNodeCachingLinkedList.java	5 Oct 2003 21:23:21 -0000	1.6
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -64,8 +61,11 @@
   import java.util.LinkedList;
   
   import junit.framework.Test;
  +
   /**
    * Test class for NodeCachingLinkedList, a performance optimised LinkedList.
  + * 
  + * @version $Revision$ $Date$
    * 
    * @author Jeff Varszegi
    * @author Phil Steitz
  
  
  
  1.7       +2 -2      jakarta-commons/collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java
  
  Index: TestStaticBucketMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestStaticBucketMap.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  
  
  
  1.12      +5 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/TestReferenceMap.java
  
  Index: TestReferenceMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestReferenceMap.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TestReferenceMap.java	2 Oct 2003 23:01:10 -0000	1.11
  +++ TestReferenceMap.java	5 Oct 2003 21:23:21 -0000	1.12
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -67,9 +64,10 @@
   
   /**
    * Tests for ReferenceMap. 
  + * 
  + * @version $Revision$ $Date$
    *
    * @author Paul Jack
  - * @version $Id$
    */
   public class TestReferenceMap extends AbstractTestMap {
   
  
  
  
  1.8       +8 -6      jakarta-commons/collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java
  
  Index: TestUnboundedFifoBuffer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestUnboundedFifoBuffer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestUnboundedFifoBuffer.java	2 Oct 2003 22:14:29 -0000	1.7
  +++ TestUnboundedFifoBuffer.java	5 Oct 2003 21:23:21 -0000	1.8
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -65,8 +62,13 @@
   import java.util.Iterator;
   
   import junit.framework.Test;
  +
   /**
    * Test cases for UnboundedFifoBuffer.
  + * 
  + * @version $Revision$ $Date$
  + * 
  + * @author Unknown
    */
   public class TestUnboundedFifoBuffer extends AbstractTestCollection {
   
  
  
  
  1.6       +5 -7      jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeBag.java
  
  Index: TestTreeBag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeBag.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestTreeBag.java	2 Oct 2003 22:35:31 -0000	1.5
  +++ TestTreeBag.java	5 Oct 2003 21:23:21 -0000	1.6
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -66,9 +63,10 @@
   /**
    * Extension of {@link TestBag} for exercising the {@link TreeBag}
    * implementation.
  + * 
  + * @version $Revision$ $Date$
    *
    * @author Chuck Burdick
  - * @version $Id$
    */
   public class TestTreeBag extends AbstractTestBag {
       
  
  
  
  1.4       +3 -3      jakarta-commons/collections/src/test/org/apache/commons/collections/TestTransformerUtils.java
  
  Index: TestTransformerUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTransformerUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestTransformerUtils.java	17 Sep 2003 20:28:30 -0000	1.3
  +++ TestTransformerUtils.java	5 Oct 2003 21:23:21 -0000	1.4
  @@ -4,7 +4,7 @@
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +19 -12    jakarta-commons/collections/src/test/org/apache/commons/collections/TestTypedCollection.java
  
  Index: TestTypedCollection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTypedCollection.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestTypedCollection.java	31 Aug 2003 17:28:43 -0000	1.2
  +++ TestTypedCollection.java	5 Oct 2003 21:23:21 -0000	1.3
  @@ -1,7 +1,10 @@
  -/* ====================================================================
  +/*
  + * $Header$
  + * ====================================================================
  + *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -16,21 +19,21 @@
    *    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 acknowledgement:
  + * 3. The end-user documentation included with the redistribution, if
  + *    any, must include the following acknowledgement:
    *       "This product includes software developed by the
    *        Apache Software Foundation (http://www.apache.org/)."
    *    Alternately, this acknowledgement may appear in the software itself,
    *    if and wherever such third-party acknowledgements normally appear.
    *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - *    "Apache Turbine" 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",
  - *    "Apache Turbine", nor may "Apache" appear in their name, without
  - *    prior written permission of the Apache Software Foundation.
  + * 4. The names "The Jakarta Project", "Commons", 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 names 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
  @@ -50,6 +53,7 @@
    * 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.commons.collections;
   
  @@ -58,6 +62,9 @@
   import java.util.List;
   
   /**
  + * Tests TypedCollection.
  + * 
  + * @version $Revision$ $Date$
    * 
    * @author Stephen Colebourne
    */
  
  
  
  1.9       +17 -23    jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeMap.java
  
  Index: TestTreeMap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestTreeMap.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestTreeMap.java	2 Oct 2003 23:01:10 -0000	1.8
  +++ TestTreeMap.java	5 Oct 2003 21:23:21 -0000	1.9
  @@ -1,13 +1,10 @@
   /*
    * $Header$
  - * $Revision$
  - * $Date$
  - *
    * ====================================================================
    *
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -36,7 +33,7 @@
    *
    * 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.
  + *    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
  @@ -58,47 +55,44 @@
    * <http://www.apache.org/>.
    *
    */
  -
   package org.apache.commons.collections;
   
   import java.util.TreeMap;
   
   /**
  - * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id$
  + * Tests TreeMap.
  + * 
  + * @version $Revision$ $Date$
  + * 
  + * @author Jason van Zyl
    */
  -public abstract class TestTreeMap extends AbstractTestMap
  -{
  -    public TestTreeMap(String testName)
  -    {
  +public abstract class TestTreeMap extends AbstractTestMap {
  +    
  +    public TestTreeMap(String testName) {
           super(testName);
       }
   
  -    public static void main(String args[])
  -    {
  -        String[] testCaseName = { TestTreeMap.class.getName() };
  +    public static void main(String args[]) {
  +        String[] testCaseName = { TestTreeMap.class.getName()};
           junit.textui.TestRunner.main(testCaseName);
       }
   
       public boolean useNullKey() {
  -      return false;
  +        return false;
       }
   
       protected TreeMap map = null;
   
  -    public void setUp()
  -    {
  +    public void setUp() {
           map = (TreeMap) makeEmptyMap();
       }
   
  -    public void testNewMap()
  -    {
  +    public void testNewMap() {
           assertTrue("New map is empty", map.isEmpty());
           assertEquals("New map has size zero", map.size(), 0);
       }
   
  -    public void testSearch()
  -    {
  +    public void testSearch() {
           map.put("first", "First Item");
           map.put("second", "Second Item");
           assertEquals("Top item is 'Second Item'", map.get("first"), "First Item");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org