cvs: pear /SOAP_Interop interop_client.php interop_test.php package.xml params_Round2Base.php params_values.php

shane Fri Apr 4 03:36:08 2003 EDT Modified files: /pear/SOAP_Interop interop_client.php interop_test.php package.xml params_Round2Base.php params_values.php Log: some minor test fixes add array with single element test Index: pear/SOAP_Interop/interop_client.php diff -u pear/SOAP_Interop/interop_client.php:1.6 pear/SOAP_Interop/interop_client.php:1.7 --- pear/SOAP_Interop/interop_client.php:1.6 Sat Jan 4 06:56:21 2003 +++ pear/SOAP_Interop/interop_client.php Fri Apr 4 03:36:08 2003 @@ -16,7 +16,7 @@ // | Authors: Shane Caraveo <Shane@Caraveo.com> | // +----------------------------------------------------------------------+ // -// $Id: interop_client.php,v 1.6 2003/01/04 11:56:21 mj Exp $ +// $Id: interop_client.php,v 1.7 2003/04/04 08:36:08 shane Exp $ // require_once 'DB.php'; // PEAR/DB require_once 'SOAP/Client.php'; @@ -301,10 +301,10 @@ // it's the only one that uses this soapaction, and breaks if // it isn't right. Can't wait for soapaction to be fully depricated # 8/25/2002, seems this is fixed now - if ($this->currentTest == 'Round 2 Base' && - strstr($endpoint_info->name,'MS SOAP ToolKit 2.0')) { - $soapaction = 'urn:soapinterop'; - } + #if ($this->currentTest == 'Round 2 Base' && + # strstr($endpoint_info->name,'MS SOAP ToolKit 2.0')) { + # $soapaction = 'urn:soapinterop'; + #} if (!$endpoint_info->client) { $endpoint_info->client = new SOAP_Client($endpoint_info->endpointURL); $endpoint_info->client->_auto_translation = true; @@ -497,7 +497,7 @@ } // if we're looking for a specific method, skip unless we have it - if ($this->testMethod && !strstr($this->testMethod,$soap_test->test_name)) continue; + if ($this->testMethod && strcmp($this->testMethod,$soap_test->test_name)!=0) continue; if ($this->testMethod && $this->currentTest == 'Round 2 Group C') { // we have to figure things out now if (!preg_match('/(.*):(.*),(\d),(\d)/',$this->testMethod, $m)) continue; @@ -536,8 +536,7 @@ if ($this->doEndpointMethod($endpoint_info, $soap_test)) { $this->totals['success']++; } else { - $skipendpoint = $soap_test->result['fault']->faultcode=='HTTP' - && strstr($soap_test->result['fault']->faultstring,'Connect Error'); + $skipendpoint = $soap_test->result['fault']->faultcode=='HTTP'; if ($skipendpoint) $skipfault = $soap_test->result['fault']; else $skipfault = NULL; $this->totals['fail']++; Index: pear/SOAP_Interop/interop_test.php diff -u pear/SOAP_Interop/interop_test.php:1.3 pear/SOAP_Interop/interop_test.php:1.4 --- pear/SOAP_Interop/interop_test.php:1.3 Sat Jan 4 06:56:21 2003 +++ pear/SOAP_Interop/interop_test.php Fri Apr 4 03:36:08 2003 @@ -16,7 +16,7 @@ // | Authors: Shane Caraveo <Shane@Caraveo.com> | // +----------------------------------------------------------------------+ // -// $Id: interop_test.php,v 1.3 2003/01/04 11:56:21 mj Exp $ +// $Id: interop_test.php,v 1.4 2003/04/04 08:36:08 shane Exp $ // require_once 'SOAP/Value.php'; @@ -107,7 +107,7 @@ } else { $fault = $this->result['fault']; if ($fault) { - print "FAILED: {$fault['faultcode']} {$fault['faultstring']}\n"; + print "FAILED: [{$fault->faultcode}] {$fault->faultstring}\n"; } else { print "FAILED: ".$this->result['result']."\n"; } Index: pear/SOAP_Interop/package.xml diff -u pear/SOAP_Interop/package.xml:1.5 pear/SOAP_Interop/package.xml:1.6 --- pear/SOAP_Interop/package.xml:1.5 Thu Mar 13 16:19:47 2003 +++ pear/SOAP_Interop/package.xml Fri Apr 4 03:36:08 2003 @@ -20,10 +20,10 @@ <license>PHP License</license> <release> <state>beta</state> - <version>0.7.1</version> - <date>2002-12-01</date> + <version>0.7.2</version> + <date>2003-04-01</date> <notes> - Minor fixes to make interop suite run without modifications. + Minor fixes over 0.7.1. </notes> <filelist> <dir name="/" baseinstalldir="SOAP/Interop"> @@ -88,6 +88,14 @@ </deps> </release> <changelog> + <release> + <state>beta</state> + <version>0.7.1</version> + <date>2002-12-01</date> + <notes> + Minor fixes to make interop suite run without modifications. + </notes> + </release> <release> <state>beta</state> <version>0.7.0</version> Index: pear/SOAP_Interop/params_Round2Base.php diff -u pear/SOAP_Interop/params_Round2Base.php:1.2 pear/SOAP_Interop/params_Round2Base.php:1.3 --- pear/SOAP_Interop/params_Round2Base.php:1.2 Sat Jan 4 06:56:21 2003 +++ pear/SOAP_Interop/params_Round2Base.php Fri Apr 4 03:36:08 2003 @@ -16,7 +16,7 @@ // | Authors: Shane Caraveo <Shane@Caraveo.com> | // +----------------------------------------------------------------------+ // -// $Id: params_Round2Base.php,v 1.2 2003/01/04 11:56:21 mj Exp $ +// $Id: params_Round2Base.php,v 1.3 2003/04/04 08:36:08 shane Exp $ // require_once 'params_values.php'; require_once 'interop_test.php'; @@ -55,6 +55,10 @@ array('inputStringArray' => &$string_array)); $soap_tests[INTEROP_R2BASE][] = new SOAP_Interop_Test('echoStringArray', array('inputStringArray' => &$string_array_soapval)); +$soap_tests[INTEROP_R2BASE][] = new SOAP_Interop_Test('echoStringArray(one)', + array('inputStringArray' => &$string_array_one)); +$soap_tests[INTEROP_R2BASE][] = new SOAP_Interop_Test('echoStringArray(one)', + array('inputStringArray' => &$string_array_one_soapval)); // null array test $soap_tests[INTEROP_R2BASE][] = new SOAP_Interop_Test('echoStringArray(null)', array('inputStringArray' => &$string_array_null)); Index: pear/SOAP_Interop/params_values.php diff -u pear/SOAP_Interop/params_values.php:1.3 pear/SOAP_Interop/params_values.php:1.4 --- pear/SOAP_Interop/params_values.php:1.3 Sat Jan 4 06:56:21 2003 +++ pear/SOAP_Interop/params_values.php Fri Apr 4 03:36:08 2003 @@ -16,7 +16,7 @@ // | Authors: Shane Caraveo <Shane@Caraveo.com> | // +----------------------------------------------------------------------+ // -// $Id: params_values.php,v 1.3 2003/01/04 11:56:21 mj Exp $ +// $Id: params_values.php,v 1.4 2003/04/04 08:36:08 shane Exp $ // require_once 'SOAP/Value.php'; require_once 'params_classes.php'; @@ -34,6 +34,12 @@ array( #push struct elements into one soap value new SOAP_Value('item','string','good'), new SOAP_Value('item','string','bad') + ) + ); +$string_array_one = array('good'); +$string_array_one_soapval = new SOAP_Value('inputStringArray','Array', + array( #push struct elements into one soap value + new SOAP_Value('item','string','good'), ) ); $string_array_null = NULL;