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] 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()