Repository: groovy
Updated Branches:
  refs/heads/master f646e6e12 -> 19a9bf5d0


Refactor: rename RangeTest to ObjectRangeTest, because it tests ObjectRange only


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/849af362
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/849af362
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/849af362

Branch: refs/heads/master
Commit: 849af362de116561f78d1aa6b4215960b7657eff
Parents: f646e6e
Author: Thibault Kruse <thibault.kr...@gmx.de>
Authored: Tue Sep 8 14:31:17 2015 +0200
Committer: paulk <pa...@asert.com.au>
Committed: Tue Jun 28 17:05:24 2016 +1000

----------------------------------------------------------------------
 src/test/groovy/lang/ObjectRangeTest.java | 217 +++++++++++++++++++++++++
 src/test/groovy/lang/RangeTest.java       | 217 -------------------------
 2 files changed, 217 insertions(+), 217 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/849af362/src/test/groovy/lang/ObjectRangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/lang/ObjectRangeTest.java 
b/src/test/groovy/lang/ObjectRangeTest.java
new file mode 100644
index 0000000..6fdba89
--- /dev/null
+++ b/src/test/groovy/lang/ObjectRangeTest.java
@@ -0,0 +1,217 @@
+/*
+ *  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 groovy.lang;
+
+import junit.framework.TestCase;
+
+import java.math.BigDecimal;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @author James Strachan
+ */
+public class ObjectRangeTest extends TestCase {
+
+    public void testSize() {
+        Range r = createRange(0, 10);
+        assertEquals("Size of " + r, 11, r.size());
+        r = createRange(0, 1);
+        assertEquals("Size of " + r, 2, r.size());
+        r = createRange(0, 0);
+        assertEquals("Size of " + r, 1, r.size());
+
+        r = createRange(new BigDecimal("2.1"), new BigDecimal("10.0"));
+        assertEquals("Size of " + r, 8, r.size());
+    }
+
+    public void testProperties() {
+        Range r = createRange(0, 10);
+        assertEquals("from", 0, r.getFrom());
+        assertEquals("to", 10, r.getTo());
+    }
+
+    public void testGet() {
+        Range r = createRange(10, 20);
+        for (int i = 0; i < 10; i++) {
+            Integer value = (Integer) r.get(i);
+            assertEquals("Item at index: " + i, i + 10, value.intValue());
+        }
+
+        r = createRange(new BigDecimal("3.2"), new BigDecimal("9.9"));
+        for (int i = 0; i < r.size(); i++) {
+            BigDecimal value = (BigDecimal) r.get(i);
+            assertEquals("Item at index: " + i, new BigDecimal("3.2").add(new 
BigDecimal("" + i)), value);
+        }
+    }
+
+    public void testNullForFromOrToIsIllegal() {
+        Comparable dontcare = new Integer(0);
+        try {
+            new ObjectRange((Comparable)null, dontcare);
+            fail("Should have thrown IllegalArgumentException");
+        }
+        catch (IllegalArgumentException e) {
+            // worked
+        }
+    }
+
+    public void testGetOutOfRange() {
+        Range r = createRange(10, 20);
+
+        try {
+            r.get(-1);
+            fail("Should have thrown IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) {
+            // worked
+        }
+        try {
+            r.get(11);
+            fail("Should have thrown IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) {
+            // worked
+        }
+
+        r = createRange(new BigDecimal("-4.3"), new BigDecimal("1.4"));
+
+        try {
+            r.get(-1);
+            fail("Should have thrown IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) {
+            // worked
+        }
+        try {
+            r.get(7);
+            fail("Should have thrown IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) {
+            // worked
+        }
+
+    }
+
+    public void testContains() {
+        Range r = createRange(10, 20);
+
+        assertTrue("contains 11", r.contains(new Integer(11)));
+        assertTrue("contains 10", r.contains(new Integer(10)));
+        assertTrue("contains 19", r.contains(new Integer(19)));
+        assertFalse("contains 9", r.contains(new Integer(9)));
+        assertFalse("contains 21", r.contains(new Integer(21)));
+        assertFalse("contains 100", r.contains(new Integer(100)));
+        assertFalse("contains -1", r.contains(new Integer(-1)));
+
+        r = createRange(new BigDecimal("2.1"), new BigDecimal("10.0"));
+
+        assertTrue("contains 9.1", r.contains(new BigDecimal("9.1")));
+        assertFalse("contains 10.1", r.contains(new BigDecimal("10.1")));
+        assertFalse("contains 8.0", r.contains(new BigDecimal("8.0")));
+        assertTrue("containsWithinBounds 8.0", r.containsWithinBounds(new 
BigDecimal("8.0")));
+        assertTrue("containsWithinBounds 9.9999", r.containsWithinBounds(new 
BigDecimal("9.9999")));
+        assertTrue("containsWithinBounds 10.0", r.containsWithinBounds(new 
BigDecimal("10.0")));
+        assertFalse("containsWithinBounds 10.0001", r.containsWithinBounds(new 
BigDecimal("10.0001")));
+    }
+
+    public void testContainsWithLikeNumbers() {
+        Range r = new ObjectRange(new Integer(1), new Short((short)3));
+        assertTrue("contains 2", r.contains(new Integer(2)));
+        r = new ObjectRange(new Float(1.0), new Double(3.0));
+        assertTrue("contains 2.0d", r.contains(new Double(2.0)));
+        assertTrue("contains 2.0g", r.contains(new BigDecimal(2.0)));
+        r = new ObjectRange(new BigDecimal(1.0), new BigDecimal(3.0));
+        assertTrue("contains 2.0d", r.contains(new Double(2.0)));
+        assertTrue("contains 2.0f", r.contains(new Float(2.0)));
+    }
+
+    public void testContainsWithIncompatibleType() {
+        Range r = new ObjectRange(new Integer(1), new Short((short)3));
+        assertFalse("shouldn't contain string", r.contains("String"));
+    }
+
+    public void testSubList() {
+        Range r = createRange(10, 20);
+
+        List s = r.subList(2, 4);
+
+        Range sr = (Range) s;
+
+        assertEquals("from", 12, sr.getFrom());
+        assertEquals("to", 13, sr.getTo());
+        assertEquals("size", 2, sr.size());
+
+        r = createRange(new BigDecimal("0.5"), new BigDecimal("8.5"));
+        assertEquals("size", 9, r.size());
+        s = r.subList(2, 5);
+        sr = (Range) s;
+
+        assertEquals("from", new BigDecimal("2.5"), sr.getFrom());
+        assertEquals("to", new BigDecimal("4.5"), sr.getTo());
+        assertTrue("contains 4.5", sr.contains(new BigDecimal("4.5")));
+        assertFalse("contains 5.5", sr.contains(new BigDecimal("5.5")));
+        assertEquals("size", 3, sr.size());
+
+    }
+
+    public void testHashCodeAndEquals() {
+        Range a = createRange(1, 11);
+        Range b = createRange(1, 11);
+        Range c = createRange(2, 11);
+
+        assertEquals("hashcode", a.hashCode(), b.hashCode());
+        assertTrue("hashcode", a.hashCode() != c.hashCode());
+
+        assertEquals("a and b", a, b);
+        assertFalse("a != c", a.equals(c));
+    }
+
+    public void testIterator() {
+        Range r = createRange(5, 11);
+
+        int i = 5;
+        for (Iterator it = r.iterator(); it.hasNext();) {
+            assertEquals("equals to " + i, new Integer(i), (Integer) 
(it.next()));
+            i++;
+        }
+
+        r = createRange(new BigDecimal("5.0"), new BigDecimal("11.0"));
+        BigDecimal one = new BigDecimal("1.0");
+
+        BigDecimal val = new BigDecimal("5.0");
+        for (Iterator it = r.iterator(); it.hasNext();) {
+            assertEquals("equals to " + val, val, (BigDecimal) (it.next()));
+            val = val.add(one);
+        }
+    }
+
+    protected Range createRange(int from, int to) {
+        return new ObjectRange(new Integer(from), new Integer(to));
+    }
+
+    protected Range createRange(BigDecimal from, BigDecimal to) {
+        return new ObjectRange(from, to);
+    }
+
+    protected void assertEquals(String msg, int expected, Object value) {
+        assertEquals(msg, new Integer(expected), value);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/groovy/blob/849af362/src/test/groovy/lang/RangeTest.java
----------------------------------------------------------------------
diff --git a/src/test/groovy/lang/RangeTest.java 
b/src/test/groovy/lang/RangeTest.java
deleted file mode 100644
index 4d63a81..0000000
--- a/src/test/groovy/lang/RangeTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- *  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 groovy.lang;
-
-import junit.framework.TestCase;
-
-import java.math.BigDecimal;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * @author James Strachan
- */
-public class RangeTest extends TestCase {
-
-    public void testSize() {
-        Range r = createRange(0, 10);
-        assertEquals("Size of " + r, 11, r.size());
-        r = createRange(0, 1);
-        assertEquals("Size of " + r, 2, r.size());
-        r = createRange(0, 0);
-        assertEquals("Size of " + r, 1, r.size());
-
-        r = createRange(new BigDecimal("2.1"), new BigDecimal("10.0"));
-        assertEquals("Size of " + r, 8, r.size());
-    }
-
-    public void testProperties() {
-        Range r = createRange(0, 10);
-        assertEquals("from", 0, r.getFrom());
-        assertEquals("to", 10, r.getTo());
-    }
-
-    public void testGet() {
-        Range r = createRange(10, 20);
-        for (int i = 0; i < 10; i++) {
-            Integer value = (Integer) r.get(i);
-            assertEquals("Item at index: " + i, i + 10, value.intValue());
-        }
-
-        r = createRange(new BigDecimal("3.2"), new BigDecimal("9.9"));
-        for (int i = 0; i < r.size(); i++) {
-            BigDecimal value = (BigDecimal) r.get(i);
-            assertEquals("Item at index: " + i, new BigDecimal("3.2").add(new 
BigDecimal("" + i)), value);
-        }
-    }
-
-    public void testNullForFromOrToIsIllegal() {
-        Comparable dontcare = new Integer(0);
-        try {
-            new ObjectRange((Comparable)null, dontcare);
-            fail("Should have thrown IllegalArgumentException");
-        }
-        catch (IllegalArgumentException e) {
-            // worked
-        }
-    }
-
-    public void testGetOutOfRange() {
-        Range r = createRange(10, 20);
-
-        try {
-            r.get(-1);
-            fail("Should have thrown IndexOutOfBoundsException");
-        }
-        catch (IndexOutOfBoundsException e) {
-            // worked
-        }
-        try {
-            r.get(11);
-            fail("Should have thrown IndexOutOfBoundsException");
-        }
-        catch (IndexOutOfBoundsException e) {
-            // worked
-        }
-
-        r = createRange(new BigDecimal("-4.3"), new BigDecimal("1.4"));
-
-        try {
-            r.get(-1);
-            fail("Should have thrown IndexOutOfBoundsException");
-        }
-        catch (IndexOutOfBoundsException e) {
-            // worked
-        }
-        try {
-            r.get(7);
-            fail("Should have thrown IndexOutOfBoundsException");
-        }
-        catch (IndexOutOfBoundsException e) {
-            // worked
-        }
-
-    }
-
-    public void testContains() {
-        Range r = createRange(10, 20);
-
-        assertTrue("contains 11", r.contains(new Integer(11)));
-        assertTrue("contains 10", r.contains(new Integer(10)));
-        assertTrue("contains 19", r.contains(new Integer(19)));
-        assertFalse("contains 9", r.contains(new Integer(9)));
-        assertFalse("contains 21", r.contains(new Integer(21)));
-        assertFalse("contains 100", r.contains(new Integer(100)));
-        assertFalse("contains -1", r.contains(new Integer(-1)));
-
-        r = createRange(new BigDecimal("2.1"), new BigDecimal("10.0"));
-
-        assertTrue("contains 9.1", r.contains(new BigDecimal("9.1")));
-        assertFalse("contains 10.1", r.contains(new BigDecimal("10.1")));
-        assertFalse("contains 8.0", r.contains(new BigDecimal("8.0")));
-        assertTrue("containsWithinBounds 8.0", r.containsWithinBounds(new 
BigDecimal("8.0")));
-        assertTrue("containsWithinBounds 9.9999", r.containsWithinBounds(new 
BigDecimal("9.9999")));
-        assertTrue("containsWithinBounds 10.0", r.containsWithinBounds(new 
BigDecimal("10.0")));
-        assertFalse("containsWithinBounds 10.0001", r.containsWithinBounds(new 
BigDecimal("10.0001")));
-    }
-
-    public void testContainsWithLikeNumbers() {
-        Range r = new ObjectRange(new Integer(1), new Short((short)3));
-        assertTrue("contains 2", r.contains(new Integer(2)));
-        r = new ObjectRange(new Float(1.0), new Double(3.0));
-        assertTrue("contains 2.0d", r.contains(new Double(2.0)));
-        assertTrue("contains 2.0g", r.contains(new BigDecimal(2.0)));
-        r = new ObjectRange(new BigDecimal(1.0), new BigDecimal(3.0));
-        assertTrue("contains 2.0d", r.contains(new Double(2.0)));
-        assertTrue("contains 2.0f", r.contains(new Float(2.0)));
-    }
-
-    public void testContainsWithIncompatibleType() {
-        Range r = new ObjectRange(new Integer(1), new Short((short)3));
-        assertFalse("shouldn't contain string", r.contains("String"));
-    }
-
-    public void testSubList() {
-        Range r = createRange(10, 20);
-
-        List s = r.subList(2, 4);
-
-        Range sr = (Range) s;
-
-        assertEquals("from", 12, sr.getFrom());
-        assertEquals("to", 13, sr.getTo());
-        assertEquals("size", 2, sr.size());
-
-        r = createRange(new BigDecimal("0.5"), new BigDecimal("8.5"));
-        assertEquals("size", 9, r.size());
-        s = r.subList(2, 5);
-        sr = (Range) s;
-
-        assertEquals("from", new BigDecimal("2.5"), sr.getFrom());
-        assertEquals("to", new BigDecimal("4.5"), sr.getTo());
-        assertTrue("contains 4.5", sr.contains(new BigDecimal("4.5")));
-        assertFalse("contains 5.5", sr.contains(new BigDecimal("5.5")));
-        assertEquals("size", 3, sr.size());
-
-    }
-
-    public void testHashCodeAndEquals() {
-        Range a = createRange(1, 11);
-        Range b = createRange(1, 11);
-        Range c = createRange(2, 11);
-
-        assertEquals("hashcode", a.hashCode(), b.hashCode());
-        assertTrue("hashcode", a.hashCode() != c.hashCode());
-
-        assertEquals("a and b", a, b);
-        assertFalse("a != c", a.equals(c));
-    }
-
-    public void testIterator() {
-        Range r = createRange(5, 11);
-
-        int i = 5;
-        for (Iterator it = r.iterator(); it.hasNext();) {
-            assertEquals("equals to " + i, new Integer(i), (Integer) 
(it.next()));
-            i++;
-        }
-
-        r = createRange(new BigDecimal("5.0"), new BigDecimal("11.0"));
-        BigDecimal one = new BigDecimal("1.0");
-
-        BigDecimal val = new BigDecimal("5.0");
-        for (Iterator it = r.iterator(); it.hasNext();) {
-            assertEquals("equals to " + val, val, (BigDecimal) (it.next()));
-            val = val.add(one);
-        }
-    }
-
-    protected Range createRange(int from, int to) {
-        return new ObjectRange(new Integer(from), new Integer(to));
-    }
-
-    protected Range createRange(BigDecimal from, BigDecimal to) {
-        return new ObjectRange(from, to);
-    }
-
-    protected void assertEquals(String msg, int expected, Object value) {
-        assertEquals(msg, new Integer(expected), value);
-    }
-
-}

Reply via email to