Author: allison
Date: Tue Jun 12 12:38:01 2007
New Revision: 18959
Modified:
trunk/t/pdd15oo/calling.t
trunk/t/pdd15oo/exception.t
trunk/t/pdd15oo/namespace.t
trunk/t/pdd15oo/object-meths.t
Log:
Port over some changes from the mainline tests to the PDD 15 tests.
Modified: trunk/t/pdd15oo/calling.t
==============================================================================
--- trunk/t/pdd15oo/calling.t (original)
+++ trunk/t/pdd15oo/calling.t Tue Jun 12 12:38:01 2007
@@ -430,7 +430,7 @@
hello 42 again 47.110000
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too few" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too few" );
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -462,7 +462,7 @@
/too many arguments passed/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too many - force
get_params" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too many - force
get_params" );
.macro no_params
get_params '()'
.endm
@@ -479,7 +479,7 @@
/too many arguments passed/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too many" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, too many" );
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -544,7 +544,7 @@
ok
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, optional" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch, optional" );
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -1178,7 +1178,7 @@
1 2 3 2
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "too many args via :flat" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "too many args via :flat" );
.sub _fn1
.param int arg1
.param int arg2
@@ -1212,7 +1212,7 @@
/too many arguments passed \(5\) - 4 params expected/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "too few args via :flat" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "too few args via :flat" );
.sub _fn1
.param int arg1
.param int arg2
@@ -1414,7 +1414,7 @@
.local pmc cl, o
cl = newpdd15class "MyClass"
#o = new "MyClass"
- o = cl.'MyClass'()
+ o = cl.'new'()
$S0 = "key"
$I0 = 3
o[$S0;$I0] = 42
@@ -2022,7 +2022,7 @@
ok
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "named => pos passing" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "named => pos passing" );
.sub main :main
foo( "b" => 10 , "a" => 20)
print "never\n"
@@ -2156,7 +2156,7 @@
ok
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "param .. 'a' => v :named('foo')" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "param .. 'a' => v :named('foo')"
);
.sub main :main
foo( "b" => 10, "a" => 20)
print "never\n"
@@ -2171,7 +2171,7 @@
/Named parameter with more than one name/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "param .. 'a' => v :named('foo')" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "param .. 'a' => v :named('foo')"
);
.sub main :main
foo( "b" => 10, "a" => 20)
print "never\n"
@@ -2202,7 +2202,7 @@
1120
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - missing named" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - missing named" );
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -2222,7 +2222,7 @@
/too few arguments/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - missing named" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - missing named" );
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -2242,7 +2242,7 @@
/too few arguments/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - too many named" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - too many named"
);
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -2262,7 +2262,7 @@
/too many/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - duplicate named" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "argc mismatch - duplicate named"
);
.sub main :main
.include "errors.pasm"
errorson .PARROT_ERRORS_PARAM_COUNT_FLAG
@@ -2365,7 +2365,7 @@
2626
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "unexpected positional arg" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "unexpected positional arg" );
.sub 'main'
'foo'('abc', 'def', 'ghi'=>1)
.end
@@ -2378,7 +2378,7 @@
/positional inside named args at position 2/
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "unexpected positional arg" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "unexpected positional arg" );
.sub 'main'
'foo'('abc', 'def'=>1, 'ghi', 'jkl'=>1)
.end
Modified: trunk/t/pdd15oo/exception.t
==============================================================================
--- trunk/t/pdd15oo/exception.t (original)
+++ trunk/t/pdd15oo/exception.t Tue Jun 12 12:38:01 2007
@@ -146,7 +146,7 @@
something happend
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "throw - no handler" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "throw - no handler" );
new P0, .Exception
set P0["_message"], "something happend"
throw P0
@@ -156,7 +156,7 @@
/something happend/
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "throw - no handler, no message" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "throw - no handler, no message"
);
push_eh _handler
new P0, .Exception
clear_eh
@@ -169,7 +169,7 @@
/No exception handler and no message/
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "throw - no handler, no message" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "throw - no handler, no message"
);
new P0, .Exception
throw P0
print "not reached\n"
@@ -272,7 +272,7 @@
severity 3
OUT
-pasm_output_like( <<'CODE', <<OUT, "die - no handler" );
+pasm_error_output_like( <<'CODE', <<OUT, "die - no handler" );
die 3, 100
print "not reached\n"
end
@@ -332,7 +332,7 @@
ok 2
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "pushmark - pop wrong one" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "pushmark - pop wrong one" );
pushmark 10
print "ok 1\n"
popmark 500
@@ -487,7 +487,7 @@
Outer value
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', 'clear_eh out of context (1)' );
+pir_error_output_like( <<'CODE', <<'OUTPUT', 'clear_eh out of context (1)' );
.sub main :main
pushmark 1
clear_eh
@@ -559,7 +559,7 @@
caught
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "pushaction - throw in main" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "pushaction - throw in main" );
.sub main :main
print "main\n"
.const .Sub at_exit = "exit_handler"
@@ -639,7 +639,7 @@
## Regression test for r14697. This probably won't be needed when PDD23 is
## fully implemented.
-pir_output_like( <<'CODE', <<'OUTPUT', "invoke handler in calling sub" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "invoke handler in calling sub" );
## This tests that error handlers are out of scope when invoked (necessary for
## rethrow) when the error is signalled in another sub.
.sub main :main
Modified: trunk/t/pdd15oo/namespace.t
==============================================================================
--- trunk/t/pdd15oo/namespace.t (original)
+++ trunk/t/pdd15oo/namespace.t Tue Jun 12 12:38:01 2007
@@ -161,7 +161,7 @@
baz
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "find_global Foo::bazz not found" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "find_global Foo::bazz not found"
);
.sub 'main' :main
$P2 = find_global ["Foo"], "bazz"
$P2()
@@ -172,7 +172,7 @@
OUTPUT
# [this used to behave differently from the previous case.]
-pir_output_like( <<'CODE', <<'OUTPUT', "find_global Foo::Bar::bazz not found"
);
+pir_error_output_like( <<'CODE', <<'OUTPUT', "find_global Foo::Bar::bazz not
found" );
.sub 'main' :main
$P2 = find_global ["Foo";"Bar"], "bazz"
$P2()
@@ -236,7 +236,7 @@
baz
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', "func() namespace resolution" );
+pir_error_output_like( <<'CODE', <<'OUTPUT', "func() namespace resolution" );
.sub 'main' :main
print "calling foo\n"
foo()
@@ -684,7 +684,7 @@
EOF
close $S;
-pir_output_like( <<'CODE', <<'OUTPUT', 'export_to() with null destination
throws exception' );
+pir_error_output_like( <<'CODE', <<'OUTPUT', 'export_to() with null
destination throws exception' );
.sub 'test' :main
.local pmc nsa, nsb, ar
@@ -702,7 +702,7 @@
/^destination namespace not specified\n/
OUTPUT
-pir_output_like(
+pir_error_output_like(
<<'CODE', <<'OUTPUT', 'export_to() with null exports default object set
!!!UNSPECIFIED!!!' );
.sub 'test' :main
.local pmc nsa, nsb, ar
@@ -720,7 +720,7 @@
/^exporting default object set not yet implemented\n/
OUTPUT
-pir_output_like(
+pir_error_output_like(
<<'CODE', <<'OUTPUT', 'export_to() with empty array exports default object
set !!!UNSPECIFIED!!!' );
.sub 'test' :main
.local pmc nsa, nsb, ar
@@ -738,7 +738,7 @@
/^exporting default object set not yet implemented\n/
OUTPUT
-pir_output_like(
+pir_error_output_like(
<<'CODE', <<'OUTPUT', 'export_to() with empty hash exports default object
set !!!UNSPECIFIED!!!' );
.sub 'test' :main
.local pmc nsa, nsb, ar
@@ -802,7 +802,7 @@
b_foo
OUTPUT
-pir_output_like( <<"CODE", <<'OUTPUT', "export_to -- success with hash (and
value)" );
+pir_error_output_like( <<"CODE", <<'OUTPUT', "export_to -- success with hash
(and value)" );
.HLL 'A', ''
.sub main :main
a_foo()
@@ -1650,7 +1650,7 @@
CODE
OUTPUT
-pir_output_like( <<'CODE', <<'OUTPUT', 'overriding find_method()' );
+pir_error_output_like( <<'CODE', <<'OUTPUT', 'overriding find_method()' );
.sub 'main' :main
$P0 = newpdd15class 'Override'
$P1 = new 'Override'
Modified: trunk/t/pdd15oo/object-meths.t
==============================================================================
--- trunk/t/pdd15oo/object-meths.t (original)
+++ trunk/t/pdd15oo/object-meths.t Tue Jun 12 12:38:01 2007
@@ -22,7 +22,7 @@
=cut
-pasm_output_like( <<'CODE', <<'OUTPUT', "callmethod - unknown method" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "callmethod - unknown method" );
newpdd15class P2, "Foo"
set S0, "nada"
callmethodcc P2, S0
@@ -32,7 +32,7 @@
/Method 'nada' not found/
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "callmethod (STR) - unknown method" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "callmethod (STR) - unknown
method" );
newpdd15class P2, "Foo"
set S1, "nada"
callmethod P2, S1, P1
@@ -42,7 +42,7 @@
/Method 'nada' not found/
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "callmethodcc - unknown method" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "callmethodcc - unknown method"
);
newpdd15class P2, "Foo"
set S0, "nada"
callmethodcc P2, S0
@@ -52,7 +52,7 @@
/Method 'nada' not found/
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "callmethodcc (STR) - unknown method"
);
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "callmethodcc (STR) - unknown
method" );
newpdd15class P2, "Foo"
set S1, "nada"
callmethodcc P2, S1
@@ -498,7 +498,7 @@
back
OUTPUT
-pasm_output_like( <<'CODE', <<'OUTPUT', "find_method - unknown method" );
+pasm_error_output_like( <<'CODE', <<'OUTPUT', "find_method - unknown method" );
newpdd15class P2, "Foo"
set S0, "nada"
find_method P0, P2, S0
