From aa04104bb2979e45fdaa5eb533a0c93e008928c1 Mon Sep 17 00:00:00 2001
From: v-kaywon <v-kaywon@microsoft.com>
Date: Tue, 5 Dec 2017 09:54:11 -0800
Subject: [PATCH] refactor KSP related tests

---
 .../pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt | 19 ++++++-------------
 .../pdo_connect_encrypted_ksp_encrypted.phpt  | 19 ++++++-------------
 .../pdo_connect_encrypted_ksp_errors.phpt     |  6 ++++--
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
index 26f1eee4..02d77f53 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
@@ -4,19 +4,11 @@ Fetch data from a prepopulated test table given a custom keystore provider
 <?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
-    require( 'MsSetup.inc' );
-    require( 'AE_Ksp.inc' );
-
-    $ksp_path = getKSPpath();
-
-    $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";
-    $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
-    $connectionInfo .= "CEKeystoreName = $ksp_name; "; 
-    $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
+    require_once("MsCommon_mid-refactor.inc");
 
     try
     {
-        $conn = new PDO( "sqlsrv:server = $server ; $connectionInfo", $uid, $pwd );
+        $conn = connect();
         echo "Connected successfully with ColumnEncryption enabled and KSP specified.\n";
     }
     catch( PDOException $e )
@@ -26,15 +18,16 @@ Fetch data from a prepopulated test table given a custom keystore provider
         echo "\n";
     }
    
-    $tsql = "SELECT * FROM CustomKSPTestTable";
+    $tbname = KSP_TEST_TABLE;
+    $tsql = "SELECT * FROM $tbname";
     $stmt = $conn->query($tsql);
     while ($row = $stmt->fetch(PDO::FETCH_NUM))
     {
         echo "c1=" . $row[0] . "\tc2=" . $row[1] . "\tc3=" . $row[2] . "\tc4=" . $row[3] . "\n";
     }            
     
-    $stmt = null;
-    $conn = null;
+    unset($stmt);
+    unset($conn);
 
     echo "Done\n";
 
diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
index 8a0d7272..0d7d8540 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
@@ -4,19 +4,11 @@ Fetch encrypted data from a prepopulated test table given a custom keystore prov
 <?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
-    require( 'MsSetup.inc' );
-    require( 'AE_Ksp.inc' );
-
-    $ksp_path = getKSPpath();
-
-    $connectionInfo = "Database = $databaseName; ";
-    $connectionInfo .= "CEKeystoreProvider = $ksp_path; ";
-    $connectionInfo .= "CEKeystoreName = $ksp_name; "; 
-    $connectionInfo .= "CEKeystoreEncryptKey = $encrypt_key; ";
+    require_once("MsCommon_mid-refactor.inc");
 
     try
     {
-        $conn = new PDO( "sqlsrv:server = $server ; $connectionInfo", $uid, $pwd );
+        $conn = connect();
         echo "Connected successfully with ColumnEncryption disabled and KSP specified.\n";
     }
     catch( PDOException $e )
@@ -26,7 +18,8 @@ Fetch encrypted data from a prepopulated test table given a custom keystore prov
         echo "\n";
     }
    
-    $tsql = "SELECT * FROM CustomKSPTestTable";
+    $tbname = KSP_TEST_TABLE;
+    $tsql = "SELECT * FROM $tbname";
     $stmt = $conn->query($tsql);
     while ($row = $stmt->fetch(PDO::FETCH_NUM))
     {
@@ -37,8 +30,8 @@ Fetch encrypted data from a prepopulated test table given a custom keystore prov
         echo "\n" ;
     }            
     
-    $stmt = null;
-    $conn = null;
+    unset($stmt);
+    unset($conn);
 
     echo "Done\n";
 
diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
index 64c0eb25..9d01b691 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
@@ -4,8 +4,8 @@ Connect using a custom keystore provider with some required inputs missing
 <?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
-    require( 'MsSetup.inc' );
-    require( 'AE_Ksp.inc' );
+    require("MsSetup.inc");
+    require_once("MsCommon_mid-refactor.inc");
 
     function connect( $connectionInfo )
     {
@@ -25,6 +25,8 @@ Connect using a custom keystore provider with some required inputs missing
     }
     
     $ksp_path = getKSPpath();
+    $ksp_name = KSP_NAME;
+    $encrypt_key = ENCRYPT_KEY;
 
     echo("Connecting... with column encryption\n");
     $connectionInfo = "Database = $databaseName; ColumnEncryption = Enabled; ";