From 0b6565da67b1dbf293cfb27a93b761a5a5219d91 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Wed, 13 Sep 2017 16:50:42 -0700 Subject: [PATCH] escaped the periods as per review comments --- .../pdo_sqlsrv/pdo_connect_encrypted.phpt | 8 +++--- .../pdo_connect_encrypted_ksp_errors.phpt | 26 +++++++++---------- .../pdo_sqlsrv/pdo_query_timeout.phpt | 2 +- .../sqlsrv/sqlsrv_complex_query.phpt | 6 ++--- .../srv_050_error_conversion_varchar_int.phpt | 4 +-- .../srv_051_error_conversion_nchar.phpt | 4 +-- .../srv_053_mars_disabled_error_checks.phpt | 4 +-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt index 54ac2862..0dfc8edc 100644 --- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt +++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt @@ -60,10 +60,10 @@ Test new connection keyword ColumnEncryption echo "Done\n"; ?> --EXPECTREGEX-- -Connected successfully with ColumnEncryption enabled. -Failed to connect. +Connected successfully with ColumnEncryption enabled\. +Failed to connect\. SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption' -Failed to connect. +Failed to connect\. SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption' -Connected successfully with ColumnEncryption disabled. +Connected successfully with ColumnEncryption disabled\. Done \ No newline at end of file diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt index aad0e3e5..01ceabe5 100644 --- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt +++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt @@ -72,29 +72,29 @@ Connect using a custom keystore provider with some required inputs missing echo "Done\n"; ?> --EXPECTREGEX-- -Connecting... with column encryption -Connected successfully with ColumnEncryption enabled and KSP specified. +Connecting\.\.\. with column encryption +Connected successfully with ColumnEncryption enabled and KSP specified\. -Connecting... with an invalid input to CEKeystoreProvider +Connecting\.\.\. with an invalid input to CEKeystoreProvider Failed to connect. SQLSTATE\[HY024\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid attribute value -Connecting... with an empty path +Connecting\.\.\. with an empty path Failed to connect. -SQLSTATE\[IMSSP\]: Invalid value for loading a custom keystore provider. +SQLSTATE\[IMSSP\]: Invalid value for loading a custom keystore provider\. -Connecting... without a path +Connecting\.\.\. without a path Failed to connect. -SQLSTATE\[IMSSP\]: The path to the custom keystore provider is missing. +SQLSTATE\[IMSSP\]: The path to the custom keystore provider is missing\. -Connecting... without a name +Connecting\.\.\. without a name Failed to connect. -SQLSTATE\[IMSSP\]: The name of the custom keystore provider is missing. +SQLSTATE\[IMSSP\]: The name of the custom keystore provider is missing\. -Connecting... without a key +Connecting\.\.\. without a key Failed to connect. -SQLSTATE\[IMSSP\]: The encryption key for the custom keystore provider is missing. +SQLSTATE\[IMSSP\]: The encryption key for the custom keystore provider is missing\. -Connecting... with all required inputs -Connected successfully with ColumnEncryption enabled and KSP specified. +Connecting\.\.\. with all required inputs +Connected successfully with ColumnEncryption enabled and KSP specified\. Done \ No newline at end of file diff --git a/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt b/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt index 46066109..ade9e96c 100644 --- a/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt +++ b/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt @@ -68,7 +68,7 @@ RunTest(); ?> --EXPECTREGEX-- -Starting test... +Starting test\.\.\. Setting query timeout as an attribute in connection array\(3\) \{ \[0\]=> diff --git a/test/functional/sqlsrv/sqlsrv_complex_query.phpt b/test/functional/sqlsrv/sqlsrv_complex_query.phpt index 3d971068..8f0c90b4 100644 --- a/test/functional/sqlsrv/sqlsrv_complex_query.phpt +++ b/test/functional/sqlsrv/sqlsrv_complex_query.phpt @@ -90,12 +90,12 @@ Repro(); ?> --EXPECTREGEX--  -Test begins... -\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Cannot insert explicit value for identity column in table '.+' when IDENTITY_INSERT is set to OFF. +Test begins\.\.\. +\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Cannot insert explicit value for identity column in table '.+' when IDENTITY_INSERT is set to OFF\. 544 23000 Number of rows inserted: 2 Number of rows fetched: 2 Done -Test "sqlsrv_statement_complex_query" completed successfully. +Test \"sqlsrv_statement_complex_query\" completed successfully\. diff --git a/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt b/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt index 5a0387ce..66661b9f 100644 --- a/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt +++ b/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt @@ -39,7 +39,7 @@ Array \[SQLSTATE\] => 22018 \[1\] => 245 \[code\] => 245 - \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int. - \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int. + \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int\. + \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int\. \) Done \ No newline at end of file diff --git a/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt b/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt index 78c17f8f..2295180f 100644 --- a/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt +++ b/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt @@ -39,7 +39,7 @@ Array \[SQLSTATE\] => 22018 \[1\] => 245 \[code\] => 245 - \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int. - \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int. + \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int\. + \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int\. \) Done diff --git a/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt b/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt index d4853532..34a8d59b 100644 --- a/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt +++ b/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt @@ -41,8 +41,8 @@ Array \[SQLSTATE\] => IMSSP \[1\] => -44 \[code\] => -44 - \[2\] => The connection cannot process this operation because there is a statement with pending results. To make the connection available for other queries, either fetch all results or cancel or free the statement. For more information, see the product documentation about the MultipleActiveResultSets connection option. - \[message\] => The connection cannot process this operation because there is a statement with pending results. To make the connection available for other queries, either fetch all results or cancel or free the statement. For more information, see the product documentation about the MultipleActiveResultSets connection option. + \[2\] => The connection cannot process this operation because there is a statement with pending results\. To make the connection available for other queries, either fetch all results or cancel or free the statement\. For more information, see the product documentation about the MultipleActiveResultSets connection option\. + \[message\] => The connection cannot process this operation because there is a statement with pending results\. To make the connection available for other queries, either fetch all results or cancel or free the statement\. For more information, see the product documentation about the MultipleActiveResultSets connection option\. \) \[1\] => Array