added skipif old version to tests

test/functional/pdo_sqlsrv/pdo_ae_insert_datetime.phpt

@@ -1,6 +1,6 @@
 --TEST--
 Test for inserting and retrieving encrypted datetime types data
-Binding parameters in PDOstatement::execute
+No PDO::PARAM_ type specified when binding parameters
 --SKIPIF--
 
 --FILE--

test/functional/pdo_sqlsrv/pdo_ae_insert_money.phpt

@@ -1,8 +1,8 @@
 --TEST--
-Test for inserting and retrieving encrypted numeric types data
-Binding parameters in PDOstatement::execute
+Test for inserting and retrieving encrypted money types data
+No PDO::PARAM_ tpe specified when binding parameters
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_numeric.phpt

@@ -1,8 +1,8 @@
 --TEST--
 Test for inserting and retrieving encrypted numeric types data
-Binding parameters in PDOstatement::execute
+No PDO::PARAM_ tpe specified when binding parameters
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_pdoparam_datetime.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted datetime types data
 Use PDOstatement::bindParam with all PDO::PARAM_ types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_pdoparam_money.phpt

@@ -1,8 +1,8 @@
 --TEST--
-Test for inserting and retrieving encrypted numeric types data
+Test for inserting and retrieving encrypted money types data
 Use PDOstatement::bindParam with all PDO::PARAM_ types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_pdoparam_numeric.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted numeric types data
 Use PDOstatement::bindParam with all PDO::PARAM_ types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_pdoparam_string.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted string types data
 Use PDOstatement::bindParam with all PDO::PARAM_ types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_insert_retrieve.phpt

@@ -2,7 +2,7 @@
 Test for inserting encrypted data and retrieving both encrypted and decrypted data
 Retrieving SQL query contains encrypted filter
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsSetup.inc';
@@ -39,7 +39,6 @@ try
         print "$key: $value\n";
     }
     unset( $stmt );
-    unset( $conn );
 }
 catch( PDOException $e )
 {
@@ -47,29 +46,33 @@ catch( PDOException $e )
 }
 
 // for AE only
-echo "\nRetrieving ciphertext data:\n";
+echo "\nChecking ciphertext data:\n";
 if ( $keystore != "none" )
-    {
+{
     try
     {
-        $conn = ae_connect( null, null, true );
+        $conn1 = ae_connect( null, null, true );
         $selectSql = "SELECT SSN, FirstName, LastName, BirthDate FROM $tbname";
-        $stmt = $conn->query( $selectSql );
+        $stmt = $conn1->query( $selectSql );
         $encrypted_row = $stmt->fetch( PDO::FETCH_ASSOC );
         foreach ( $encrypted_row as $key => $value )
         {
-            if ( !ctype_print( $value ))
-                print "Binary array returned for $key\n";
+            if ( ctype_print( $value ))
+                print "Error: expected a binary array for $key\n";
         }
-        //DropTable( $conn, $tbname );
         unset( $stmt );
-        unset( $conn );
+        unset( $conn1 );
     }
     catch( PDOException $e )
     {
         echo $e->getMessage();
     }
 }
+
+DropTable( $conn, $tbname );
+unset( $conn );
+
+echo "Done\n";
 ?>
 --EXPECT--
 Retrieving plaintext data:
@@ -78,8 +81,5 @@ FirstName: Catherine
 LastName: Abel
 BirthDate: 1996-10-19
 
-Retrieving ciphertext data:
-Binary array returned for SSN
-Binary array returned for FirstName
-Binary array returned for LastName
-Binary array returned for BirthDate
+Checking ciphertext data:
+Done

test/functional/pdo_sqlsrv/pdo_ae_insert_retrieve_fixed_size.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted fixed size types data and retrieve both encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsSetup.inc';
@@ -29,7 +29,7 @@ try
     $inputs = array( "TinyIntData" => 255, 
                      "SmallIntData" => 32767, 
                      "IntData" => 2147483647, 
-                     "BigIntData" => 9223372036854774784, 
+                     "BigIntData" => 92233720368547, 
                      "DecimalData" => 79228162514264, 
                      "BitData" => true, 
                      "DateTimeData" => '9999-12-31 23:59:59.997', 
@@ -42,7 +42,6 @@ try
     fetch_all( $conn, $tbname );
 
     unset( $stmt );
-    unset( $conn );
 }
 catch( PDOException $e )
 {
@@ -54,47 +53,41 @@ if ( $keystore != "none" )
 {
     try
     {
-        $conn = ae_connect( null, null, true );
+        $conn1 = ae_connect( null, null, true );
         
-        print "\nEncrypted values:\n";
         $selectSql = "SELECT * FROM $tbname";
-        $stmt = $conn->query( $selectSql );
+        $stmt = $conn1->query( $selectSql );
         $encrypted_row = $stmt->fetch( PDO::FETCH_ASSOC );
         foreach ( $encrypted_row as $key => $value )
         {
-            if ( !ctype_print( $value ))
+            if ( ctype_print( $value ))
             {
-                print "Binary array returned for $key\n";
+                print "Error: expected a binary array for $key\n";
             }
         }
 
-        DropTable( $conn, $tbname );
         unset( $stmt );
-        unset( $conn );
+        unset( $conn1 );
     }
     catch( PDOException $e )
     {
         echo $e->getMessage();
     }
 }
+
+DropTable( $conn, $tbname );
+unset( $conn );
+
+echo "Done\n";
 ?>
 --EXPECT--
 Decrypted values:
 TinyIntData: 255
 SmallIntData: 32767
 IntData: 2147483647
-BigIntData: 9223372036854774784
+BigIntData: 92233720368547
 DecimalData: 79228162514264
 BitData: 1
 DateTimeData: 9999-12-31 23:59:59.997
 DateTime2Data: 9999-12-31 23:59:59.9999999
-
-Encrypted values:
-Binary array returned for TinyIntData
-Binary array returned for SmallIntData
-Binary array returned for IntData
-Binary array returned for BigIntData
-Binary array returned for DecimalData
-Binary array returned for BitData
-Binary array returned for DateTimeData
-Binary array returned for DateTime2Data
+Done

test/functional/pdo_sqlsrv/pdo_ae_insert_retrieve_nvarchar.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted nvarchar data of variable lengths and retrieving encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsSetup.inc';
@@ -38,7 +38,6 @@ try
         }
     }
     unset( $stmt );
