Avoid file conflicts in XmlWriter tests

diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index e985cbf8a1ac5a7d7abe29dfba2440a5fd22481e..fd2e075e212cec41cc43a524ed3a126b78c24b9d 100644 (file)
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -15,7 +15,7 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index acb244683aafdff8f71bcc945157aa95393c6968..13c7da17bf0e9f946912b3db07b0eeca759d5062 100644 (file)
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '002.xml';
 $xw = xmlwriter_open_memory($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");

diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 02d3c2a74fd29f8b3d5481c897448123ccc8cd2f..f1463c7dfc4ba131a8172dfbd92f5c1d81164b87 100644 (file)
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '003.xml';
 $xw = xmlwriter_open_memory($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");

diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index 686ea047cc7f11856642748f50e3a085b124e66b..73c4642fb306ca804c74876abef97728c7d3ba6a 100644 (file)
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '004.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
@@ -22,7 +22,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 if ($md5_out != $md5_res) {
        echo "failed: $md5_res != $md5_out\n";
 } else {

diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt
index ac9f6a3f8448ee57d302b34f1a55d86580ee38d2..41c86f857d89efaddd8ae7efa19cabdc252fabf2 100644 (file)
--- a/ext/xmlwriter/tests/005-mb.phpt
+++ b/ext/xmlwriter/tests/005-mb.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '私はガラスを食べられます001.xml';
+$doc_dest = '私はガラスを食べられます005.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");

diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index a2d3d1766a0e9af5667e1be2896fb6c2cf3651ad..aca59e4b1fed5c2b63a6eeb91da108eda48c7d9e 100644 (file)
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '005.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_document($xw, '1.0', 'UTF-8');
 xmlwriter_start_element($xw, "tag1");
@@ -23,7 +23,7 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt
index 2f0d65e6817d8a8acfd5feb081934e828d385c08..802dc810324204edcdfd5114b72322905d5a910b 100644 (file)
--- a/ext/xmlwriter/tests/006.phpt
+++ b/ext/xmlwriter/tests/006.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = '006.xml';
 $xw = xmlwriter_open_uri($doc_dest);
 xmlwriter_start_dtd($xw, 'foo', NULL, 'urn:bar');
 xmlwriter_end_dtd($xw);
@@ -19,7 +19,7 @@ xmlwriter_end_element($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 --EXPECT--
 <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>

diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index 7e30b339553492ee6c4f88ac1872c215528f2b31..bd5edf08d8a7028bc01b5991b86fa55dffdd6b0e 100644 (file)
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_001.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8', 'standalonearg');
@@ -16,7 +16,7 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index 6b81855c1d67927838497cc0c3195ed1ffe1000c..ecda7a1b0310feec56f804bffe4bdafdc2f790b1 100644 (file)
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_004.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?>
 <tag1><?PHP echo $a;?></tag1>
 ');
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 if ($md5_out != $md5_res) {
        echo "failed: $md5_res != $md5_out\n";
 } else {

diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index e3250e70e2138d554caa0aae12d88f3ef6a68553..7478ac71ed91e68295f72ae7e522b895bd43900e 100644 (file)
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_005.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDocument('1.0', 'UTF-8');
@@ -23,7 +23,7 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 ===DONE===
 --EXPECT--

diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt
index 4b8e0d9a15649dda83c8df7164b916f3d6460903..4d4abe3fbd051d4c3736f8d11bdfcfab2d2b98e7 100644 (file)
--- a/ext/xmlwriter/tests/OO_006.phpt
+++ b/ext/xmlwriter/tests/OO_006.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip");
 --FILE--
 <?php
 
-$doc_dest = '001.xml';
+$doc_dest = 'OO_006.xml';
 $xw = new XMLWriter();
 $xw->openUri($doc_dest);
 $xw->startDtd('foo', NULL, 'urn:bar');
@@ -20,7 +20,7 @@ $xw->endElement();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unset($xw);
-unlink('001.xml');
+unlink($doc_dest);
 ?>
 --EXPECT--
 <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>