From ade886a131cb190a0f541fff0c84f7e0d7357ab4 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Wed, 20 Dec 2017 21:06:07 -0800
Subject: [PATCH] Changed helper methods as per review

---
 test/functional/sqlsrv/MsCommon.inc |  2 --
 test/functional/sqlsrv/MsHelper.inc | 12 ++----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
index 14fe90ee..e01802e1 100644
--- a/test/functional/sqlsrv/MsCommon.inc
+++ b/test/functional/sqlsrv/MsCommon.inc
@@ -98,8 +98,6 @@ function startTest($testName)
  */
 function endTest($testName)
 {
-    // reset the utf-8 flag
-    setUTF8Data(false);
     echo "Test \"$testName\" completed successfully.\n";
 }
 
diff --git a/test/functional/sqlsrv/MsHelper.inc b/test/functional/sqlsrv/MsHelper.inc
index 6792bfe2..f7cecd4d 100644
--- a/test/functional/sqlsrv/MsHelper.inc
+++ b/test/functional/sqlsrv/MsHelper.inc
@@ -331,11 +331,7 @@ function getSeqPlaceholders($num)
 function isColEncrypted()
 {
     global $keystore;
-    if ($keystore === KEYSTORE_NONE) {
-        return false;
-    } else {
-        return true;
-    }
+    return ($keystore !== KEYSTORE_NONE);
 }
 
 /**
@@ -345,11 +341,7 @@ function isColEncrypted()
 function isDataEncrypted()
 {
     global $keystore, $dataEncrypted;
-    if ($keystore === KEYSTORE_NONE || !$dataEncrypted) {
-        return false;
-    } else {
-        return true;
-    }
+    return ($keystore !== KEYSTORE_NONE && $dataEncrypted);
 }
 
 /**