sixd Fri, 05 Aug 2011 22:18:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314347
Log:
Improve test portabilty
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37220.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug37220.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt
U php/php-src/trunk/ext/oci8/tests/bug37220.phpt
U php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37220.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37220.phpt 2011-08-05
22:18:42 UTC (rev 314346)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug37220.phpt 2011-08-05
22:18:50 UTC (rev 314347)
@@ -43,7 +43,7 @@
while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
foreach ($row as $item) {
- echo $item."\n";
+ echo trim($item)."\n";
}
echo "\n";
}
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt 2011-08-05
22:18:42 UTC (rev 314346)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/xmltype_02.phpt 2011-08-05
22:18:50 UTC (rev 314347)
@@ -164,18 +164,18 @@
string(2) "10"
}
Test 3: Update changes using a temporary CLOB
-string(331) "<?xml version="1.0"?>
+string(%d) "<?xml version="1.0"?>
<Warehouse>
-<WarehouseId>1</WarehouseId>
-<WarehouseName>Southlake, Texas</WarehouseName>
-<Building>Owned</Building>
-<Area>25000</Area>
-<Docks>1</Docks>
-<DockType>Rear load</DockType>
-<WaterAccess>true</WaterAccess>
-<RailAccess>N</RailAccess>
-<Parking>Street</Parking>
-<VClearance>10</VClearance>
+%sWarehouseId>1</WarehouseId>
+%sWarehouseName>Southlake, Texas</WarehouseName>
+%sBuilding>Owned</Building>
+%sArea>25000</Area>
+%sDocks>1</Docks>
+%sDockType>Rear load</DockType>
+%sWaterAccess>true</WaterAccess>
+%sRailAccess>N</RailAccess>
+%sParking>Street</Parking>
+%sVClearance>10</VClearance>
</Warehouse>
"
===DONE===
\ No newline at end of file
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug37220.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug37220.phpt 2011-08-05
22:18:42 UTC (rev 314346)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug37220.phpt 2011-08-05
22:18:50 UTC (rev 314347)
@@ -43,7 +43,7 @@
while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
foreach ($row as $item) {
- echo $item."\n";
+ echo trim($item)."\n";
}
echo "\n";
}
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt 2011-08-05
22:18:42 UTC (rev 314346)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/xmltype_02.phpt 2011-08-05
22:18:50 UTC (rev 314347)
@@ -164,18 +164,18 @@
string(2) "10"
}
Test 3: Update changes using a temporary CLOB
-string(331) "<?xml version="1.0"?>
+string(%d) "<?xml version="1.0"?>
<Warehouse>
-<WarehouseId>1</WarehouseId>
-<WarehouseName>Southlake, Texas</WarehouseName>
-<Building>Owned</Building>
-<Area>25000</Area>
-<Docks>1</Docks>
-<DockType>Rear load</DockType>
-<WaterAccess>true</WaterAccess>
-<RailAccess>N</RailAccess>
-<Parking>Street</Parking>
-<VClearance>10</VClearance>
+%sWarehouseId>1</WarehouseId>
+%sWarehouseName>Southlake, Texas</WarehouseName>
+%sBuilding>Owned</Building>
+%sArea>25000</Area>
+%sDocks>1</Docks>
+%sDockType>Rear load</DockType>
+%sWaterAccess>true</WaterAccess>
+%sRailAccess>N</RailAccess>
+%sParking>Street</Parking>
+%sVClearance>10</VClearance>
</Warehouse>
"
===DONE===
\ No newline at end of file
Modified: php/php-src/trunk/ext/oci8/tests/bug37220.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/bug37220.phpt 2011-08-05 22:18:42 UTC
(rev 314346)
+++ php/php-src/trunk/ext/oci8/tests/bug37220.phpt 2011-08-05 22:18:50 UTC
(rev 314347)
@@ -43,7 +43,7 @@
while ($row = oci_fetch_array($stmt, OCI_ASSOC+OCI_RETURN_NULLS)) {
foreach ($row as $item) {
- echo $item."\n";
+ echo trim($item)."\n";
}
echo "\n";
}
Modified: php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt 2011-08-05 22:18:42 UTC
(rev 314346)
+++ php/php-src/trunk/ext/oci8/tests/xmltype_02.phpt 2011-08-05 22:18:50 UTC
(rev 314347)
@@ -164,18 +164,18 @@
string(2) "10"
}
Test 3: Update changes using a temporary CLOB
-string(331) "<?xml version="1.0"?>
+string(%d) "<?xml version="1.0"?>
<Warehouse>
-<WarehouseId>1</WarehouseId>
-<WarehouseName>Southlake, Texas</WarehouseName>
-<Building>Owned</Building>
-<Area>25000</Area>
-<Docks>1</Docks>
-<DockType>Rear load</DockType>
-<WaterAccess>true</WaterAccess>
-<RailAccess>N</RailAccess>
-<Parking>Street</Parking>
-<VClearance>10</VClearance>
+%sWarehouseId>1</WarehouseId>
+%sWarehouseName>Southlake, Texas</WarehouseName>
+%sBuilding>Owned</Building>
+%sArea>25000</Area>
+%sDocks>1</Docks>
+%sDockType>Rear load</DockType>
+%sWaterAccess>true</WaterAccess>
+%sRailAccess>N</RailAccess>
+%sParking>Street</Parking>
+%sVClearance>10</VClearance>
</Warehouse>
"
===DONE===
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
