From ed5a0e5e486cab691868c7c1699937d72c3dbadc Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 7 Sep 2017 15:57:53 -0700
Subject: [PATCH 1/4] added two new variables to enable AE testing

---
 test/functional/pdo_sqlsrv/MsSetup.inc | 4 ++++
 test/functional/sqlsrv/MsSetup.inc     | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/test/functional/pdo_sqlsrv/MsSetup.inc b/test/functional/pdo_sqlsrv/MsSetup.inc
index 2aa68b27..db02e6d2 100644
--- a/test/functional/pdo_sqlsrv/MsSetup.inc
+++ b/test/functional/pdo_sqlsrv/MsSetup.inc
@@ -40,4 +40,8 @@ $marsMode = true;
 $dsnMode = true;
 $traceEnabled = false;
 
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/MsSetup.inc b/test/functional/sqlsrv/MsSetup.inc
index 2b0f02a8..38569ac9 100644
--- a/test/functional/sqlsrv/MsSetup.inc
+++ b/test/functional/sqlsrv/MsSetup.inc
@@ -40,4 +40,9 @@ if (isset($_ENV['MSSQL_SERVER']) || isset($_ENV['MSSQL_USER']) || isset($_ENV['M
     $pwd = $userPassword; 
     $databaseName = $database; 
 }
+
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>

From 696a1fb7223e4de09296c911eb9b5c97e55d3b38 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 7 Sep 2017 15:57:53 -0700
Subject: [PATCH 2/4] added two new variables to enable AE testing

---
 test/functional/pdo_sqlsrv/MsSetup.inc | 4 ++++
 test/functional/sqlsrv/MsSetup.inc     | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/test/functional/pdo_sqlsrv/MsSetup.inc b/test/functional/pdo_sqlsrv/MsSetup.inc
index 2aa68b27..db02e6d2 100644
--- a/test/functional/pdo_sqlsrv/MsSetup.inc
+++ b/test/functional/pdo_sqlsrv/MsSetup.inc
@@ -40,4 +40,8 @@ $marsMode = true;
 $dsnMode = true;
 $traceEnabled = false;
 
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/MsSetup.inc b/test/functional/sqlsrv/MsSetup.inc
index 2b0f02a8..38569ac9 100644
--- a/test/functional/sqlsrv/MsSetup.inc
+++ b/test/functional/sqlsrv/MsSetup.inc
@@ -40,4 +40,9 @@ if (isset($_ENV['MSSQL_SERVER']) || isset($_ENV['MSSQL_USER']) || isset($_ENV['M
     $pwd = $userPassword; 
     $databaseName = $database; 
 }
+
+// column encryption variables
+$keystore = "none";         // key store provider, acceptable values are none, win, ksp, akv
+$dataEncrypted = false;     // whether data is to be encrypted
+
 ?>

From 99fa9c66ddb5aed76461578793ec41149059bae4 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Fri, 8 Sep 2017 12:05:10 -0700
Subject: [PATCH 3/4] skip KSP tests if the flag in MsSetup is not set

---
 test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt  | 7 ++++++-
 .../pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt    | 7 ++++++-
 test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt   | 7 ++++++-
 .../sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt     | 7 ++++++-
 test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt  | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
index c65c70f3..f1ed5bc6 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php 
+require('skipif_versions_old.inc'); 
+require('MsSetup.inc');
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );
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 85257327..a8cc6501 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php 
+require('skipif_versions_old.inc'); 
+require('MsSetup.inc');
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );
diff --git a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
index d225c536..c686d8e1 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php 
+require('skipif_versions_old.inc'); 
+require('MsSetup.inc');
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );
diff --git a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
index c2030983..8748a88f 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php 
+require('skipif_versions_old.inc'); 
+require('MsSetup.inc');
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );
diff --git a/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt b/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
index 8ddbcc21..28673b51 100644
--- a/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
+++ b/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
@@ -1,7 +1,12 @@
 --TEST--
 Test simple insert, fetch and update with ColumnEncryption enabled and a custome keystore provider
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php 
+require('skipif_versions_old.inc'); 
+require('MsSetup.inc');
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+?>
 --FILE--
 <?php
     function CreatePatientsTable()

From 834402ba8d873b20b1301069c4a97884ea56c00f Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Mon, 11 Sep 2017 16:07:40 -0700
Subject: [PATCH 4/4] added skipif_not_ksp file as per review comment

