1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## testcases_hardcoding.patch.dpatch by Martin Ferrari <martin.ferrari@gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix for the two testcases which failed because of a hardcoded
## DP: stdout/stderr checking
@DPATCH@
diff -Naur libtest-class-perl-0.11/t/die_before_plan.t libtest-class-perl-0.11-new/t/die_before_plan.t
--- libtest-class-perl-0.11/t/die_before_plan.t 2005-02-19 16:32:33.000000000 -0300
+++ libtest-class-perl-0.11-new/t/die_before_plan.t 2006-04-16 05:13:58.474443044 -0300
@@ -3,10 +3,7 @@
use strict;
use warnings;
use Test;
-use Fcntl;
-use IO::File;
-use Test::Builder;
-use POSIX qw(_exit);
+use Test::Builder::Tester tests => 1;
package Object::Test;
use base 'Test::Class';
@@ -23,29 +20,11 @@
package main;
-my $io = IO::File->new_tmpfile or die "couldn't create tmp file ($!)\n";
-my $Test = Test::Builder->new;
-$Test->output($io);
-$Test->failure_output($io);
-$ENV{TEST_VERBOSE}=0;
-$ENV{HARNESS_ACTIVE}=0;
-Object::Test->runtests;
-
-plan tests => 4;
-
-seek $io, SEEK_SET, 0;
-my $SEP = $^O eq "MSWin32" ? '\\' : '/';
-while (my $actual = <$io>) {
- chomp($actual);
- my $expected=<DATA>; chomp($expected);
- $expected =~ s!/!$SEP!gs;
- ok($actual, $expected);
-};
-
-_exit(0);
+#$ENV{TEST_VERBOSE}=0;
+#$ENV{HARNESS_ACTIVE}=0;
-__DATA__
-1..1
-not ok 1 - setup (for test method 'test') died (died before plan set)
-# Failed test (t/die_before_plan.t at line 32)
-ok 2 - test just here to get setup method run
+test_out("not ok 1 - setup (for test method 'test') died (died before plan set)");
+test_fail(+2);
+test_out("ok 2 - test just here to get setup method run");
+Object::Test->runtests;
+test_test("die before plan");
diff -Naur libtest-class-perl-0.11/t/fail2.t libtest-class-perl-0.11-new/t/fail2.t
--- libtest-class-perl-0.11/t/fail2.t 2005-02-19 16:32:33.000000000 -0300
+++ libtest-class-perl-0.11-new/t/fail2.t 2006-04-16 05:46:28.119145305 -0300
@@ -2,12 +2,8 @@
use strict;
use warnings;
-use Test;
-use Test::Builder;
-use Fcntl;
-use IO::File;
-use POSIX qw(_exit);
-
+use Test::More tests => 2;
+use Test::Builder::Tester;
package Object;
sub new {return(undef)};
@@ -25,38 +21,18 @@
package main;
+#$ENV{TEST_VERBOSE}=0;
+#$ENV{HARNESS_ACTIVE}=0;
-plan tests => 9;
-
-my $io = IO::File->new_tmpfile or die "couldn't create tmp file ($!)\n";
-my $Test = Test::Builder->new;
-$Test->output($io);
-$Test->failure_output($io);
+test_out("not ok 1 - The object isa Object");
+test_out("not ok 2 - cannot create Objects");
+test_fail(-11);
+test_err(qr/#\s+The object isn't defined\n/);
+test_fail(-13);
-$ENV{TEST_VERBOSE}=0;
-$ENV{HARNESS_ACTIVE}=0;
Object::Test->runtests;
END {
- $|=1;
- seek $io, SEEK_SET, 0;
- my $SEP = $^O eq "MSWin32" ? '\\' : '/';
- while (my $actual = <$io>) {
- chomp($actual);
- my $expected=<DATA>; chomp($expected);
- $expected =~ s!/!$SEP!gs;
- ok($actual, $expected);
- };
-
- ok($?, 3);
- _exit(0); # need to stop Test::Builder's $? tweak
-};
-
-__DATA__
-1..3
-not ok 1 - The object isa Object
-# Failed test (t/fail2.t at line 22)
-# The object isn't defined
-not ok 2 - cannot create Objects
-# Failed test (t/fail2.t at line 22)
-not ok 3 - cannot create Objects
-# Failed test (t/fail2.t at line 22)
+ test_test("fail2");
+ is($?, 2, "exit value okay");
+ $?=0;
+}
|