-    unset( $conn );
 }
 catch( PDOException $e )
 {
@@ -50,8 +49,8 @@ if ( $keystore != "none" )
 {
     try
     {
-        $conn = connect( null, null, true );
-        $stmt = $conn->query( $selectSql );
+        $conn1 = connect( null, null, true );
+        $stmt = $conn1->query( $selectSql );
         while ( $decrypted_row = $stmt->fetch( PDO::FETCH_ASSOC )) 
         {
             if ( $decrypted_row[ 'CharCount' ] == strlen( $decrypted_row[ get_default_colname( "nvarchar(1000)" ) ] )) 
@@ -62,19 +61,22 @@ if ( $keystore != "none" )
             }
         }
 
-        if ( $testPass ) {
-            echo "Test successfully.\n";
-        }
-
-        DropTable( $conn, $tbname );
         unset( $stmt );
-        unset( $conn );
+        unset( $conn1 );
     }
     catch( PDOException $e )
     {
         echo $e->getMessage();
     }
 }
+
+DropTable( $conn, $tbname );
+unset( $conn );
+
+if ( $testPass ) {
+    echo "Test successfully done.\n";
+}
+
 ?>
 --EXPECT--
-Test successfully.
+Test successfully done.

test/functional/pdo_sqlsrv/pdo_ae_insert_retrieve_varchar.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted varchar data of variable lengths and retrieving encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsSetup.inc';
@@ -38,7 +38,6 @@ try
         }
     }
     unset( $stmt );
-    unset( $conn );
 }
 catch( PDOException $e )
 {
@@ -50,8 +49,8 @@ if ( $keystore != "none" )
 {
     try
     {
-        $conn = connect( null, null, true );
-        $stmt = $conn->query( $selectSql );
+        $conn1 = connect( null, null, true );
+        $stmt = $conn1->query( $selectSql );
         while ( $decrypted_row = $stmt->fetch( PDO::FETCH_ASSOC )) 
         {
             if ( $decrypted_row[ 'CharCount' ] == strlen( $decrypted_row[ get_default_colname( "varchar(1000)" ) ] )) 
@@ -62,19 +61,21 @@ if ( $keystore != "none" )
             }
         }
 
-        if ( $testPass ) {
-            echo "Test successfully.\n";
-        }
-
-        DropTable( $conn, $tbname );
         unset( $stmt );
-        unset( $conn );
+        unset( $conn1 );
     }
     catch( PDOException $e )
     {
         echo $e->getMessage();
     }
 }
+
+DropTable( $conn, $tbname );
+unset( $conn );
+
+if ( $testPass ) {
+    echo "Test successfully done.\n";
+}
 ?>
 --EXPECT--
