QPID-3858: Updated branch - merged from trunk r.1333987

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1334037 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 124 insertions, 8 deletions

diff --git a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
index 94db7d8dde..cbf6caf141 100644
--- a/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/common/src/test/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -42,6 +42,7 @@ public class QpidTestCase extends TestCase
 {
     public static final String QPID_HOME = System.getProperty("QPID_HOME");
     public static final String TEST_RESOURCES_DIR = QPID_HOME + "/../test-profiles/test_resources/";
+    public static final String TMP_FOLDER = System.getProperty("java.io.tmpdir");
 
     private static final Logger _logger = Logger.getLogger(QpidTestCase.class);
 
@@ -108,10 +109,10 @@ public class QpidTestCase extends TestCase
             _exclusionList = exclusionList;
         }
     }
-    
-    protected static final String MS_CLASS_NAME_KEY = "messagestore.class.name";
-    protected static final String MEMORY_STORE_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStore";
-    
+
+    protected static final String MS_FACTORY_CLASS_NAME_KEY = "messagestorefactory.class.name";
+    protected static final String MEMORY_STORE_FACTORY_CLASS_NAME = "org.apache.qpid.server.store.MemoryMessageStoreFactory";
+
     private static List<String> _exclusionList;
     
     public QpidTestCase()
@@ -139,11 +140,12 @@ public class QpidTestCase extends TestCase
         }
     }
 
-    public String getTestProfileMessageStoreClassName()
+    public String getTestProfileMessageStoreFactoryClassName()
     {
-        String storeClass = System.getProperty(MS_CLASS_NAME_KEY);
+        final String storeFactoryClass = System.getProperty(MS_FACTORY_CLASS_NAME_KEY);
+        _logger.debug("MS_FACTORY_CLASS_NAME_KEY " + storeFactoryClass);
         
-        return storeClass != null ? storeClass : MEMORY_STORE_CLASS_NAME ;
+        return storeFactoryClass != null ? storeFactoryClass : MEMORY_STORE_FACTORY_CLASS_NAME ;
     }
 
 
@@ -157,7 +159,7 @@ public class QpidTestCase extends TestCase
      * @param fromPort the port to scan for availability
      * @throws NoSuchElementException if there are no ports available
      */
-    protected int getNextAvailable(int fromPort)
+    public int getNextAvailable(int fromPort)
     {
         if ((fromPort < MIN_PORT_NUMBER) || (fromPort > MAX_PORT_NUMBER))
         {
diff --git a/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java b/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
index 56dbaf5535..14589eb541 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/RangeSetTest.java
@@ -27,6 +27,7 @@ import static org.apache.qpid.util.Serial.eq;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -236,4 +237,117 @@ public class RangeSetTest extends TestCase
         assertEquals(d.getUpper(), 10);
     }
 
+    public void testSetSubtract1()
+    {
+        final RangeSet orig = createRangeSet(0, 10) ;
+        final RangeSet update = createRangeSet(3, 15) ;
+        orig.subtract(update) ;
+        checkRange(orig, 0, 2) ;
+    }
+
+    public void testSetSubtract2()
+    {
+        final RangeSet orig = createRangeSet(0, 10) ;
+        final RangeSet update = createRangeSet(3, 10) ;
+        orig.subtract(update) ;
+        checkRange(orig, 0, 2) ;
+    }
+
+    public void testSetSubtract3()
+    {
+        final RangeSet orig = createRangeSet(0, 10) ;
+        final RangeSet update = createRangeSet(3, 4) ;
+        orig.subtract(update) ;
+        checkRange(orig, 0, 2, 5, 10) ;
+    }
+
+    public void testSetSubtract4()
+    {
+        final RangeSet orig = createRangeSet(3, 15) ;
+        final RangeSet update = createRangeSet(0, 10) ;
+        orig.subtract(update) ;
+        checkRange(orig, 11, 15) ;
+    }
+
+    public void testSetSubtract5()
+    {
+        final RangeSet orig = createRangeSet(3, 10) ;
+        final RangeSet update = createRangeSet(0, 10) ;
+        orig.subtract(update) ;
+        checkRange(orig) ;
+    }
+
+    public void testSetSubtract6()
+    {
+        final RangeSet orig = createRangeSet(3, 10) ;
+        final RangeSet update = createRangeSet(0, 15) ;
+        orig.subtract(update) ;
+        checkRange(orig) ;
+    }
+
+    public void testSetSubtract7()
+    {
+        final RangeSet orig = createRangeSet(0, 10) ;
+        final RangeSet update = createRangeSet(0, 15) ;
+        orig.subtract(update) ;
+        checkRange(orig) ;
+    }
+
+    public void testSetSubtract8()
+    {
+        final RangeSet orig = createRangeSet(0, 15) ;
+        final RangeSet update = createRangeSet(0, 10) ;
+        orig.subtract(update) ;
+        checkRange(orig, 11, 15) ;
+    }
+
+    public void testSetSubtract9()
+    {
+        final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
+        final RangeSet update = createRangeSet(2, 3, 5, 6, 8, 9, 22, 23, 27, 28) ;
+        orig.subtract(update) ;
+        checkRange(orig, 0, 1, 4, 4, 7, 7, 10, 15, 20, 21, 24, 26, 29, 30) ;
+    }
+
+    public void testSetSubtract10()
+    {
+        final RangeSet orig = createRangeSet(0, 15, 20, 30) ;
+        final RangeSet update = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27, 30) ;
+        orig.subtract(update) ;
+        checkRange(orig, 3, 3, 7, 9, 23, 23, 25, 26) ;
+    }
+
+    public void testSetSubtract11()
+    {
+        final RangeSet orig = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27, 30) ;
+        final RangeSet update = createRangeSet(0, 2, 4, 6, 10, 22, 24, 24, 27, 30) ;
+        orig.subtract(update) ;
+        checkRange(orig) ;
+    }
+    
+    private RangeSet createRangeSet(int ... bounds)
+    {
+        RangeSet set = RangeSetFactory.createRangeSet();
+        final int length = (bounds == null ? 0 : bounds.length) ;
+        int count = 0 ;
+        while(count < length)
+        {
+            set.add(bounds[count++], bounds[count++]) ;
+        }
+        return set ;
+    }
+    
+    private void checkRange(final RangeSet rangeSet, int ... bounds)
+    {
+        final int length = (bounds == null ? 0 : bounds.length) ;
+        assertEquals("Range count", length/2, rangeSet.size()) ;
+        final Iterator<Range> iter = rangeSet.iterator() ;
+        int count = 0 ;
+        while(count < length)
+        {
+            final Range range = iter.next() ;
+            assertEquals("Range lower", bounds[count++], range.getLower()) ;
+            assertEquals("Range upper", bounds[count++], range.getUpper()) ;
+        }
+    }
 }