thekid Tue May 22 11:33:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/sybase_ct/tests bug26407.phpt test_fetch_object.phpt test_msghandler.phpt test_unbuffered_query.phpt Log: - Fixed tests on Windows # The tests expected %s/test.inc in warnings and notices, but of course, # on Windows, the directory separator is a backslash. # Made this work in both worlds by testing for %stest.inc http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug26407.phpt?r1=1.2&r2=1.2.4.1&diff_format=u Index: php-src/ext/sybase_ct/tests/bug26407.phpt diff -u php-src/ext/sybase_ct/tests/bug26407.phpt:1.2 php-src/ext/sybase_ct/tests/bug26407.phpt:1.2.4.1 --- php-src/ext/sybase_ct/tests/bug26407.phpt:1.2 Sun Feb 6 12:59:03 2005 +++ php-src/ext/sybase_ct/tests/bug26407.phpt Tue May 22 11:33:36 2007 @@ -6,7 +6,7 @@ <?php /* This file is part of PHP test framework for ext/sybase_ct * - * $Id: bug26407.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $ + * $Id: bug26407.phpt,v 1.2.4.1 2007/05/22 11:33:36 thekid Exp $ */ require('test.inc'); @@ -80,7 +80,7 @@ select "bar" -Notice: sybase_query(): Sybase: Unexpected results, cancelling current in %s/test.inc on line %d +Notice: sybase_query(): Sybase: Unexpected results, cancelling current in %stest.inc on line %d <<< Return: resource array(1) { [0]=> http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_fetch_object.phpt?r1=1.1.6.1&r2=1.1.6.2&diff_format=u Index: php-src/ext/sybase_ct/tests/test_fetch_object.phpt diff -u php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.1 php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.2 --- php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.1 Wed Mar 14 11:44:24 2007 +++ php-src/ext/sybase_ct/tests/test_fetch_object.phpt Tue May 22 11:33:36 2007 @@ -8,7 +8,7 @@ <?php /* This file is part of PHP test framework for ext/sybase_ct * - * $Id: test_fetch_object.phpt,v 1.1.6.1 2007/03/14 11:44:24 thekid Exp $ + * $Id: test_fetch_object.phpt,v 1.1.6.2 2007/05/22 11:33:36 thekid Exp $ */ require('test.inc'); @@ -65,7 +65,7 @@ 'lastchange' => '%s', )) -Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in %s/test_fetch_object.php on line %d +Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in %stest_fetch_object.php on line %d stdClass::__set_state(array( 'id' => 1, 'caption' => 'Hello', http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.2&r2=1.2.6.1&diff_format=u Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2 php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2.6.1 --- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2 Sun Jan 25 20:04:08 2004 +++ php-src/ext/sybase_ct/tests/test_msghandler.phpt Tue May 22 11:33:36 2007 @@ -6,7 +6,7 @@ <?php /* This file is part of PHP test framework for ext/sybase_ct * - * $Id: test_msghandler.phpt,v 1.2 2004/01/25 20:04:08 thekid Exp $ + * $Id: test_msghandler.phpt,v 1.2.6.1 2007/05/22 11:33:36 thekid Exp $ */ require('test.inc'); @@ -26,14 +26,14 @@ ?> --EXPECTF-- Nonexistant: -Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %s/test.inc on line %d +Warning: sybase_set_message_handler(): First argumented is expected to be a valid callback, 'function_does_not_exist' was given in %stest.inc on line %d bool(false) Static method: bool(true) Instance method: bool(true) Lambda function: bool(true) Unset: bool(true) Incorrect type: -Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %s/test.inc on line %d +Warning: sybase_set_message_handler(): First argumented is expected to be either NULL, an array or string, integer given in %stest.inc on line %d bool(false) Function: bool(true) >>> Query: select getdate(NULL) http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt?r1=1.3&r2=1.3.6.1&diff_format=u Index: php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt diff -u php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3 php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3.6.1 --- php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3 Fri May 21 21:01:21 2004 +++ php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt Tue May 22 11:33:36 2007 @@ -6,7 +6,7 @@ <?php /* This file is part of PHP test framework for ext/sybase_ct * - * $Id: test_unbuffered_query.phpt,v 1.3 2004/05/21 21:01:21 thekid Exp $ + * $Id: test_unbuffered_query.phpt,v 1.3.6.1 2007/05/22 11:33:36 thekid Exp $ */ require('test.inc'); @@ -49,7 +49,7 @@ resource(%d) of type (sybase-ct result) resource(%d) of type (Unknown) -Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %s/test_unbuffered_query.php on line %d +Warning: sybase_num_rows(): %d is not a valid Sybase result resource in %stest_unbuffered_query.php on line %d bool(true) resource(%d) of type (sybase-ct result) int(%d)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php