-Test successfully.
+Test successfully done.

test/functional/pdo_sqlsrv/pdo_ae_insert_string.phpt

@@ -1,8 +1,8 @@
 --TEST--
 Test for inserting and retrieving encrypted string types data
-Binding parameters in PDOstatement::execute
+No PDO::PARAM_ type specified when binding parameters
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/pdo_sqlsrv/pdo_ae_output_param_all.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for binding output params for encrypted data for all types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted datetime types data
 Bind params using sqlsrv_prepare without any sql_type specified
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_money.phpt

@@ -1,8 +1,8 @@
 --TEST--
-Test for inserting and retrieving encrypted numeric types data
+Test for inserting and retrieving encrypted money types data
 Bind params using sqlsrv_prepare without any sql_type specified
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_numeric.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted numeric types data
 Bind params using sqlsrv_prepare without any sql_type specified
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve.phpt

@@ -2,7 +2,7 @@
 Test for inserting encrypted data and retrieving both encrypted and decrypted data
 Retrieving SQL query contains encrypted filter
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';
@@ -44,26 +44,30 @@ foreach ( $decrypted_row as $key => $value )
     }
 }
 sqlsrv_free_stmt( $stmt );
-sqlsrv_close( $conn );
 
 //for AE only
-echo "\nRetrieving ciphertext data:\n";
+echo "\nChecking ciphertext data:\n";
 if ( $keystore != "none" )
 {
-    $conn = ae_connect( null, true );
+    $conn1 = ae_connect( null, true );
     $selectSql = "SELECT SSN, FirstName, LastName, BirthDate FROM $tbname";
-    $stmt = sqlsrv_query( $conn, $selectSql );
+    $stmt = sqlsrv_query( $conn1, $selectSql );
     $encrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC );
     foreach( $encrypted_row as $key => $value )
     {
-        if ( !ctype_print( $value ))
-            print "Binary array returned for $key\n";
+        if ( ctype_print( $value ))
+            print "Error: expected a binary array for $key!\n";
     }
-    DropTable( $conn, $tbname );
+    
     sqlsrv_free_stmt( $stmt );
-    sqlsrv_close( $conn );
+    sqlsrv_close( $conn1 );
 }
 
+DropTable( $conn, $tbname );
+sqlsrv_close( $conn );
+
+echo "Done";
+
 ?>
 --EXPECT--
 Retrieving plaintext data:
@@ -75,8 +79,5 @@ BirthDate:
   timezone_type: 3
   timezone: UTC
 
-Retrieving ciphertext data:
-Binary array returned for SSN
-Binary array returned for FirstName
-Binary array returned for LastName
-Binary array returned for BirthDate
+Checking ciphertext data:
+Done

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted fixed size types data and retrieve both encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';
@@ -27,7 +27,7 @@ create_table( $conn, $tbname, $colMetaArr );
 $inputs = array( "TinyIntData" => 255, 
                  "SmallIntData" => 32767, 
                  "IntData" => 2147483647, 
-                 "BigIntData" => 9223372036854774784, 
+                 "BigIntData" => 92233720368547, 
                  "DecimalData" => 79228162514264, 
                  "BitData" => true, 
                  "DateTimeData" => '9999-12-31 23:59:59.997', 
@@ -38,36 +38,36 @@ print "Decrypted values:\n";
 fetch_all( $conn, $tbname );
 
 sqlsrv_free_stmt( $stmt );
-sqlsrv_close( $conn );
 
 // for AE only
 if ( $keystore != "none" )
 {
-    $conn = connect( null, true );
+    $conn1 = connect( null, true );
    
-    print "\nEncrypted values:\n";
     $selectSql = "SELECT * FROM $tbname";
-    $stmt = sqlsrv_query( $conn, $selectSql );
+    $stmt = sqlsrv_query( $conn1, $selectSql );
     $encrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC );
     foreach( $encrypted_row as $key => $value )
     {
-        if ( !ctype_print( $value ))
-        {
-            print "Binary array returned for $key\n";
-        }
+        if ( ctype_print( $value ))
+            print "Error: expected a binary array for $key!\n";
     }
-
-    DropTable( $conn, $tbname );
     sqlsrv_free_stmt( $stmt );
-    sqlsrv_close( $conn );
+    sqlsrv_close( $conn1 );
 }
+
+DropTable( $conn, $tbname );
+sqlsrv_close( $conn );
+
+echo "Done\n";
+
 ?>
 --EXPECT--
 Decrypted values:
 TinyIntData: 255
 SmallIntData: 32767
 IntData: 2147483647
