From f6e450b40859b880430eb2b5790659bca83e9281 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 7 Jun 2018 13:54:35 -0700
Subject: [PATCH] For these AKV tests check env despite not AE connected

---
 .../pdo_ae_azure_key_vault_client_secret.phpt     |  2 +-
 .../pdo_ae_azure_key_vault_keywords.phpt          |  2 +-
 .../pdo_ae_azure_key_vault_username_password.phpt |  2 +-
 test/functional/pdo_sqlsrv/skipif_not_akv.inc     | 15 +++++++++++++++
 test/functional/sqlsrv/skipif_not_akv.inc         | 15 +++++++++++++++
 .../sqlsrv_ae_azure_key_vault_client_secret.phpt  |  2 +-
 .../sqlsrv_ae_azure_key_vault_keywords.phpt       |  2 +-
 ...lsrv_ae_azure_key_vault_username_password.phpt |  2 +-
 8 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 test/functional/pdo_sqlsrv/skipif_not_akv.inc
 create mode 100644 test/functional/sqlsrv/skipif_not_akv.inc

diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_client_secret.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_client_secret.phpt
index d523c69b..a3bae521 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_client_secret.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_client_secret.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test client ID/secret credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('pdo_ae_azure_key_vault_common.php');
diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
index 5f0c4068..514bab24 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_keywords.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test connection keywords for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('pdo_ae_azure_key_vault_common.php');
diff --git a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_username_password.phpt b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_username_password.phpt
index 58991906..2165320b 100644
--- a/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_username_password.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_ae_azure_key_vault_username_password.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test username/password credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_mid-refactor.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('pdo_ae_azure_key_vault_common.php');
diff --git a/test/functional/pdo_sqlsrv/skipif_not_akv.inc b/test/functional/pdo_sqlsrv/skipif_not_akv.inc
new file mode 100644
index 00000000..da542447
--- /dev/null
+++ b/test/functional/pdo_sqlsrv/skipif_not_akv.inc
@@ -0,0 +1,15 @@
+<?php
+if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) {
+    die("PDO driver cannot be loaded; skipping test.\n");
+}
+
+require_once("MsSetup.inc");
+require_once("MsCommon_mid-refactor.inc");
+
+$dsn = getDSN($server, null);
+$conn = new PDO($dsn, $uid, $pwd);
+if (! $conn) {
+    echo("Error: could not connect during SKIPIF!");
+} elseif (!isAEQualified($conn)) {
+    die("skip - AE feature not supported in the current environment.");
+}
diff --git a/test/functional/sqlsrv/skipif_not_akv.inc b/test/functional/sqlsrv/skipif_not_akv.inc
new file mode 100644
index 00000000..f56a4522
--- /dev/null
+++ b/test/functional/sqlsrv/skipif_not_akv.inc
@@ -0,0 +1,15 @@
+<?php
+
+if (! extension_loaded("sqlsrv")) {
+    die("skip extension not loaded");
+}
+
+require_once('MsCommon.inc');
+
+$conn = AE\connect();
+if (! $conn) {
+    echo("Error: could not connect during SKIPIF!");
+} elseif (!AE\isQualified($conn)) {
+    die("skip - AE feature not supported in the current environment.");
+}
+?>
\ No newline at end of file
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_client_secret.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_client_secret.phpt
index fd6a1115..0a8b52a8 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_client_secret.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_client_secret.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test client ID/secret credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('sqlsrv_ae_azure_key_vault_common.php');
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
index f7eed244..1547e3c7 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_keywords.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test connection keywords for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('sqlsrv_ae_azure_key_vault_common.php');
diff --git a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_username_password.phpt b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_username_password.phpt
index a2cfff70..6d635657 100644
--- a/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_username_password.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_azure_key_vault_username_password.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test username/password credentials for Azure Key Vault for Always Encrypted.
 --SKIPIF--
-<?php require('skipif_versions_old.inc'); ?>
+<?php require('skipif_not_akv.inc'); ?>
 --FILE--
 <?php
 require_once('sqlsrv_ae_azure_key_vault_common.php');