Merge pull request #179 from v-nisidh/dev

Fixed local test failures.
microsoft · Mar 8, 2017 · 68f58aa · 68f58aa
2 parents a61b10a + ca3955c
commit 68f58aa
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java
@@ -264,25 +264,34 @@ private static String[] getDataSourceProperties() {
                 }
             }
             // Actually this is specifically did for Travis.
+            else if(strParam.startsWith("port")) {
+                strParam = strParam.toLowerCase();
+                if(strParam.startsWith("portnumber")) {
+                    dataSoureParam[1] = strParam.replace("portnumber=", "");
+                } else {
+                    dataSoureParam[1] = strParam.replace("port=", "");
+                }
+            }
+
             else if (strParam.startsWith("user")) {
                 strParam = strParam.toLowerCase();
-                if (strParam.equals("user")) {
-                    dataSoureParam[2] = strParam.replace("user=", "");
+                if (strParam.startsWith("username")) {
+                    dataSoureParam[2] = strParam.replace("username=", "");
                 }
                 else {
-                    dataSoureParam[2] = strParam.replace("username=", "");
+                    dataSoureParam[2] = strParam.replace("user=", "");
                 }
             }
             else if (strParam.startsWith("password")) {
                 dataSoureParam[3] = strParam.replace("password=", "");
             }
             else if (strParam.startsWith("database")) {
                 strParam = strParam.toLowerCase();
-                if (strParam.equals("database")) {
-                    dataSoureParam[4] = strParam.replace("database=", "");
+                if (strParam.startsWith("databasename")) {
+                    dataSoureParam[4] = strParam.replace("databasename=", "");
                 }
                 else {
-                    dataSoureParam[4] = strParam.replace("databasename=", "");
+                    dataSoureParam[4] = strParam.replace("database=", "");
                 }
             }