Changeset 7219

Timestamp:

04/19/10 17:23:01 (2 years ago)

Author:

MichaelTempest

Message:

Item1326: Report unexpected passes correctly

File:

• trunk/UnitTestContrib/lib/Unit/TestRunner.pm (modified) (4 diffs)

trunk/UnitTestContrib/lib/Unit/TestRunner.pm

@@ -102 +102 @@
                 $action = runOne($tester, $suite, $testToRun);
             }
-            ($action) = $action =~ m/^(.*)$/ms;
+            # untaint action for the case where the test is run in another process
+            ($action) = $action =~ m/^(.*)$/ms; 
+
             eval $action;
             die $@ if $@;
             die "Test suite $suite aborted\n" unless $completed;
         }
-   }
+    }
 
     if ( $this->{unexpected_failures} || $this->{unexpected_passes} ) {
+        $this->{unexpected_failures} ||= 0;
+        $this->{unexpected_passes} ||= 0;
         if ($this->{unexpected_failures}) {
-        print $this->{unexpected_failures} . " failure".
+            print $this->{unexpected_failures} . " failure".
                 ($this->{unexpected_failures}>1?'s':'').
                 "\n";
-            }
+        }
         if ($this->{unexpected_passes}) {
-        print $this->{unexpected_passes} . " unexpected pass".
+            print $this->{unexpected_passes} . " unexpected pass".
                 ($this->{unexpected_passes}>1?'es':'').
                 "\n";
-            }
+        }
         if (($passes + $this->{unexpected_failures}) > 1) {
             #don't print the failure a second time if there is only one test run - its really annoying.
@@ -125 +129 @@
             "\n";
         }
-        $this->{unexpected_failures} ||= 0;
         print "$passes of ", $passes + $this->{unexpected_failures},
           " test cases passed\n";
@@ -280 +283 @@
     }
     foreach my $test (@tests) {
-                #Devel::Leak::Object::checkpoint();
+        #Devel::Leak::Object::checkpoint();
         print "\t$test\n";
+        $action .= "\n# $test\n    ";
         $tester->set_up();
         try {
             $tester->$test();
             $action .= '$passes++;';
+            if ( $tester->{expect_failure} ) {
+                $action .= '$this->{unexpected_passes}++;';
+            }
         }
         catch Error with {
@@ -297 +304 @@
             }
             $action .= 'push( @{ $this->{failures} }, "'
-                     . $test 
-                     . '\n' 
+                     . quotemeta( $test ) 
+                     . '\\n' 
                      . quotemeta( $e->stringify() )
                      . '" );';
-        }
-        otherwise {
-            if ( $tester->{expect_failure} ) {
-                $action .= '$this->{unexpected_passes}++;';
-            }
         };
         $tester->tear_down();