-BigIntData: 9223372036854774784
+BigIntData: 92233720368547
 DecimalData: 79228162514264
 BitData: 1
 DateTimeData:
@@ -78,13 +78,4 @@ DateTime2Data:
   date: 9999-12-31 23:59:59.1000000
   timezone_type: 3
   timezone: UTC
-
-Encrypted values:
-Binary array returned for TinyIntData
-Binary array returned for SmallIntData
-Binary array returned for IntData
-Binary array returned for BigIntData
-Binary array returned for DecimalData
-Binary array returned for BitData
-Binary array returned for DateTimeData
-Binary array returned for DateTime2Data
+Done

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_nvarchar.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted nvarchar data of variable lengths and retrieving encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';
@@ -36,13 +36,12 @@ while ( $decrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC ))
     }
 }
 sqlsrv_free_stmt( $stmt );
-sqlsrv_close( $conn );
 
 // for AE only
 if ( $keystore != "none" )
 {
-    $conn = ae_connect( null, true );
-    $stmt = sqlsrv_query( $conn, $selectSql );
+    $conn1 = ae_connect( null, true );
+    $stmt = sqlsrv_query( $conn1, $selectSql );
     while ( $encrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC ))
     {
         if ( $encrypted_row[ 'CharCount' ] == strlen( $encrypted_row[ get_default_colname( "nvarchar(1000)" ) ] ))
@@ -52,14 +51,18 @@ if ( $keystore != "none" )
             $testPass = false;
         }
     }
-
-    if ( $testPass ) {
-        echo "Test successfully.\n";
-    }
-    DropTable( $conn, $tbname );
+    
     sqlsrv_free_stmt( $stmt );
-    sqlsrv_close( $conn );
+    sqlsrv_close( $conn1 );
 }
+
+DropTable( $conn, $tbname );
+sqlsrv_close( $conn );
+
+if ( $testPass ) {
+    echo "Test successfully done.\n";
+}
+
 ?>
 --EXPECT--
-Test successfully.
+Test successfully done.

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_varchar.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for inserting encrypted varchar data of variable lengths and retrieving encrypted and decrypted data
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';
@@ -36,13 +36,12 @@ while ( $decrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC ))
     }
 }
 sqlsrv_free_stmt( $stmt );
-sqlsrv_close( $conn );
 
 // for AE only
 if ( $keystore != "none" )
 {
-    $conn = ae_connect( null, true );
-    $stmt = sqlsrv_query( $conn, $selectSql );
+    $conn1 = ae_connect( null, true );
+    $stmt = sqlsrv_query( $conn1, $selectSql );
     while ( $encrypted_row = sqlsrv_fetch_array( $stmt, SQLSRV_FETCH_ASSOC ))
     {
         if ( $encrypted_row[ 'CharCount' ] == strlen( $encrypted_row[ get_default_colname( "varchar(1000)" ) ] ))
@@ -52,14 +51,17 @@ if ( $keystore != "none" )
             $testPass = false;
         }
     }
-
-    if ( $testPass ) {
-        echo "Test successfully.\n";
-    }
-    DropTable( $conn, $tbname );
     sqlsrv_free_stmt( $stmt );
-    sqlsrv_close( $conn );
+    sqlsrv_close( $conn1 );
 }
+
+DropTable( $conn, $tbname );
+sqlsrv_close( $conn );
+
+if ( $testPass ) {
+    echo "Test successfully done.\n";
+}
+
 ?>
 --EXPECT--
-Test successfully.
+Test successfully done.

test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_datetime.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted datetime types data
 Bind params using sqlsrv_prepare with all sql_type
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_money.phpt

@@ -1,8 +1,8 @@
 --TEST--
-Test for inserting and retrieving encrypted numeric types data
+Test for inserting and retrieving encrypted money types data
 Bind params using sqlsrv_prepare with all sql_type
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted numeric types data
 Bind params using sqlsrv_prepare with all sql_type
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_string.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted string types data
 Bind params using sqlsrv_prepare with all sql_type
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_insert_string.phpt

@@ -2,7 +2,7 @@
 Test for inserting and retrieving encrypted string types data
 Bind params using sqlsrv_prepare without any sql_type specified
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_output_param.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for binding output parameter of encrypted values for a sample emplolyee table
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';

test/functional/sqlsrv/sqlsrv_ae_output_param_all.phpt

@@ -1,7 +1,7 @@
 --TEST--
 Test for binding output parameter of encrypted values for all types
 --SKIPIF--
-
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 include 'MsCommon.inc';