rearrange test folders as functional

test/functional/pdo_sqlsrv/pdo_002_connect_app.phpt

@@ -1,35 +1,35 @@
---TEST--
-Connection option APP name unicode
---SKIPIF--
-<?php require('skipif.inc'); ?>
---FILE--
-<?php
-require_once("MsSetup.inc");
-
-$appName = "APP_PoP_银河";
-
-// Connect
-$conn = new PDO("sqlsrv:server=$server;APP=$appName","$uid","$pwd");
-
-// Query and Fetch
-$query = "SELECT APP_NAME()";
-
-$stmt = $conn->query($query);
-while ( $row = $stmt->fetch(PDO::FETCH_NUM) ){
-   echo $row[0]."\n";
-}
-
-$stmt = $conn->query($query);
-while ( $row = $stmt->fetch(PDO::FETCH_ASSOC) ){
-   echo $row['']."\n";
-}
-
-// Free the connection
-$conn=null;
-echo "Done"
-?>
-
---EXPECTREGEX--
-APP_PoP_银河
-APP_PoP_银河
-Done
+--TEST--
+Connection option APP name unicode
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--FILE--
+<?php
+require_once("MsSetup.inc");
+
+$appName = "APP_PoP_银河";
+
+// Connect
+$conn = new PDO("sqlsrv:server=$server;APP=$appName","$uid","$pwd");
+
+// Query and Fetch
+$query = "SELECT APP_NAME()";
+
+$stmt = $conn->query($query);
+while ( $row = $stmt->fetch(PDO::FETCH_NUM) ){
+   echo $row[0]."\n";
+}
+
+$stmt = $conn->query($query);
+while ( $row = $stmt->fetch(PDO::FETCH_ASSOC) ){
+   echo $row['']."\n";
+}
+
+// Free the connection
+$conn=null;
+echo "Done"
+?>
+
+--EXPECTREGEX--
+APP_PoP_银河
+APP_PoP_银河
+Done

test/functional/pdo_sqlsrv/pdo_011_quote.phpt

@@ -1,50 +1,50 @@
---TEST--
-Insert with quoted parameters
---SKIPIF--
-<?php require('skipif.inc'); ?>
---FILE--
-<?php
-require_once("MsSetup.inc");
-
-// Connect
-$conn = new PDO( "sqlsrv:server=$server; database=$databaseName", "$uid", "$pwd" );
-
-$param = 'a \' g';
-$param2 = $conn->quote( $param );
-
-// Create a temporary table
-$tableName = '#tmpTable';
-$query = "CREATE TABLE $tableName (col1 VARCHAR(10), col2 VARCHAR(20))";
-$stmt = $conn->exec($query);
-if( $stmt === false ) { die(); }
-
-// Inserd data
-$query = "INSERT INTO $tableName VALUES( ?, '1' )";
-$stmt = $conn->prepare( $query );
-$stmt->execute(array($param));
-
-// Inserd data
-$query = "INSERT INTO $tableName VALUES( ?, ? )";
-$stmt = $conn->prepare( $query );
-$stmt->execute(array($param, $param2));
-
-// Query
-$query = "SELECT * FROM $tableName";
-$stmt = $conn->query($query);
-while ( $row = $stmt->fetch( PDO::FETCH_ASSOC ) ){
-   print_r( $row['col1'] ." was inserted\n" );
-}
-
-// Revert the inserts
-$query = "delete from $tableName where col1 = ?";
-$stmt = $conn->prepare( $query );
-$stmt->execute(array($param));
-
-//free the statement and connection
-$stmt=null;
-$conn=null;
-?>
---EXPECT--
-a ' g was inserted
-a ' g was inserted
-
+--TEST--
+Insert with quoted parameters
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--FILE--
+<?php
+require_once("MsSetup.inc");
+
+// Connect
+$conn = new PDO( "sqlsrv:server=$server; database=$databaseName", "$uid", "$pwd" );
+
+$param = 'a \' g';
+$param2 = $conn->quote( $param );
+
+// Create a temporary table
+$tableName = '#tmpTable';
+$query = "CREATE TABLE $tableName (col1 VARCHAR(10), col2 VARCHAR(20))";
+$stmt = $conn->exec($query);
+if( $stmt === false ) { die(); }
+
+// Inserd data
+$query = "INSERT INTO $tableName VALUES( ?, '1' )";
+$stmt = $conn->prepare( $query );
+$stmt->execute(array($param));
+
+// Inserd data
+$query = "INSERT INTO $tableName VALUES( ?, ? )";
+$stmt = $conn->prepare( $query );
+$stmt->execute(array($param, $param2));
+
+// Query
+$query = "SELECT * FROM $tableName";
+$stmt = $conn->query($query);
+while ( $row = $stmt->fetch( PDO::FETCH_ASSOC ) ){
+   print_r( $row['col1'] ." was inserted\n" );
+}
+
+// Revert the inserts
+$query = "delete from $tableName where col1 = ?";
+$stmt = $conn->prepare( $query );
+$stmt->execute(array($param));
+
+//free the statement and connection
+$stmt=null;
+$conn=null;
+?>
+--EXPECT--
+a ' g was inserted
+a ' g was inserted
+

