diff options
| author | Artur Signell <artur@vaadin.com> | 2011-12-15 12:31:56 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2011-12-15 12:32:59 +0200 |
| commit | 26bde071ff4db3baafad864633d94382a9b77865 (patch) | |
| tree | 8ebf5953b849f7e2a5e5acb4f997d4beedf3b571 /tests | |
| parent | a1f4db52ebeac5e7440e812fb29a63588ab2a0df (diff) | |
| download | vaadin-framework-26bde071ff4db3baafad864633d94382a9b77865.tar.gz vaadin-framework-26bde071ff4db3baafad864633d94382a9b77865.zip | |
#8019/#8117/#6081 Cleaned up code and fixed issue where an invalid
string was interpreted as a valid date
Also added test for the Resolution enum static methods
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/server-side/com/vaadin/tests/util/TestUtil.java | 21 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java | 61 |
2 files changed, 82 insertions, 0 deletions
diff --git a/tests/server-side/com/vaadin/tests/util/TestUtil.java b/tests/server-side/com/vaadin/tests/util/TestUtil.java index 0249b3323b..864d0e0822 100644 --- a/tests/server-side/com/vaadin/tests/util/TestUtil.java +++ b/tests/server-side/com/vaadin/tests/util/TestUtil.java @@ -1,5 +1,7 @@ package com.vaadin.tests.util;
+import java.util.Iterator;
+
import junit.framework.Assert;
public class TestUtil {
@@ -19,4 +21,23 @@ public class TestUtil { }
+ public static void assertIterableEquals(Iterable<?> iterable1,
+ Iterable<?> iterable2) {
+ Iterator<?> i1 = iterable1.iterator();
+ Iterator<?> i2 = iterable2.iterator();
+
+ while (i1.hasNext()) {
+ Object o1 = i1.next();
+ if (!i2.hasNext()) {
+ Assert.fail("The second iterable contains fewer items than the first. The object "
+ + o1 + " has no match in the second iterable.");
+ }
+ Object o2 = i2.next();
+ Assert.assertEquals(o1, o2);
+ }
+ if (i2.hasNext()) {
+ Assert.fail("The second iterable contains more items than the first. The object "
+ + i2.next() + " has no match in the first iterable.");
+ }
+ }
}
diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java b/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java new file mode 100644 index 0000000000..e54e1cd418 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java @@ -0,0 +1,61 @@ +package com.vaadin.tests.components.datefield;
+
+import java.util.ArrayList;
+
+import junit.framework.TestCase;
+
+import com.vaadin.tests.util.TestUtil;
+import com.vaadin.ui.DateField.Resolution;
+
+public class ResolutionTest extends TestCase {
+
+ public void testResolutionHigherOrEqualToYear() {
+ Iterable<Resolution> higherOrEqual = Resolution
+ .getResolutionsHigherOrEqualTo(Resolution.YEAR);
+ ArrayList<Resolution> expected = new ArrayList<Resolution>();
+ expected.add(Resolution.YEAR);
+ TestUtil.assertIterableEquals(expected, higherOrEqual);
+ }
+
+ public void testResolutionHigherOrEqualToDay() {
+ Iterable<Resolution> higherOrEqual = Resolution
+ .getResolutionsHigherOrEqualTo(Resolution.DAY);
+ ArrayList<Resolution> expected = new ArrayList<Resolution>();
+ expected.add(Resolution.DAY);
+ expected.add(Resolution.MONTH);
+ expected.add(Resolution.YEAR);
+ TestUtil.assertIterableEquals(expected, higherOrEqual);
+
+ }
+
+ public void testResolutionLowerThanDay() {
+ Iterable<Resolution> higherOrEqual = Resolution
+ .getResolutionsLowerThan(Resolution.DAY);
+ ArrayList<Resolution> expected = new ArrayList<Resolution>();
+ expected.add(Resolution.HOUR);
+ expected.add(Resolution.MINUTE);
+ expected.add(Resolution.SECOND);
+ TestUtil.assertIterableEquals(expected, higherOrEqual);
+
+ }
+
+ public void testResolutionLowerThanSecond() {
+ Iterable<Resolution> higherOrEqual = Resolution
+ .getResolutionsLowerThan(Resolution.SECOND);
+ ArrayList<Resolution> expected = new ArrayList<Resolution>();
+ TestUtil.assertIterableEquals(expected, higherOrEqual);
+ }
+
+ public void testResolutionLowerThanYear() {
+ Iterable<Resolution> higherOrEqual = Resolution
+ .getResolutionsLowerThan(Resolution.YEAR);
+ ArrayList<Resolution> expected = new ArrayList<Resolution>();
+ expected.add(Resolution.MONTH);
+ expected.add(Resolution.DAY);
+ expected.add(Resolution.HOUR);
+ expected.add(Resolution.MINUTE);
+ expected.add(Resolution.SECOND);
+ TestUtil.assertIterableEquals(expected, higherOrEqual);
+
+ }
+}
|