From adb9c195f5bec4b5629a31840d8abf63413abbe9 Mon Sep 17 00:00:00 2001 From: Raghubansh Kumar Date: Sat, 15 Sep 2007 07:32:16 +0000 Subject: [PATCH] better output matching/fixes --- ext/standard/tests/strings/strncmp_basic.phpt | 64 ++- .../tests/strings/strncmp_variation1.phpt | 438 +++++++++--------- .../tests/strings/strncmp_variation2.phpt | 122 ++--- .../tests/strings/strncmp_variation3.phpt | 70 +-- .../tests/strings/strncmp_variation8.phpt | 84 ++-- 5 files changed, 405 insertions(+), 373 deletions(-) diff --git a/ext/standard/tests/strings/strncmp_basic.phpt b/ext/standard/tests/strings/strncmp_basic.phpt index fc95a63e3c..62f5a050be 100644 --- a/ext/standard/tests/strings/strncmp_basic.phpt +++ b/ext/standard/tests/strings/strncmp_basic.phpt @@ -7,23 +7,55 @@ Test strncmp() function : basic functionality * Source code: Zend/zend_builtin_functions.c */ -/* Test strncmp() function with all three arguments */ +echo "*** Testing strncmp() function: basic functionality ***\n"; -echo "*** Test strncmp() function: basic functionality ***\n"; +echo "-- Testing strncmp() with single quoted string --\n"; +var_dump( strncmp('Hello', 'Hello', 5) ); //expected: int(0) +var_dump( strncmp('Hello', 'Hi', 5) ); //expected: value < 0 +var_dump( strncmp('Hi', 'Hello', 5) ); //expected: value > 0 + +echo "-- Testing strncmp() with double quoted string --\n"; var_dump( strncmp("Hello", "Hello", 5) ); //expected: int(0) -var_dump( strncmp("Hello", "Hi", 5) ); //expected: int(-1) -var_dump( strncmp("Hi", "Hello", 5) ); //expected: int(1) +var_dump( strncmp("Hello", "Hi", 5) ); //expected: value < 0 +var_dump( strncmp("Hi", "Hello", 5) ); //expected: value > 0 + +echo "-- Testing strncmp() with here-doc string --\n"; +$str = << 0 + echo "*** Done ***"; ?> ---EXPECTF-- -*** Test strncmp() function: basic functionality *** -int(0) -int(-1) -int(1) -*** Done *** ---UEXPECTF-- -*** Test strncmp() function: basic functionality *** -int(0) -int(-1) -int(1) -*** Done *** +--EXPECTREGEX-- +\*\*\* Testing strncmp\(\) function: basic functionality \*\*\* +-- Testing strncmp\(\) with single quoted string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +-- Testing strncmp\(\) with double quoted string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +-- Testing strncmp\(\) with here-doc string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +\*\*\* Done \*\*\* +--UEXPECTREGEX-- +\*\*\* Testing strncmp\(\) function: basic functionality \*\*\* +-- Testing strncmp\(\) with single quoted string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +-- Testing strncmp\(\) with double quoted string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +-- Testing strncmp\(\) with here-doc string -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +\*\*\* Done \*\*\* diff --git a/ext/standard/tests/strings/strncmp_variation1.phpt b/ext/standard/tests/strings/strncmp_variation1.phpt index 1afce09c5c..8927acb705 100644 --- a/ext/standard/tests/strings/strncmp_variation1.phpt +++ b/ext/standard/tests/strings/strncmp_variation1.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function: usage variations - different inputs(alphabet characters) +Test strncmp() function: usage variations - case-sensitivity --FILE-- ---EXPECTF-- -*** Test strncmp() function: with chars *** +--EXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with alphabets \*\*\* -- Passing upper-case letters for 'str1' -- -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) -- Passing lower-case letters for 'str1' -- -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -*** Done *** ---UEXPECTF-- -*** Test strncmp() function: with chars *** +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +\*\*\* Done \*\*\* +--UEXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with alphabets \*\*\* -- Passing upper-case letters for 'str1' -- -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) -int(0) -int(-1) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) -- Passing lower-case letters for 'str1' -- -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -int(0) -int(1) -*** Done *** +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +\*\*\* Done \*\*\* diff --git a/ext/standard/tests/strings/strncmp_variation2.phpt b/ext/standard/tests/strings/strncmp_variation2.phpt index a747617802..601924db1b 100644 --- a/ext/standard/tests/strings/strncmp_variation2.phpt +++ b/ext/standard/tests/strings/strncmp_variation2.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function: usage variations - different inputs(double quoted strings) +Test strncmp() function: usage variations - double quoted strings --FILE-- ---EXPECTF-- -*** Test strncmp() function: with different input strings *** --- Iteration 1 -- -int(0) -int(-1) -int(1) -int(-1) -int(1) +--EXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with double quoted strings \*\*\* +-- Iteration [1-9][0-9]* -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 2 -- -int(1) -int(0) -int(1) -int(1) -int(1) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 3 -- -int(-1) -int(-1) -int(0) -int(-1) -int(-1) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) -- Iteration 4 -- -int(1) -int(-1) -int(1) -int(0) -int(1) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) -- Iteration 5 -- -int(-1) -int(-1) -int(1) -int(-1) -int(0) -*** Done *** ---UEXPECTF-- -*** Test strncmp() function: with different input strings *** --- Iteration 1 -- -int(0) -int(-1) -int(1) -int(-1) -int(1) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +\*\*\* Done \*\*\* +--UEXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with double quoted strings \*\*\* +-- Iteration [1-9][0-9]* -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 2 -- -int(1) -int(0) -int(1) -int(1) -int(1) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 3 -- -int(-1) -int(-1) -int(0) -int(-1) -int(-1) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) -- Iteration 4 -- -int(1) -int(-1) -int(1) -int(0) -int(1) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) -- Iteration 5 -- -int(-1) -int(-1) -int(1) -int(-1) -int(0) -*** Done *** +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +\*\*\* Done \*\*\* diff --git a/ext/standard/tests/strings/strncmp_variation3.phpt b/ext/standard/tests/strings/strncmp_variation3.phpt index d834c77ad2..beec322f5a 100644 --- a/ext/standard/tests/strings/strncmp_variation3.phpt +++ b/ext/standard/tests/strings/strncmp_variation3.phpt @@ -7,7 +7,7 @@ Test strncmp() function: usage variations - different lengths * Source code: Zend/zend_builtin_functions.c */ -/* Test strncmp() with various nteger length values including zero and considering case sensitive */ +/* Test strncmp() with various lengths including zero and considering case sensitivity */ echo "*** Test strncmp() function: with different lengths ***\n"; /* definitions of required variables */ @@ -20,37 +20,37 @@ for($len = strlen($str1); $len >= 0; $len--) { } echo "*** Done ***\n"; ?> ---EXPECTF-- -*** Test strncmp() function: with different lengths *** -int(-1) -int(-1) -int(-1) -int(-1) -int(-1) -int(-1) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -*** Done *** ---UEXPECTF-- -*** Test strncmp() function: with different lengths *** -int(-1) -int(-1) -int(-1) -int(-1) -int(-1) -int(-1) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -int(0) -*** Done *** +--EXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with different lengths \*\*\* +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +\*\*\* Done \*\*\* +--UEXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with different lengths \*\*\* +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +int\(0\) +\*\*\* Done \*\*\* diff --git a/ext/standard/tests/strings/strncmp_variation8.phpt b/ext/standard/tests/strings/strncmp_variation8.phpt index c592c424fc..3159ee0913 100644 --- a/ext/standard/tests/strings/strncmp_variation8.phpt +++ b/ext/standard/tests/strings/strncmp_variation8.phpt @@ -1,5 +1,5 @@ --TEST-- -Test strncmp() function: usage variations - different inputs(single quoted strings) +Test strncmp() function: usage variations - single quoted strings --FILE-- ---EXPECTF-- -*** Test strncmp() function: with different input strings *** --- Iteration 1 -- -int(0) -int(-1) -int(1) -int(-1) +--EXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with different input strings \*\*\* +-- Iteration [1-9][0-9]* -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) -- Iteration 2 -- -int(1) -int(0) -int(1) -int(1) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 3 -- -int(-1) -int(-1) -int(0) -int(-1) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) -- Iteration 4 -- -int(2) -int(-1) -int(1) -int(0) -*** Done *** ---UEXPECTF-- -*** Test strncmp() function: with different input strings *** --- Iteration 1 -- -int(0) -int(-1) -int(1) -int(-1) +int\(2\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(0\) +\*\*\* Done \*\*\* +--UEXPECTREGEX-- +\*\*\* Test strncmp\(\) function: with different input strings \*\*\* +-- Iteration [1-9][0-9]* -- +int\(0\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) -- Iteration 2 -- -int(1) -int(0) -int(1) -int(1) +int\([1-9][0-9]*\) +int\(0\) +int\([1-9][0-9]*\) +int\([1-9][0-9]*\) -- Iteration 3 -- -int(-1) -int(-1) -int(0) -int(-1) +int\(-[1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\(0\) +int\(-[1-9][0-9]*\) -- Iteration 4 -- -int(1) -int(-1) -int(1) -int(0) -*** Done *** +int\([1-9][0-9]*\) +int\(-[1-9][0-9]*\) +int\([1-9][0-9]*\) +int\(0\) +\*\*\* Done \*\*\* -- 2.50.1