(no commit message)

[cdmlib.git] / cdmlib-persistence / src / test / java / eu / etaxonomy / cdm / database / DatabaseEnumTest.java

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java
index 757069b12e6fbceea47feebe75e906855a1ae163..fc9cfe750a7424ba2a74fb07dbe2e83aaa57c3b4 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java
@@ -22,6 +22,7 @@ import org.junit.Test;
 public class DatabaseEnumTest {\r
        private static final Logger logger = Logger.getLogger(DatabaseEnumTest.class);\r
        private static DatabaseTypeEnum dbEnum;\r
+       private static DatabaseTypeEnum dbEnumSql2005;\r
        \r
        /**\r
         * @throws java.lang.Exception\r
@@ -29,6 +30,7 @@ public class DatabaseEnumTest {
        @BeforeClass\r
        public static void setUpBeforeClass() throws Exception {\r
                dbEnum = DatabaseTypeEnum.MySQL;\r
+               dbEnumSql2005 = DatabaseTypeEnum.SqlServer2005;\r
        }\r
 \r
 \r
@@ -85,6 +87,7 @@ public class DatabaseEnumTest {
        @Test\r
        public void testGetConnectionStringStringString() {\r
                assertEquals("jdbc:mysql://192.168.2.10:3306/cdm_test", this.dbEnum.getConnectionString("192.168.2.10", "cdm_test"));\r
+               assertEquals("jdbc:sqlserver://192.168.2.10:1433;databaseName=cdm_test;SelectMethod=cursor", this.dbEnumSql2005.getConnectionString("192.168.2.10", "cdm_test"));\r
        }\r
 \r
        /**\r
@@ -93,12 +96,14 @@ public class DatabaseEnumTest {
        @Test\r
        public void testGetAllTypes() {\r
                List<DatabaseTypeEnum> typeList = dbEnum.getAllTypes();\r
-               assertEquals(5, typeList.size());\r
+               assertEquals(7, typeList.size());\r
                assertEquals(dbEnum.HSqlDb, typeList.get(0));\r
                assertEquals(dbEnum.MySQL, typeList.get(1));\r
                assertEquals(dbEnum.ODBC, typeList.get(2));\r
                assertEquals(dbEnum.PostgreSQL, typeList.get(3));\r
-               assertEquals(dbEnum.SqlServer, typeList.get(4));\r
+               assertEquals(dbEnum.SqlServer2000, typeList.get(4));\r
+               assertEquals(dbEnum.SqlServer2005, typeList.get(5));\r
+               assertEquals(dbEnum.H2, typeList.get(6));\r
        }\r
        \r
 \r
@@ -107,7 +112,8 @@ public class DatabaseEnumTest {
         */\r
        @Test\r
        public void testGetDatabaseEnumByDriverClass() {\r
-               assertEquals(dbEnum.SqlServer, dbEnum.getDatabaseEnumByDriverClass("com.microsoft.jdbc.sqlserver.SQLServerDriver"));\r
+               assertEquals(dbEnum.SqlServer2000, dbEnum.getDatabaseEnumByDriverClass("com.microsoft.jdbc.sqlserver.SQLServerDriver"));\r
+               assertEquals(dbEnum.SqlServer2005, dbEnum.getDatabaseEnumByDriverClass("com.microsoft.sqlserver.jdbc.SQLServerDriver"));\r
                assertEquals(null, dbEnum.getDatabaseEnumByDriverClass("com.microsoft.xxx"));   \r
        }\r
 \r