Testing with Port Number.

Author: v-nisidh

src/main/java/com/microsoft/sqlserver/jdbc/StringUtils.java

@@ -38,5 +38,32 @@ private StringUtils() {
     public static boolean isEmpty(final CharSequence charSequence) {
         return charSequence == null || charSequence.length() == 0;
     }
+    
+    /**
+     * Check if String is numeric or not. 
+     * @param str {@link String} 
+     * @return {@link Boolean} if provided String is numeric or not.
+     */
+    public static boolean isNumeric(final String str) {
+        return !isEmpty(str) && str.matches("\\d+(\\.\\d+)?");
+    }
+    
+    /**
+     * Check if string is integer or not
+     * @param str {@link String} 
+     * @return {@link Boolean} if provided String is Integer or not.
+     */
+    public static boolean isInteger(final String str) {
+        boolean isInteger = false;
+        
+        try {
+            int i = Integer.parseInt(str);
+            isInteger = true;
+        }catch(NumberFormatException e) {
+            //Nothing. this is not integer. 
+        }
+        
+        return isInteger;
+    }
 
 }

src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java

@@ -201,9 +201,14 @@ public void fipsDataSourceTrustServerCertificateTest() throws Exception {
      */
     private void setDataSourceProperties(SQLServerDataSource ds) {
         ds.setServerName(dataSourceProps[0]);
-        ds.setUser(dataSourceProps[1]);
-        ds.setPassword(dataSourceProps[2]);
-        ds.setDatabaseName(dataSourceProps[3]);
+
+        if (dataSourceProps[1] != null && StringUtils.isInteger(dataSourceProps[1])) {
+            ds.setPortNumber(Integer.valueOf(dataSourceProps[1]));
+        }
+
+        ds.setUser(dataSourceProps[2]);
+        ds.setPassword(dataSourceProps[3]);
+        ds.setDatabaseName(dataSourceProps[4]);
 
         // Set all properties for FIPS
         ds.setFIPS(true);
@@ -247,20 +252,25 @@ private Properties buildConnectionProperties() {
      */
     private static String[] getDataSourceProperties() {
         String[] params = connectionString.split(";");
-        String[] dataSoureParam = new String[4];
+        String[] dataSoureParam = new String[5];
 
         for (String strParam : params) {
             if (strParam.startsWith("jdbc:sqlserver")) {
                 dataSoureParam[0] = strParam.replace("jdbc:sqlserver://", "");
+                String[] hostPort = dataSoureParam[0].split(":");
+                dataSoureParam[0] = hostPort[0];
+                if (hostPort.length > 1) {
+                    dataSoureParam[1] = hostPort[1];
+                }
             }
             else if (strParam.startsWith("userName")) {
-                dataSoureParam[1] = strParam.replace("userName=", "");
+                dataSoureParam[2] = strParam.replace("userName=", "");
             }
             else if (strParam.startsWith("password")) {
-                dataSoureParam[2] = strParam.replace("password=", "");
+                dataSoureParam[3] = strParam.replace("password=", "");
             }
             else if (strParam.startsWith("database")) {
-                dataSoureParam[3] = strParam.replace("database=", "");
+                dataSoureParam[4] = strParam.replace("database=", "");
             }
 
         }