---
 .../pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt |  7 +-----
 .../pdo_connect_encrypted_ksp_encrypted.phpt  |  7 +-----
 test/functional/pdo_sqlsrv/skipif_not_ksp.inc | 22 ++++++++++++++++++
 test/functional/sqlsrv/skipif_not_ksp.inc     | 23 +++++++++++++++++++
 .../sqlsrv/sqlsrv_connect_encrypted_ksp.phpt  |  7 +-----
 ...qlsrv_connect_encrypted_ksp_encrypted.phpt |  7 +-----
 .../sqlsrv/sqlsrv_encrypted_patients_ksp.phpt |  7 +-----
 7 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 test/functional/pdo_sqlsrv/skipif_not_ksp.inc
 create mode 100644 test/functional/sqlsrv/skipif_not_ksp.inc

diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
index f1ed5bc6..26f1eee4 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php 
-require('skipif_versions_old.inc'); 
-require('MsSetup.inc');
-if ($keystore != 'ksp')
-    die ( 'skip - this test requires a custom keystore provider.' );
-?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );
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 a8cc6501..8a0d7272 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_encrypted.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php 
-require('skipif_versions_old.inc'); 
-require('MsSetup.inc');
-if ($keystore != 'ksp')
-    die ( 'skip - this test requires a custom keystore provider.' );
-?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     require( 'MsSetup.inc' );
diff --git a/test/functional/pdo_sqlsrv/skipif_not_ksp.inc b/test/functional/pdo_sqlsrv/skipif_not_ksp.inc
new file mode 100644
index 00000000..71f2c877
--- /dev/null
+++ b/test/functional/pdo_sqlsrv/skipif_not_ksp.inc
@@ -0,0 +1,22 @@
+<?php
+
+if (! extension_loaded( 'pdo' ) || ! extension_loaded( 'pdo_sqlsrv' ))
+    die( "PDO driver cannot be loaded; skipping test.\n" );
+
+require_once( "MsSetup.inc" );
+
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+
+require_once( "MsCommon.inc" );
+
+$conn = new PDO( "sqlsrv:server = $server;", $uid, $pwd );
+if( ! $conn )
+{
+    echo( "Error: could not connect during SKIPIF!" );
+}
+else if(! IsAEQualified($conn))
+{
+    die( "skip - AE feature not supported in the current environment." );
+}
+?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/skipif_not_ksp.inc b/test/functional/sqlsrv/skipif_not_ksp.inc
new file mode 100644
index 00000000..a2c8468d
--- /dev/null
+++ b/test/functional/sqlsrv/skipif_not_ksp.inc
@@ -0,0 +1,23 @@
+<?php
+
+if(! extension_loaded( "sqlsrv" ) ) 
+    die( "skip extension not loaded" );
+
+require_once( 'MsSetup.inc' );
+
+if ($keystore != 'ksp')
+    die ( 'skip - this test requires a custom keystore provider.' );
+
+require_once( 'MsCommon.inc' );
+
+$conn = Connect();
+if( ! $conn )
+{
+    echo( "Error: could not connect during SKIPIF!" );
+}
+else if(! IsAEQualified( $conn ) )
+{
+    die( "skip - AE feature not supported in the current environment." );
+}  
+
+?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
index c686d8e1..86dcb105 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Fetch data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php 
-require('skipif_versions_old.inc'); 
-require('MsSetup.inc');
-if ($keystore != 'ksp')
-    die ( 'skip - this test requires a custom keystore provider.' );
-?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );
diff --git a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
index 8748a88f..24a6644d 100644
--- a/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_encrypted_ksp_encrypted.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Fetch encrypted data from a prepopulated test table given a custom keystore provider
 --SKIPIF--
-<?php 
-require('skipif_versions_old.inc'); 
-require('MsSetup.inc');
-if ($keystore != 'ksp')
-    die ( 'skip - this test requires a custom keystore provider.' );
-?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     sqlsrv_configure( 'WarningsReturnAsErrors', 1 );
diff --git a/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt b/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
index 28673b51..d5ca65d4 100644
--- a/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
+++ b/test/functional/sqlsrv/sqlsrv_encrypted_patients_ksp.phpt
@@ -1,12 +1,7 @@
 --TEST--
 Test simple insert, fetch and update with ColumnEncryption enabled and a custome keystore provider
 --SKIPIF--
-<?php 
-require('skipif_versions_old.inc'); 
-require('MsSetup.inc');
-if ($keystore != 'ksp')
-    die ( 'skip - this test requires a custom keystore provider.' );
-?>
+<?php require('skipif_not_ksp.inc'); ?>
 --FILE--
 <?php
     function CreatePatientsTable()