You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/12/09 17:51:01 UTC
svn commit: r485009 -
/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java
Author: hlship
Date: Sat Dec 9 08:51:00 2006
New Revision: 485009
URL: http://svn.apache.org/viewvc?view=rev&rev=485009
Log:
Check that remove() is not supported from the Iterator provided by IntegerRange.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java?view=diff&rev=485009&r1=485008&r2=485009
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/IntegerRangeTest.java Sat Dec 9 08:51:00 2006
@@ -12,105 +12,131 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-import java.util.Iterator;
-
-import org.apache.tapestry.internal.util.IntegerRange;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.testng.annotations.Test;
-
-public class IntegerRangeTest extends TapestryTestCase
-{
- @Test
- public void start_less_than_finish()
- {
- IntegerRange r = new IntegerRange(1, 3);
-
- assertEquals(r.toString(), "1..3");
-
- assertEquals(r.getStart(), 1);
- assertEquals(r.getFinish(), 3);
-
- Iterator<Integer> i = r.iterator();
-
- assertEquals(i.next().intValue(), 1);
- assertEquals(i.next().intValue(), 2);
-
- assertTrue(i.hasNext());
-
- assertEquals(i.next().intValue(), 3);
-
- assertFalse(i.hasNext());
-
- try
- {
- i.next();
- unreachable();
- }
- catch (IllegalStateException ex)
- {
- }
- }
-
- @Test
- public void start_same_as_finish()
- {
- IntegerRange r = new IntegerRange(3, 3);
-
- Iterator<Integer> i = r.iterator();
-
- assertTrue(i.hasNext());
-
- assertEquals(i.next().intValue(), 3);
-
- assertFalse(i.hasNext());
- }
-
- @Test
- public void finish_less_than_start()
- {
- IntegerRange r = new IntegerRange(3, 1);
-
- assertEquals(r.toString(), "3..1");
-
- Iterator<Integer> i = r.iterator();
-
- assertEquals(i.next().intValue(), 3);
- assertEquals(i.next().intValue(), 2);
-
- assertTrue(i.hasNext());
-
- assertEquals(i.next().intValue(), 1);
-
- assertFalse(i.hasNext());
-
- try
- {
- i.next();
- unreachable();
- }
- catch (IllegalStateException ex)
- {
- }
- }
-
- @Test
- public void hash_code_and_equals()
- {
- IntegerRange r1 = new IntegerRange(1, 100);
- IntegerRange r2 = new IntegerRange(1, 100);
- IntegerRange r3 = new IntegerRange(1, 10);
-
- assertEquals(r1.hashCode(), r2.hashCode());
- assertFalse(r1.hashCode() == r3.hashCode());
-
- assertTrue(r1.equals(r1));
- assertEquals(r1, r2);
-
- assertFalse(r1.equals(r3));
- assertFalse(r1.equals(this));
- assertFalse(r1.equals(null));
- assertFalse(r1.equals(new IntegerRange(3, 30)));
- }
-}
+package org.apache.tapestry.internal.util;
+
+import java.util.Iterator;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class IntegerRangeTest extends Assert
+{
+ @Test
+ public void start_less_than_finish()
+ {
+ IntegerRange r = new IntegerRange(1, 3);
+
+ assertEquals(r.toString(), "1..3");
+
+ assertEquals(r.getStart(), 1);
+ assertEquals(r.getFinish(), 3);
+
+ Iterator<Integer> i = r.iterator();
+
+ assertEquals(i.next().intValue(), 1);
+ assertEquals(i.next().intValue(), 2);
+
+ assertTrue(i.hasNext());
+
+ assertEquals(i.next().intValue(), 3);
+
+ assertFalse(i.hasNext());
+
+ try
+ {
+ i.next();
+ unreachable();
+ }
+ catch (IllegalStateException ex)
+ {
+ }
+ }
+
+ @Test
+ public void start_same_as_finish()
+ {
+ IntegerRange r = new IntegerRange(3, 3);
+
+ Iterator<Integer> i = r.iterator();
+
+ assertTrue(i.hasNext());
+
+ assertEquals(i.next().intValue(), 3);
+
+ assertFalse(i.hasNext());
+ }
+
+ @Test
+ public void finish_less_than_start()
+ {
+ IntegerRange r = new IntegerRange(3, 1);
+
+ assertEquals(r.toString(), "3..1");
+
+ Iterator<Integer> i = r.iterator();
+
+ assertEquals(i.next().intValue(), 3);
+ assertEquals(i.next().intValue(), 2);
+
+ assertTrue(i.hasNext());
+
+ assertEquals(i.next().intValue(), 1);
+
+ assertFalse(i.hasNext());
+
+ try
+ {
+ i.next();
+ unreachable();
+ }
+ catch (IllegalStateException ex)
+ {
+ }
+ }
+
+ @Test
+ public void hash_code_and_equals()
+ {
+ IntegerRange r1 = new IntegerRange(1, 100);
+ IntegerRange r2 = new IntegerRange(1, 100);
+ IntegerRange r3 = new IntegerRange(1, 10);
+
+ assertEquals(r1.hashCode(), r2.hashCode());
+ assertFalse(r1.hashCode() == r3.hashCode());
+
+ assertTrue(r1.equals(r1));
+ assertEquals(r1, r2);
+
+ assertFalse(r1.equals(r3));
+ assertFalse(r1.equals(this));
+ assertFalse(r1.equals(null));
+ assertFalse(r1.equals(new IntegerRange(3, 30)));
+ }
+
+ @Test
+ public void iterator_remove_not_supported()
+ {
+ IntegerRange r = new IntegerRange(1, 3);
+
+ Iterator<Integer> i = r.iterator();
+
+ assertEquals(i.next(), new Integer(1));
+
+ try
+ {
+ i.remove();
+ unreachable();
+ }
+ catch (UnsupportedOperationException ex)
+ {
+ // Expected, ignored.
+ }
+
+ assertEquals(i.next(), new Integer(2));
+ }
+
+ private final void unreachable()
+ {
+ throw new AssertionError("This code should be unreachable.");
+ }
+}