test/functional/pdo_sqlsrv/pdo_013_row_count.phpt

@@ -1,56 +1,56 @@
---TEST--
-Number of rows in a result set
---SKIPIF--
-<?php require('skipif.inc'); ?>
---FILE--
-<?php
-require_once("MsSetup.inc");
-
-$conn = new PDO( "sqlsrv:server=$server; database=$databaseName", "$uid", "$pwd" );
-
-// Create table
-$tableName = '#tmpTable1';
-$stmt = $conn->exec("CREATE TABLE $tableName (c1 VARCHAR(32))");
-$stmt=null;
-
-// Insert data
-$query = "INSERT INTO $tableName VALUES ('Salmon'),('Butterfish'),('Cod'),('NULL'),('Crab')";
-$stmt = $conn->query($query);
-$res[] = $stmt->rowCount();
-
-// Update data
-$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='Cod'";
-$stmt = $conn->query($query);
-$res[] = $stmt->rowCount();
-
-// Update data
-$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='NULL'";
-$stmt = $conn->query($query);
-$res[] = $stmt->rowCount();
-
-// Update data
-$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='NO_NAME'";
-$stmt = $conn->query($query);
-$res[] = $stmt->rowCount();
-
-// Update data
-$query = "UPDATE $tableName SET c1='N/A'";
-$stmt = $conn->query($query);
-$res[] = $stmt->rowCount();
-
-print_r($res);
-
-$stmt=null;
-$conn=null;
-print "Done"
-?>
---EXPECT--
-Array
-(
-    [0] => 5
-    [1] => 1
-    [2] => 1
-    [3] => 0
-    [4] => 5
-)
-Done
+--TEST--
+Number of rows in a result set
+--SKIPIF--
+<?php require('skipif.inc'); ?>
+--FILE--
+<?php
+require_once("MsSetup.inc");
+
+$conn = new PDO( "sqlsrv:server=$server; database=$databaseName", "$uid", "$pwd" );
+
+// Create table
+$tableName = '#tmpTable1';
+$stmt = $conn->exec("CREATE TABLE $tableName (c1 VARCHAR(32))");
+$stmt=null;
+
+// Insert data
+$query = "INSERT INTO $tableName VALUES ('Salmon'),('Butterfish'),('Cod'),('NULL'),('Crab')";
+$stmt = $conn->query($query);
+$res[] = $stmt->rowCount();
+
+// Update data
+$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='Cod'";
+$stmt = $conn->query($query);
+$res[] = $stmt->rowCount();
+
+// Update data
+$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='NULL'";
+$stmt = $conn->query($query);
+$res[] = $stmt->rowCount();
+
+// Update data
+$query = "UPDATE $tableName SET c1='Salmon' WHERE c1='NO_NAME'";
+$stmt = $conn->query($query);
+$res[] = $stmt->rowCount();
+
+// Update data
+$query = "UPDATE $tableName SET c1='N/A'";
+$stmt = $conn->query($query);
+$res[] = $stmt->rowCount();
+
+print_r($res);
+
+$stmt=null;
+$conn=null;
+print "Done"
+?>
+--EXPECT--
+Array
+(
+    [0] => 5
+    [1] => 1
+    [2] => 1
+    [3] => 0
+    [4] => 5
+)
+Done