Moved client side tests from tests/client-side to client/tests/src

3 files changed, 0 insertions, 675 deletions

diff --git a/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java b/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
deleted file mode 100644
index da5970d64d..0000000000
--- a/tests/client-side/com/vaadin/client/ApplicationConnectionTestURLGeneration.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.vaadin.client;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import com.vaadin.client.ApplicationConnection;
-
-public class ApplicationConnectionTestURLGeneration {
-
-    private static final String[] URIS = new String[] {
-            "http://demo.vaadin.com/", //
-            "https://demo.vaadin.com/",
-            "http://demo.vaadin.com/foo",
-            "http://demo.vaadin.com/foo?f",
-            "http://demo.vaadin.com/foo?f=1",
-            "http://demo.vaadin.com:1234/foo?a",
-            "http://demo.vaadin.com:1234/foo#frag?fakeparam",
-            // Jetspeed
-            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__",
-            // Liferay generated url
-            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1",
-
-    };
-    private static final String[] URIS_WITH_ABCD_PARAM = new String[] {
-            "http://demo.vaadin.com/?a=b&c=d",
-            "https://demo.vaadin.com/?a=b&c=d",
-            "http://demo.vaadin.com/foo?a=b&c=d",
-            "http://demo.vaadin.com/foo?f&a=b&c=d",
-            "http://demo.vaadin.com/foo?f=1&a=b&c=d",
-            "http://demo.vaadin.com:1234/foo?a&a=b&c=d",
-            "http://demo.vaadin.com:1234/foo?a=b&c=d#frag?fakeparam",
-            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d",
-            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d",
-
-    };
-
-    private static final String[] URIS_WITH_ABCD_PARAM_AND_FRAGMENT = new String[] {
-            "http://demo.vaadin.com/?a=b&c=d#fragment",
-            "https://demo.vaadin.com/?a=b&c=d#fragment",
-            "http://demo.vaadin.com/foo?a=b&c=d#fragment",
-            "http://demo.vaadin.com/foo?f&a=b&c=d#fragment",
-            "http://demo.vaadin.com/foo?f=1&a=b&c=d#fragment",
-            "http://demo.vaadin.com:1234/foo?a&a=b&c=d#fragment",
-            "",
-            "http://localhost:8080/jetspeed/portal/_ns:Z3RlbXBsYXRlLXRvcDJfX3BhZ2UtdGVtcGxhdGVfX2RwLTFfX1AtMTJjNTRkYjdlYjUtMTAwMDJ8YzB8ZDF8aVVJREx8Zg__?a=b&c=d#fragment",
-            "http://vaadin.com/directory?p_p_id=Directory_WAR_Directory&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view&p_p_resource_id=UIDL&p_p_cacheability=cacheLevelPage&p_p_col_id=row-1&p_p_col_count=1&a=b&c=d#fragment",
-
-    };
-
-    @Test
-    public void testParameterAdding() {
-        for (int i = 0; i < URIS.length; i++) {
-            // Adding nothing
-            assertEquals(URIS[i],
-                    ApplicationConnection.addGetParameters(URIS[i], ""));
-
-            // Adding a=b&c=d
-            assertEquals(URIS_WITH_ABCD_PARAM[i],
-                    ApplicationConnection.addGetParameters(URIS[i], "a=b&c=d"));
-
-            // Fragments
-            if (URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].length() > 0) {
-                assertEquals(
-                        URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i],
-                        ApplicationConnection.addGetParameters(URIS[i]
-                                + "#fragment", "a=b&c=d"));
-
-                // Empty fragment
-                assertEquals(URIS_WITH_ABCD_PARAM_AND_FRAGMENT[i].replace(
-                        "#fragment", "#"),
-                        ApplicationConnection.addGetParameters(URIS[i] + "#",
-                                "a=b&c=d"));
-            }
-        }
-    }
-}
diff --git a/tests/client-side/com/vaadin/client/DateTimeServiceTest.java b/tests/client-side/com/vaadin/client/DateTimeServiceTest.java
deleted file mode 100755
index 6852e9ec3f..0000000000
--- a/tests/client-side/com/vaadin/client/DateTimeServiceTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.vaadin.client;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import com.vaadin.client.DateTimeService;
-
-public class DateTimeServiceTest extends TestCase {
-
-    final long MILLISECONDS_PER_DAY = 24 * 3600 * 1000;
-
-    static Map<Date, Integer> isoWeekNumbers = new HashMap<Date, Integer>();
-    static {
-        isoWeekNumbers.put(getDate(2005, 02, 02), 5);
-
-        isoWeekNumbers.put(getDate(2005, 1, 1), 53);
-        isoWeekNumbers.put(getDate(2005, 1, 2), 53);
-        isoWeekNumbers.put(getDate(2005, 1, 3), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 4), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 5), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 6), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 7), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 8), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 9), 1);
-        isoWeekNumbers.put(getDate(2005, 1, 10), 2);
-        isoWeekNumbers.put(getDate(2005, 12, 31), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 30), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 29), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 28), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 27), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 26), 52);
-        isoWeekNumbers.put(getDate(2005, 12, 25), 51);
-        isoWeekNumbers.put(getDate(2007, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2007, 12, 30), 52);
-        isoWeekNumbers.put(getDate(2007, 12, 31), 1);
-        isoWeekNumbers.put(getDate(2008, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 28), 52);
-        isoWeekNumbers.put(getDate(2008, 12, 29), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 30), 1);
-        isoWeekNumbers.put(getDate(2008, 12, 31), 1);
-        isoWeekNumbers.put(getDate(2009, 1, 1), 1);
-        isoWeekNumbers.put(getDate(2009, 12, 31), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 1), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 2), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 3), 53);
-        isoWeekNumbers.put(getDate(2010, 1, 4), 1);
-        isoWeekNumbers.put(getDate(2010, 1, 5), 1);
-        isoWeekNumbers.put(getDate(2010, 10, 10), 40);
-
-    }
-
-    /**
-     * Test all dates from 1990-1992 + some more and see that {@link Calendar}
-     * calculates the ISO week number like we do.
-     * 
-     */
-    public void testISOWeekNumbers() {
-        Calendar c = Calendar.getInstance();
-        c.set(1990, 1, 1);
-        long start = c.getTimeInMillis();
-
-        for (int i = 0; i < 1000; i++) {
-            Date d = new Date(start + i * MILLISECONDS_PER_DAY);
-            int expected = getCalendarISOWeekNr(d);
-            int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected, expected,
-                    calculated);
-
-        }
-    }
-
-    /**
-     * Verify that special cases are handled correctly by us (and
-     * {@link Calendar}).
-     * 
-     */
-    public void testSampleISOWeekNumbers() {
-        for (Date d : isoWeekNumbers.keySet()) {
-            // System.out.println("Sample: " + d);
-            int expected = isoWeekNumbers.get(d);
-            int calculated = DateTimeService.getISOWeekNumber(d);
-            assertEquals(d + " should be week " + expected
-                    + " (Java Calendar is wrong?)", expected,
-                    getCalendarISOWeekNr(d));
-            assertEquals(d + " should be week " + expected, expected,
-                    calculated);
-
-        }
-    }
-
-    private int getCalendarISOWeekNr(Date d) {
-        Calendar c = Calendar.getInstance();
-        c.setFirstDayOfWeek(Calendar.MONDAY);
-        c.setMinimalDaysInFirstWeek(4);
-        c.setTime(d);
-
-        return c.get(Calendar.WEEK_OF_YEAR);
-    }
-
-    private static Date getDate(int year, int month, int date) {
-        Calendar c = Calendar.getInstance();
-        c.clear();
-        c.set(year, month - 1, date);
-        return c.getTime();
-    }
-
-}
diff --git a/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java b/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
deleted file mode 100644
index 04e8be699b..0000000000
--- a/tests/client-side/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java
+++ /dev/null
@@ -1,487 +0,0 @@
-package com.vaadin.client;
-
-import com.vaadin.shared.VBrowserDetails;
-
-import junit.framework.TestCase;
-
-public class TestVBrowserDetailsUserAgentParser extends TestCase {
-
-    private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";
-    private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";
-    private static final String FIREFOX35_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.8) Gecko/20100202 Firefox/3.5.8 (.NET CLR 3.5.30729) FirePHP/0.4";
-    private static final String FIREFOX36_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6 (.NET CLR 3.5.30729)";
-    private static final String FIREFOX36B_MAC = "UAString mozilla/5.0 (macintosh; u; intel mac os x 10.6; en-us; rv:1.9.2) gecko/20100115 firefox/3.6";
-    private static final String FIREFOX_30B5_MAC = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.4; en-US; rv:1.9b5) Gecko/2008032619 Firefox/3.0b5";
-    private static final String FIREFOX_40B7_WIN = "Mozilla/5.0 (Windows NT 5.1; rv:2.0b7) Gecko/20100101 Firefox/4.0b7";
-    private static final String FIREFOX_40B11_WIN = "Mozilla/5.0 (Windows NT 5.1; rv:2.0b11) Gecko/20100101 Firefox/4.0b11";
-    private static final String KONQUEROR_LINUX = "Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.5 (like Gecko) (Exabot-Thumbnails)";
-
-    private static final String IE6_WINDOWS = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 2.0.50727)";
-    private static final String IE7_WINDOWS = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)";
-
-    private static final String IE8_WINDOWS = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2)";
-    private static final String IE8_IN_IE7_MODE_WINDOWS = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; InfoPath.2)";
-
-    private static final String IE9_BETA_IN_IE7_MODE_WINDOWS_7 = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)";
-    private static final String IE9_BETA_IN_IE8_MODE_WINDOWS_7 = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C)";
-    private static final String IE9_BETA_WINDOWS_7 = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)";
-
-    // "Version/" was added in 10.00
-    private static final String OPERA964_WINDOWS = "Opera/9.64(Windows NT 5.1; U; en) Presto/2.1.1";
-    private static final String OPERA1010_WINDOWS = "Opera/9.80 (Windows NT 5.1; U; en) Presto/2.2.15 Version/10.10";
-    private static final String OPERA1050_WINDOWS = "Opera/9.80 (Windows NT 5.1; U; en) Presto/2.5.22 Version/10.50";
-
-    private static final String CHROME3_MAC = "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.198 Safari/532.0";
-    private static final String CHROME4_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.249.89 Safari/532.5";
-
-    private static final String SAFARI3_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 5.1; cs-CZ) AppleWebKit/525.28.3 (KHTML, like Gecko) Version/3.2.3 Safari/525.29";
-    private static final String SAFARI4_MAC = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; en-us) AppleWebKit/531.22.7 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7";
-
-    private static final String IPHONE_IOS_5_1 = "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B179 Safari/7534.48.3";
-    private static final String IPHONE_IOS_4_0 = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7";
-    private static final String IPAD_IOS_4_3_1 = "Mozilla/5.0 (iPad; U; CPU OS 4_3_1 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8G4 Safari/6533.18.5";
-
-    private static final String ANDROID_HTC_2_1 = "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; ADR6300 Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17";
-    private static final String ANDROID_GOOGLE_NEXUS_2_2 = "Mozilla/5.0 (Linux; U; Android 2.2; en-us; Nexus One Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
-    private static final String ANDROID_MOTOROLA_3_0 = "Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13";
-    private static final String ANDROID_GALAXY_NEXUS_4_0_4_CHROME = "Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.133 Mobile Safari/535.19";
-
-    public void testSafari3() {
-        VBrowserDetails bd = new VBrowserDetails(SAFARI3_WINDOWS);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 2);
-        assertEngineVersion(bd, 525.0f);
-        assertWindows(bd);
-    }
-
-    public void testSafari4() {
-        VBrowserDetails bd = new VBrowserDetails(SAFARI4_MAC);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 531f);
-        assertMacOSX(bd);
-    }
-
-    public void testIPhoneIOS5() {
-        VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_5_1);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 5);
-        assertBrowserMinorVersion(bd, 1);
-        assertEngineVersion(bd, 534f);
-        assertIOS(bd, 5, 1);
-    }
-
-    public void testIPhoneIOS4() {
-        VBrowserDetails bd = new VBrowserDetails(IPHONE_IOS_4_0);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 532f);
-        assertIOS(bd, 4, 0);
-    }
-
-    public void testIPadIOS4() {
-        VBrowserDetails bd = new VBrowserDetails(IPAD_IOS_4_3_1);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 5);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 533f);
-        assertIOS(bd, 4, 3);
-    }
-
-    public void testAndroid21() {
-        VBrowserDetails bd = new VBrowserDetails(ANDROID_HTC_2_1);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 530f);
-        assertAndroid(bd, 2, 1);
-
-    }
-
-    public void testAndroid22() {
-        VBrowserDetails bd = new VBrowserDetails(ANDROID_GOOGLE_NEXUS_2_2);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 533f);
-        assertAndroid(bd, 2, 2);
-    }
-
-    public void testAndroid30() {
-        VBrowserDetails bd = new VBrowserDetails(ANDROID_MOTOROLA_3_0);
-        assertWebKit(bd);
-        assertSafari(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 534f);
-        assertAndroid(bd, 3, 0);
-    }
-
-    public void testAndroid40Chrome() {
-        VBrowserDetails bd = new VBrowserDetails(
-                ANDROID_GALAXY_NEXUS_4_0_4_CHROME);
-        assertWebKit(bd);
-        assertChrome(bd);
-        assertBrowserMajorVersion(bd, 18);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 535f);
-        assertAndroid(bd, 4, 0);
-    }
-
-    private void assertOSMajorVersion(VBrowserDetails bd, int i) {
-        assertEquals(i, bd.getOperatingSystemMajorVersion());
-    }
-
-    private void assertOSMinorVersion(VBrowserDetails bd, int i) {
-        assertEquals(i, bd.getOperatingSystemMinorVersion());
-    }
-
-    public void testChrome3() {
-        VBrowserDetails bd = new VBrowserDetails(CHROME3_MAC);
-        assertWebKit(bd);
-        assertChrome(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 532.0f);
-        assertMacOSX(bd);
-    }
-
-    public void testChrome4() {
-        VBrowserDetails bd = new VBrowserDetails(CHROME4_WINDOWS);
-        assertWebKit(bd);
-        assertChrome(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 532f);
-        assertWindows(bd);
-    }
-
-    public void testFirefox3() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX30_WINDOWS);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 1.9f);
-        assertWindows(bd);
-
-        bd = new VBrowserDetails(FIREFOX30_LINUX);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 1.9f);
-        assertLinux(bd);
-    }
-
-    public void testFirefox35() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX35_WINDOWS);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 5);
-        assertEngineVersion(bd, 1.9f);
-        assertWindows(bd);
-    }
-
-    public void testFirefox36() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX36_WINDOWS);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 6);
-        assertEngineVersion(bd, 1.9f);
-        assertWindows(bd);
-    }
-
-    public void testFirefox30b5() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX_30B5_MAC);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 1.9f);
-        assertMacOSX(bd);
-    }
-
-    public void testFirefox40b11() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B11_WIN);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 2.0f);
-        assertWindows(bd);
-    }
-
-    public void testFirefox40b7() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX_40B7_WIN);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 4);
-        assertBrowserMinorVersion(bd, 0);
-        assertEngineVersion(bd, 2.0f);
-        assertWindows(bd);
-    }
-
-    public void testKonquerorLinux() {
-        // Just ensure detection does not crash
-        VBrowserDetails bd = new VBrowserDetails(KONQUEROR_LINUX);
-        assertLinux(bd);
-    }
-
-    public void testFirefox36b() {
-        VBrowserDetails bd = new VBrowserDetails(FIREFOX36B_MAC);
-        assertGecko(bd);
-        assertFirefox(bd);
-        assertBrowserMajorVersion(bd, 3);
-        assertBrowserMinorVersion(bd, 6);
-        assertEngineVersion(bd, 1.9f);
-        assertMacOSX(bd);
-    }
-
-    public void testOpera964() {
-        VBrowserDetails bd = new VBrowserDetails(OPERA964_WINDOWS);
-        assertPresto(bd);
-        assertOpera(bd);
-        assertBrowserMajorVersion(bd, 9);
-        assertBrowserMinorVersion(bd, 64);
-        assertWindows(bd);
-    }
-
-    public void testOpera1010() {
-        VBrowserDetails bd = new VBrowserDetails(OPERA1010_WINDOWS);
-        assertPresto(bd);
-        assertOpera(bd);
-        assertBrowserMajorVersion(bd, 10);
-        assertBrowserMinorVersion(bd, 10);
-        assertWindows(bd);
-    }
-
-    public void testOpera1050() {
-        VBrowserDetails bd = new VBrowserDetails(OPERA1050_WINDOWS);
-        assertPresto(bd);
-        assertOpera(bd);
-        assertBrowserMajorVersion(bd, 10);
-        assertBrowserMinorVersion(bd, 50);
-        assertWindows(bd);
-    }
-
-    public void testIE6() {
-        VBrowserDetails bd = new VBrowserDetails(IE6_WINDOWS);
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 6);
-        assertBrowserMinorVersion(bd, 0);
-        assertWindows(bd);
-    }
-
-    public void testIE7() {
-        VBrowserDetails bd = new VBrowserDetails(IE7_WINDOWS);
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 7);
-        assertBrowserMinorVersion(bd, 0);
-        assertWindows(bd);
-    }
-
-    public void testIE8() {
-        VBrowserDetails bd = new VBrowserDetails(IE8_WINDOWS);
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 8);
-        assertBrowserMinorVersion(bd, 0);
-        assertWindows(bd);
-    }
-
-    public void testIE8CompatibilityMode() {
-        VBrowserDetails bd = new VBrowserDetails(IE8_IN_IE7_MODE_WINDOWS);
-        bd.setIEMode(7);
-
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 7);
-        assertBrowserMinorVersion(bd, 0);
-
-        assertWindows(bd);
-    }
-
-    public void testIE9() {
-        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_WINDOWS_7);
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 9);
-        assertBrowserMinorVersion(bd, 0);
-        assertWindows(bd);
-    }
-
-    public void testIE9InIE7CompatibilityMode() {
-        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE7_MODE_WINDOWS_7);
-        // bd.setIE8InCompatibilityMode();
-
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 7);
-        assertBrowserMinorVersion(bd, 0);
-
-        assertWindows(bd);
-    }
-
-    public void testIE9InIE8CompatibilityMode() {
-        VBrowserDetails bd = new VBrowserDetails(IE9_BETA_IN_IE8_MODE_WINDOWS_7);
-        // bd.setIE8InCompatibilityMode();
-
-        // assertTrident(bd);
-        assertIE(bd);
-        assertBrowserMajorVersion(bd, 8);
-        assertBrowserMinorVersion(bd, 0);
-
-        assertWindows(bd);
-    }
-
-    /*
-     * Helper methods below
-     */
-
-    private void assertEngineVersion(VBrowserDetails browserDetails,
-            float version) {
-        assertEquals(version, browserDetails.getBrowserEngineVersion());
-
-    }
-
-    private void assertBrowserMajorVersion(VBrowserDetails browserDetails,
-            int version) {
-        assertEquals(version, browserDetails.getBrowserMajorVersion());
-
-    }
-
-    private void assertBrowserMinorVersion(VBrowserDetails browserDetails,
-            int version) {
-        assertEquals(version, browserDetails.getBrowserMinorVersion());
-
-    }
-
-    private void assertGecko(VBrowserDetails browserDetails) {
-        // Engine
-        assertTrue(browserDetails.isGecko());
-        assertFalse(browserDetails.isWebKit());
-        assertFalse(browserDetails.isPresto());
-    }
-
-    private void assertPresto(VBrowserDetails browserDetails) {
-        // Engine
-        assertFalse(browserDetails.isGecko());
-        assertFalse(browserDetails.isWebKit());
-        assertTrue(browserDetails.isPresto());
-    }
-
-    private void assertWebKit(VBrowserDetails browserDetails) {
-        // Engine
-        assertFalse(browserDetails.isGecko());
-        assertTrue(browserDetails.isWebKit());
-        assertFalse(browserDetails.isPresto());
-    }
-
-    private void assertFirefox(VBrowserDetails browserDetails) {
-        // Browser
-        assertTrue(browserDetails.isFirefox());
-        assertFalse(browserDetails.isChrome());
-        assertFalse(browserDetails.isIE());
-        assertFalse(browserDetails.isOpera());
-        assertFalse(browserDetails.isSafari());
-    }
-
-    private void assertChrome(VBrowserDetails browserDetails) {
-        // Browser
-        assertFalse(browserDetails.isFirefox());
-        assertTrue(browserDetails.isChrome());
-        assertFalse(browserDetails.isIE());
-        assertFalse(browserDetails.isOpera());
-        assertFalse(browserDetails.isSafari());
-    }
-
-    private void assertIE(VBrowserDetails browserDetails) {
-        // Browser
-        assertFalse(browserDetails.isFirefox());
-        assertFalse(browserDetails.isChrome());
-        assertTrue(browserDetails.isIE());
-        assertFalse(browserDetails.isOpera());
-        assertFalse(browserDetails.isSafari());
-    }
-
-    private void assertOpera(VBrowserDetails browserDetails) {
-        // Browser
-        assertFalse(browserDetails.isFirefox());
-        assertFalse(browserDetails.isChrome());
-        assertFalse(browserDetails.isIE());
-        assertTrue(browserDetails.isOpera());
-        assertFalse(browserDetails.isSafari());
-    }
-
-    private void assertSafari(VBrowserDetails browserDetails) {
-        // Browser
-        assertFalse(browserDetails.isFirefox());
-        assertFalse(browserDetails.isChrome());
-        assertFalse(browserDetails.isIE());
-        assertFalse(browserDetails.isOpera());
-        assertTrue(browserDetails.isSafari());
-    }
-
-    private void assertMacOSX(VBrowserDetails browserDetails) {
-        assertFalse(browserDetails.isLinux());
-        assertFalse(browserDetails.isWindows());
-        assertTrue(browserDetails.isMacOSX());
-        assertFalse(browserDetails.isAndroid());
-    }
-
-    private void assertAndroid(VBrowserDetails browserDetails,
-            int majorVersion, int minorVersion) {
-        assertFalse(browserDetails.isLinux());
-        assertFalse(browserDetails.isWindows());
-        assertFalse(browserDetails.isMacOSX());
-        assertFalse(browserDetails.isIOS());
-        assertTrue(browserDetails.isAndroid());
-
-        assertOSMajorVersion(browserDetails, majorVersion);
-        assertOSMinorVersion(browserDetails, minorVersion);
-    }
-
-    private void assertIOS(VBrowserDetails browserDetails, int majorVersion,
-            int minorVersion) {
-        assertFalse(browserDetails.isLinux());
-        assertFalse(browserDetails.isWindows());
-        assertFalse(browserDetails.isMacOSX());
-        assertTrue(browserDetails.isIOS());
-        assertFalse(browserDetails.isAndroid());
-
-        assertOSMajorVersion(browserDetails, majorVersion);
-        assertOSMinorVersion(browserDetails, minorVersion);
-    }
-
-    private void assertWindows(VBrowserDetails browserDetails) {
-        assertFalse(browserDetails.isLinux());
-        assertTrue(browserDetails.isWindows());
-        assertFalse(browserDetails.isMacOSX());
-        assertFalse(browserDetails.isIOS());
-        assertFalse(browserDetails.isAndroid());
-    }
-
-    private void assertLinux(VBrowserDetails browserDetails) {
-        assertTrue(browserDetails.isLinux());
-        assertFalse(browserDetails.isWindows());
-        assertFalse(browserDetails.isMacOSX());
-        assertFalse(browserDetails.isIOS());
-        assertFalse(browserDetails.isAndroid());
-    }
-
-}