Author: rhs
Date: Mon Jun 16 14:02:45 2008
New Revision: 668309
URL: http://svn.apache.org/viewvc?rev=668309&view=rev
Log:
QPID-901: add tests for RangeSet; fixed a bug found by the new tests
Added:
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
(with props)
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Range.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java?rev=668309&r1=668308&r2=668309&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/Serial.java
Mon Jun 16 14:02:45 2008
@@ -1,5 +1,7 @@
package org.apache.qpid.util;
+import java.util.Comparator;
+
import org.apache.qpid.SerialException;
/**
@@ -10,6 +12,14 @@
public class Serial
{
+ public static final Comparator<Integer> COMPARATOR = new
Comparator<Integer>()
+ {
+ public int compare(Integer s1, Integer s2)
+ {
+ return Serial.compare(s1, s2);
+ }
+ };
+
/**
* Compares two numbers using serial arithmetic.
*
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Range.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Range.java?rev=668309&r1=668308&r2=668309&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Range.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/Range.java
Mon Jun 16 14:02:45 2008
@@ -32,7 +32,7 @@
* @author Rafael H. Schloming
*/
-public class Range
+public final class Range
{
private final int lower;
private final int upper;
@@ -71,7 +71,8 @@
public boolean touches(Range range)
{
- return (includes(range.upper + 1) || includes(range.lower - 1) ||
+ return (intersects(range) ||
+ includes(range.upper + 1) || includes(range.lower - 1) ||
range.includes(upper + 1) || range.includes(lower - 1));
}
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java?rev=668309&r1=668308&r2=668309&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/RangeSet.java
Mon Jun 16 14:02:45 2008
@@ -20,7 +20,6 @@
*/
package org.apache.qpidity.transport;
-import java.util.Collection;
import java.util.Iterator;
import java.util.ListIterator;
import java.util.LinkedList;
@@ -33,7 +32,7 @@
* @author Rafael H. Schloming
*/
-public class RangeSet implements Iterable<Range>
+public final class RangeSet implements Iterable<Range>
{
private LinkedList<Range> ranges = new LinkedList<Range>();
@@ -61,6 +60,19 @@
return false;
}
+ public boolean includes(int n)
+ {
+ for (Range r : this)
+ {
+ if (r.includes(n))
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
public void add(Range range)
{
ListIterator<Range> it = ranges.listIterator();
@@ -127,21 +139,4 @@
return str.toString();
}
- public static final void main(String[] args)
- {
- RangeSet ranges = new RangeSet();
- ranges.add(5, 10);
- System.out.println(ranges);
- ranges.add(15, 20);
- System.out.println(ranges);
- ranges.add(23, 25);
- System.out.println(ranges);
- ranges.add(12, 14);
- System.out.println(ranges);
- ranges.add(0, 1);
- System.out.println(ranges);
- ranges.add(3, 11);
- System.out.println(ranges);
- }
-
}
Added:
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java?rev=668309&view=auto
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
(added)
+++
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
Mon Jun 16 14:02:45 2008
@@ -0,0 +1,238 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpidity.transport;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import static org.apache.qpid.util.Serial.*;
+
+/**
+ * RangeSetTest
+ *
+ */
+
+public class RangeSetTest extends TestCase
+{
+
+ private void check(RangeSet ranges)
+ {
+ List<Integer> posts = new ArrayList<Integer>();
+ for (Range range : ranges)
+ {
+ posts.add(range.getLower());
+ posts.add(range.getUpper());
+ }
+
+ List<Integer> sorted = new ArrayList<Integer>(posts);
+ Collections.sort(sorted, COMPARATOR);
+
+ assertEquals(posts, sorted);
+
+ int idx = 1;
+ while (idx + 1 < posts.size())
+ {
+ assertTrue(!eq(posts.get(idx) + 1, posts.get(idx+1)));
+ idx += 2;
+ }
+ }
+
+ public void test1()
+ {
+ RangeSet ranges = new RangeSet();
+ ranges.add(5, 10);
+ check(ranges);
+ ranges.add(15, 20);
+ check(ranges);
+ ranges.add(23, 25);
+ check(ranges);
+ ranges.add(12, 14);
+ check(ranges);
+ ranges.add(0, 1);
+ check(ranges);
+ ranges.add(3, 11);
+ check(ranges);
+ }
+
+ public void test2()
+ {
+ RangeSet rs = new RangeSet();
+ check(rs);
+
+ rs.add(1);
+ assertTrue(rs.includes(1));
+ assertTrue(!rs.includes(2));
+ assertTrue(!rs.includes(0));
+ check(rs);
+
+ rs.add(2);
+ assertTrue(!rs.includes(0));
+ assertTrue(rs.includes(1));
+ assertTrue(rs.includes(2));
+ assertTrue(!rs.includes(3));
+ check(rs);
+
+ rs.add(0);
+
+ assertTrue(!rs.includes(-1));
+ assertTrue(rs.includes(0));
+ assertTrue(rs.includes(1));
+ assertTrue(rs.includes(2));
+ assertTrue(!rs.includes(3));
+ check(rs);
+
+ rs.add(37);
+
+ assertTrue(!rs.includes(-1));
+ assertTrue(rs.includes(0));
+ assertTrue(rs.includes(1));
+ assertTrue(rs.includes(2));
+ assertTrue(!rs.includes(3));
+ assertTrue(!rs.includes(36));
+ assertTrue(rs.includes(37));
+ assertTrue(!rs.includes(38));
+ check(rs);
+
+ rs.add(-1);
+ check(rs);
+
+ rs.add(-3);
+ check(rs);
+
+ rs.add(1, 20);
+ assertTrue(!rs.includes(21));
+ assertTrue(rs.includes(20));
+ check(rs);
+ }
+
+ public void testAddSelf()
+ {
+ RangeSet a = new RangeSet();
+ a.add(0, 8);
+ check(a);
+ a.add(0, 8);
+ check(a);
+ assertEquals(a.size(), 1);
+ Range range = a.iterator().next();
+ assertEquals(range.getLower(), 0);
+ assertEquals(range.getUpper(), 8);
+ }
+
+ public void testIntersect1()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(9, 20);
+ Range i1 = a.intersect(b);
+ Range i2 = b.intersect(a);
+ assertEquals(i1.getUpper(), 10);
+ assertEquals(i2.getUpper(), 10);
+ assertEquals(i1.getLower(), 9);
+ assertEquals(i2.getLower(), 9);
+ }
+
+ public void testIntersect2()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(11, 20);
+ assertNull(a.intersect(b));
+ assertNull(b.intersect(a));
+ }
+
+ public void testIntersect3()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(3, 5);
+ Range i1 = a.intersect(b);
+ Range i2 = b.intersect(a);
+ assertEquals(i1.getUpper(), 5);
+ assertEquals(i2.getUpper(), 5);
+ assertEquals(i1.getLower(), 3);
+ assertEquals(i2.getLower(), 3);
+ }
+
+ public void testSubtract1()
+ {
+ Range a = new Range(0, 10);
+ assertTrue(a.subtract(a).isEmpty());
+ }
+
+ public void testSubtract2()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(20, 30);
+ List<Range> ranges = a.subtract(b);
+ assertEquals(ranges.size(), 1);
+ Range d = ranges.get(0);
+ assertEquals(d.getLower(), a.getLower());
+ assertEquals(d.getUpper(), a.getUpper());
+ }
+
+ public void testSubtract3()
+ {
+ Range a = new Range(20, 30);
+ Range b = new Range(0, 10);
+ List<Range> ranges = a.subtract(b);
+ assertEquals(ranges.size(), 1);
+ Range d = ranges.get(0);
+ assertEquals(d.getLower(), a.getLower());
+ assertEquals(d.getUpper(), a.getUpper());
+ }
+
+ public void testSubtract4()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(3, 5);
+ List<Range> ranges = a.subtract(b);
+ assertEquals(ranges.size(), 2);
+ Range low = ranges.get(0);
+ Range high = ranges.get(1);
+ assertEquals(low.getLower(), 0);
+ assertEquals(low.getUpper(), 2);
+ assertEquals(high.getLower(), 6);
+ assertEquals(high.getUpper(), 10);
+ }
+
+ public void testSubtract5()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(3, 20);
+ List<Range> ranges = a.subtract(b);
+ assertEquals(ranges.size(), 1);
+ Range d = ranges.get(0);
+ assertEquals(d.getLower(), 0);
+ assertEquals(d.getUpper(), 2);
+ }
+
+ public void testSubtract6()
+ {
+ Range a = new Range(0, 10);
+ Range b = new Range(-10, 5);
+ List<Range> ranges = a.subtract(b);
+ assertEquals(ranges.size(), 1);
+ Range d = ranges.get(0);
+ assertEquals(d.getLower(), 6);
+ assertEquals(d.getUpper(), 10);
+ }
+
+}
Propchange:
incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/transport/RangeSetTest.java
------------------------------------------------------------------------------
svn:eol-style = native
