From cb6364b3436dd5d186628d1a9bc2eaccee011f8c Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Wed, 16 Sep 2020 12:25:03 -0700
Subject: [PATCH] Removed duplicate tests and updated client info regex (#1190)

---
 .../bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt | 18 +++-------
 test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt  | 35 -------------------
 .../pdo_getAttribute_clientInfo.phpt          |  2 +-
 .../functional/sqlsrv/sqlsrv_client_info.phpt |  2 +-
 4 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt

diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
index 50da236b..051b9fa8 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
@@ -10,31 +10,21 @@ $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
 $attributes1 = array( "ERRMODE" );
 foreach ( $attributes1 as $val ) {
-     echo "PDO::ATTR_$val: ";
-     var_dump ($conn->getAttribute( constant( "PDO::ATTR_$val" ) ));
+    echo "PDO::ATTR_$val: ";
+    var_dump ($conn->getAttribute( constant( "PDO::ATTR_$val" ) ));
 }
 
 $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 $attributes1 = array( "ERRMODE" );
 foreach ( $attributes1 as $val ) {
-     echo "PDO::ATTR_$val: ";
-     var_dump ($conn->getAttribute( constant( "PDO::ATTR_$val" ) ));
+    echo "PDO::ATTR_$val: ";
+    var_dump ($conn->getAttribute( constant( "PDO::ATTR_$val" ) ));
 }
 
-// An example using PDO::ATTR_CLIENT_VERSION
-print_r($conn->getAttribute( PDO::ATTR_CLIENT_VERSION ));
-
 //free the connection
 unset($conn);
 ?>
 --EXPECTREGEX--
 PDO::ATTR_ERRMODE: int\(0\)
 PDO::ATTR_ERRMODE: int\(2\)
-Array
-\(
-    \[DriverDllName\]|\[DriverName\] => (msodbcsql[0-9]{2}\.dll|(libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]|libmsodbcsql.[0-9]{2}.dylib))
-    \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
-    \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-    \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?
-\)
\ No newline at end of file
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
deleted file mode 100644
index 290bab88..00000000
--- a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-client information.
---SKIPIF--
-<?php require('skipif.inc'); ?>
---FILE--
-<?php
-require('connect.inc');
-$connectionInfo = array( "Database"=>"$databaseName", "UID"=>"$uid", "PWD"=>"$pwd");
-$conn = sqlsrv_connect( $server, $connectionInfo);
-if( $conn === false )
-{
-     echo "Could not connect.\n";
-     die( print_r( sqlsrv_errors(), true));
-}
-
-if( $client_info = sqlsrv_client_info( $conn))
-{
-       foreach( $client_info as $key => $value)
-      {
-              echo $key.": ".$value."\n";
-      }
-}
-else
-{
-       echo "Client info error.\n";
-}
-
-/* Close connection resources. */
-sqlsrv_close( $conn);
-?>
---EXPECTREGEX--
-DriverDllName|DriverName: (msodbcsql[0-9]{2}\.dll|(libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]|libmsodbcsql.[0-9]{2}.dylib))
-DriverODBCVer: [0-9]{1,2}\.[0-9]{1,2}
-DriverVer: [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-ExtensionVer: [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?
\ No newline at end of file
diff --git a/test/functional/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt b/test/functional/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
index 4c463e2b..4a7b799d 100644
--- a/test/functional/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
@@ -23,5 +23,5 @@ Array
     \[(DriverDllName|DriverName)\] => (msodbcsql1[1-9].dll|(libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]|libmsodbcsql.[0-9]{2}.dylib))
     \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
     \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-    \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[1-9]?|preview[1-9]))?(\.[0-9]+)?(\+[0-9]+)?
+    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](-(RC[1-9]?|preview[1-9]))?(\.[0-9]+)?(\+[0-9]+)?
 \)
diff --git a/test/functional/sqlsrv/sqlsrv_client_info.phpt b/test/functional/sqlsrv/sqlsrv_client_info.phpt
index 8b91140d..ef8f5435 100644
--- a/test/functional/sqlsrv/sqlsrv_client_info.phpt
+++ b/test/functional/sqlsrv/sqlsrv_client_info.phpt
@@ -21,5 +21,5 @@ array\(4\) {
   \[\"DriverVer\"\]=>
   string\(10\) \"[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}\"
   \[\"ExtensionVer\"\]=>
-  string\([0-9]+\) \"[0-9].[0-9]\.[0-9](-(RC[1-9]?|preview[1-9]))?(\.[0-9]+)?(\+[0-9]+)?\"
+  string\([0-9]+\) \"[0-9]\.[0-9]\.[0-9](-(RC[1-9]?|preview[1-9]))?(\.[0-9]+)?(\+[0-9]+)?\"
 }
\ No newline at end of file