From: Artur Signell Date: Fri, 27 Jan 2012 15:55:09 +0000 (+0200) Subject: Moved JUnit test to server-side source folder where it belongs X-Git-Tag: 7.0.0.alpha2~529 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82398e288a58276211d8e5eab2eaf18165e16555;p=vaadin-framework.git Moved JUnit test to server-side source folder where it belongs --- diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java b/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java new file mode 100644 index 0000000000..88dceca9e7 --- /dev/null +++ b/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java @@ -0,0 +1,61 @@ +package com.vaadin.tests.server.component.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 higherOrEqual = Resolution + .getResolutionsHigherOrEqualTo(Resolution.YEAR); + ArrayList expected = new ArrayList(); + expected.add(Resolution.YEAR); + TestUtil.assertIterableEquals(expected, higherOrEqual); + } + + public void testResolutionHigherOrEqualToDay() { + Iterable higherOrEqual = Resolution + .getResolutionsHigherOrEqualTo(Resolution.DAY); + ArrayList expected = new ArrayList(); + expected.add(Resolution.DAY); + expected.add(Resolution.MONTH); + expected.add(Resolution.YEAR); + TestUtil.assertIterableEquals(expected, higherOrEqual); + + } + + public void testResolutionLowerThanDay() { + Iterable higherOrEqual = Resolution + .getResolutionsLowerThan(Resolution.DAY); + ArrayList expected = new ArrayList(); + expected.add(Resolution.HOUR); + expected.add(Resolution.MINUTE); + expected.add(Resolution.SECOND); + TestUtil.assertIterableEquals(expected, higherOrEqual); + + } + + public void testResolutionLowerThanSecond() { + Iterable higherOrEqual = Resolution + .getResolutionsLowerThan(Resolution.SECOND); + ArrayList expected = new ArrayList(); + TestUtil.assertIterableEquals(expected, higherOrEqual); + } + + public void testResolutionLowerThanYear() { + Iterable higherOrEqual = Resolution + .getResolutionsLowerThan(Resolution.YEAR); + ArrayList expected = new ArrayList(); + expected.add(Resolution.MONTH); + expected.add(Resolution.DAY); + expected.add(Resolution.HOUR); + expected.add(Resolution.MINUTE); + expected.add(Resolution.SECOND); + TestUtil.assertIterableEquals(expected, higherOrEqual); + + } +} diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java b/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java deleted file mode 100644 index e54e1cd418..0000000000 --- a/tests/testbench/com/vaadin/tests/components/datefield/ResolutionTest.java +++ /dev/null @@ -1,61 +0,0 @@ -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 higherOrEqual = Resolution - .getResolutionsHigherOrEqualTo(Resolution.YEAR); - ArrayList expected = new ArrayList(); - expected.add(Resolution.YEAR); - TestUtil.assertIterableEquals(expected, higherOrEqual); - } - - public void testResolutionHigherOrEqualToDay() { - Iterable higherOrEqual = Resolution - .getResolutionsHigherOrEqualTo(Resolution.DAY); - ArrayList expected = new ArrayList(); - expected.add(Resolution.DAY); - expected.add(Resolution.MONTH); - expected.add(Resolution.YEAR); - TestUtil.assertIterableEquals(expected, higherOrEqual); - - } - - public void testResolutionLowerThanDay() { - Iterable higherOrEqual = Resolution - .getResolutionsLowerThan(Resolution.DAY); - ArrayList expected = new ArrayList(); - expected.add(Resolution.HOUR); - expected.add(Resolution.MINUTE); - expected.add(Resolution.SECOND); - TestUtil.assertIterableEquals(expected, higherOrEqual); - - } - - public void testResolutionLowerThanSecond() { - Iterable higherOrEqual = Resolution - .getResolutionsLowerThan(Resolution.SECOND); - ArrayList expected = new ArrayList(); - TestUtil.assertIterableEquals(expected, higherOrEqual); - } - - public void testResolutionLowerThanYear() { - Iterable higherOrEqual = Resolution - .getResolutionsLowerThan(Resolution.YEAR); - ArrayList expected = new ArrayList(); - expected.add(Resolution.MONTH); - expected.add(Resolution.DAY); - expected.add(Resolution.HOUR); - expected.add(Resolution.MINUTE); - expected.add(Resolution.SECOND); - TestUtil.assertIterableEquals(expected, higherOrEqual); - - } -}