[xdebug-dev] svn: /xdebug/trunk/tests/ bug00421.phpt bug00494.phpt bug00530.phpt bug00538.phpt dbgp/dbgpclient.php

derick Mon, 05 Apr 2010 13:11:02 +0000

Revision: http://svn.xdebug.org/cgi-bin/viewvc.cgi?view=rev&revision=3250&root=xdebug

Log:
- Made the testing framework more robust, and adjusted tests accordingly.

Changed paths:
    U xdebug/trunk/tests/bug00421.phpt
    U xdebug/trunk/tests/bug00494.phpt
    U xdebug/trunk/tests/bug00530.phpt
    U xdebug/trunk/tests/bug00538.phpt
    U xdebug/trunk/tests/dbgp/dbgpclient.php

Modified: xdebug/trunk/tests/bug00421.phpt
===================================================================
--- xdebug/trunk/tests/bug00421.phpt 2010-04-05 13:10:15 UTC (rev 3249)
+++ xdebug/trunk/tests/bug00421.phpt 2010-04-05 13:11:02 UTC (rev 3250)
@@ -43,9 +43,9 @@

 dbgpRun( str_replace( 'FILE', "\"$file\"", $data ), $commands );
 ?>
---EXPECTF--
+--EXPECT--
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="%d" idekey="derick"><engine version="%s"><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="" idekey=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>

 -> step_into -i 1
 <?xml version="1.0" encoding="iso-8859-1"?>

Modified: xdebug/trunk/tests/bug00494.phpt
===================================================================
--- xdebug/trunk/tests/bug00494.phpt 2010-04-05 13:10:15 UTC (rev 3249)
+++ xdebug/trunk/tests/bug00494.phpt 2010-04-05 13:11:02 UTC (rev 3250)
@@ -34,9 +34,9 @@

 dbgpRun( $data, $commands );
 ?>
---EXPECTF--
+--EXPECT--
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="%d" idekey="%s"><engine version="%s"><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="" idekey=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>

 -> step_into -i 1
 <?xml version="1.0" encoding="iso-8859-1"?>

Modified: xdebug/trunk/tests/bug00530.phpt
===================================================================
--- xdebug/trunk/tests/bug00530.phpt 2010-04-05 13:10:15 UTC (rev 3249)
+++ xdebug/trunk/tests/bug00530.phpt 2010-04-05 13:11:02 UTC (rev 3250)
@@ -42,9 +42,9 @@

 dbgpRun( $data, $commands );
 ?>
---EXPECTF--
+--EXPECT--
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="%d" idekey="derick"><engine version="%s"><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-%d by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="" idekey=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>

 -> step_into -i 1
 <?xml version="1.0" encoding="iso-8859-1"?>

Modified: xdebug/trunk/tests/bug00538.phpt
===================================================================
--- xdebug/trunk/tests/bug00538.phpt 2010-04-05 13:10:15 UTC (rev 3249)
+++ xdebug/trunk/tests/bug00538.phpt 2010-04-05 13:11:02 UTC (rev 3250)
@@ -31,9 +31,9 @@

 dbgpRun( $data, $commands );
 ?>
---EXPECTF--
+--EXPECT--
 <?xml version="1.0" encoding="iso-8859-1"?>
-<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="%d" idekey="derick"><engine version="%s"><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="http://xdebug.org/dbgp/xdebug" fileuri="file:///tmp/xdebug-dbgp-test.php" language="PHP" protocol_version="1.0" appid="" idekey=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[http://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2010 by Derick Rethans]]></copyright></init>

 -> step_into -i 1
 <?xml version="1.0" encoding="iso-8859-1"?>

Modified: xdebug/trunk/tests/dbgp/dbgpclient.php
===================================================================
--- xdebug/trunk/tests/dbgp/dbgpclient.php 2010-04-05 13:10:15 UTC (rev 3249)
+++ xdebug/trunk/tests/dbgp/dbgpclient.php 2010-04-05 13:11:02 UTC (rev 3250)
@@ -27,7 +27,9 @@
                 $read = trim( fread( $conn, 10240 ) );

                 // sanitize
- $read = preg_replace( '@\s(id|address)="\d+?"@', ' \\1=""', $read );
+ $read = preg_replace( '@\s(appid|id|address)="\d+?"@', ' \\1=""', $read );
+ $read = preg_replace( '@\s(idekey)="[^"]+?"@', ' \\1=""', $read );
+ $read = preg_replace( '@(engine\sversion)="[^"]+?"@', '\\1=""', $read );
                 $parts = explode( "\0", $read, 2 );
                 echo $parts[1], "\n\n";
         }
Received on Mon Apr 05 2010 - 14:11:02 BST