[jboss-cvs] JBoss Messaging SVN: r4407 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/util and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-06-06 10:30:15 -0400 (Fri, 06 Jun 2008)
New Revision: 4407

Modified:
   trunk/src/main/org/jboss/messaging/util/ConcurrentHashSet.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/util/ConcurrentHashSetTest.java
Log:
added unit tests for ConcurrentHashSet
removed unused public constructors

Modified: trunk/src/main/org/jboss/messaging/util/ConcurrentHashSet.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/ConcurrentHashSet.java	2008-06-06 14:18:57 UTC (rev 4406)
+++ trunk/src/main/org/jboss/messaging/util/ConcurrentHashSet.java	2008-06-06 14:30:15 UTC (rev 4407)
@@ -23,7 +23,6 @@
 
 import java.util.AbstractSet;
 import java.util.Iterator;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -42,25 +41,13 @@
 {
    private ConcurrentMap<E, Object> theMap;
    
-   private static Object dummy = new Object();
+   private static final Object dummy = new Object();
    
    public ConcurrentHashSet()
    {
       theMap = new ConcurrentHashMap<E, Object>();
    }
    
-   public ConcurrentHashSet(Set<E> other)
-   {
-   	this();
-   	
-   	addAll(other);
-   }
-   
-   public ConcurrentHashSet(int size)
-   {
-   	theMap = new ConcurrentHashMap<E, Object>(size);
-   }
-   
    public int size()
    {
       return theMap.size();

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/util/ConcurrentHashSetTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/util/ConcurrentHashSetTest.java	2008-06-06 14:18:57 UTC (rev 4406)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/util/ConcurrentHashSetTest.java	2008-06-06 14:30:15 UTC (rev 4407)
@@ -7,6 +7,9 @@
 package org.jboss.messaging.tests.unit.core.util;
 
 import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
+import java.util.Iterator;
+
 import junit.framework.TestCase;
 
 import org.jboss.messaging.util.ConcurrentHashSet;
@@ -95,6 +98,18 @@
       assertTrue(set.isEmpty());
    }
 
+   public void testIterator() throws Exception
+   {
+      set.add(element);
+      
+      Iterator<String> iterator = set.iterator();
+      while (iterator.hasNext())
+      {
+         String e = (String) iterator.next();
+         assertEquals(element, e);
+      }
+   }
+   
    // TestCase overrides --------------------------------------------
 
    @Override