From 4fc0c8f80e9b2ab621d90fb4412f256660592c16 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Sat, 18 Nov 2017 22:06:29 -0800
Subject: [PATCH] Modified connection tests

---
 test/functional/pdo_sqlsrv/pdo_connect_driver.phpt | 6 ++++--
 test/functional/sqlsrv/sqlsrv_connect_driver.phpt  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
index 6f53e50b..468f9ceb 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_driver.phpt
@@ -52,6 +52,7 @@ function testValidValues()
         case 17:
             $value = "{ODBC Driver 17 for SQL Server}";
             break;
+        case 14:
         case 13:
             $value = "{ODBC Driver 13 for SQL Server}";
             break;
@@ -60,7 +61,7 @@ function testValidValues()
             $value = "{ODBC Driver 11 for SQL Server}";
             break;            
         default:
-            $value = "invalid value";
+            $value = "invalid value $msodbcsqlMaj";
     }
     $connectionOptions = "Driver = $value";
     connectVerifyOutput($connectionOptions);
@@ -70,6 +71,7 @@ function testValidValues()
         case 17:
             $value = "ODBC Driver 17 for SQL Server";
             break;
+        case 14:
         case 13:
             $value = "ODBC Driver 13 for SQL Server";
             break;
@@ -78,7 +80,7 @@ function testValidValues()
             $value = "ODBC Driver 11 for SQL Server";
             break;            
         default:
-            $value = "invalid value";
+            $value = "invalid value $msodbcsqlMaj";
     }
     
     $connectionOptions = "Driver = $value";
diff --git a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
index 63531498..89377f1a 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_driver.phpt
@@ -44,6 +44,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
         case 17:
             $value = "{ODBC Driver 17 for SQL Server}";
             break;
+        case 14:
         case 13:
             $value = "{ODBC Driver 13 for SQL Server}";
             break;
@@ -52,7 +53,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
             $value = "{ODBC Driver 11 for SQL Server}";
             break;
         default:
-            $value = "invalid value";
+            $value = "invalid value $msodbcsqlMaj";
     }
     $connectionOptions['Driver']=$value;
     connectVerifyOutput($server, $connectionOptions);
@@ -62,6 +63,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
         case 17:
             $value = "ODBC Driver 17 for SQL Server";
             break;
+        case 14:
         case 13:
             $value = "ODBC Driver 13 for SQL Server";
             break;
@@ -70,7 +72,7 @@ function testValidValues($msodbcsqlMaj, $server, $connectionOptions)
             $value = "ODBC Driver 11 for SQL Server";
             break;
         default:
-            $value = "invalid value";
+            $value = "invalid value $msodbcsqlMaj";
     }
 
     $connectionOptions['Driver']=$value;