Changeset 13800

Timestamp:

01/24/12 05:34:25 (4 weeks ago)

Author:

PaulHarvey

Message:

Item11466: unit test showing broken TestRunner

Location:

branches/Release01x01/UnitTestContrib

Files:

• lib/Foswiki/Contrib/UnitTestContrib/MANIFEST (modified) (1 diff)
• test/bin/TestRunner.pl (modified) (6 diffs)
• test/unit/UnitTestContrib/UnitTestContribSuite.pm (modified) (1 diff)
• test/unit/UnitTestContrib/UnitTestContribTests.pm (added)

branches/Release01x01/UnitTestContrib/lib/Foswiki/Contrib/UnitTestContrib/MANIFEST

@@ -99 +99 @@
 test/unit/UnitTestContrib/EavesdropTests.pm 0644
 test/unit/UnitTestContrib/UnitTestContribSuite.pm 0644
+test/unit/UnitTestContrib/UnitTestContribTests.pm 0644
 test/unit/UploadScriptTests.pm 0644
 test/unit/VCMetaTests.pm 0644

branches/Release01x01/UnitTestContrib/test/bin/TestRunner.pl

@@ -1 +1 @@
 #!/usr/bin/perl -w
 # See bottom of file for description
+use strict;
+use warnings;
+require 5.006;
 
-require 5.006;
 use FindBin;
 use Cwd ();
@@ -21 +23 @@
 
 BEGIN {
+    if ( not defined $ENV{FOSWIKI_ASSERTS} or $ENV{FOSWIKI_ASSERTS} eq 'soft' ) {
+        print
+    "exporting FOSWIKI_ASSERTS=1 for extra checking; disable by exporting FOSWIKI_ASSERTS=0\n";
+        $ENV{FOSWIKI_ASSERTS} = 1;
+    }
+
     $Foswiki::cfg{Engine} = 'Foswiki::Engine::CGI';
 
@@ -47 +55 @@
 }
 
-use strict;
-use Foswiki;   # If you take this out then TestRunner.pl will fail on IndigoPerl
+# Item11466: PH commented the below & added require statements where necessary,
+# to avoid compiling Foswiki.pm before FOSWIKI_ASSERTS have been set
+#use Foswiki;   # If you take this out then TestRunner.pl will fail on IndigoPerl
 use Unit::TestRunner;
 
@@ -79 +88 @@
 print STDERR "Options: ", join( ' ', keys %options ), "\n";
 
-if ( not defined $ENV{FOSWIKI_ASSERTS} or $ENV{FOSWIKI_ASSERTS} eq 'soft' ) {
-    print
-"exporting FOSWIKI_ASSERTS=1 for extra checking; disable by exporting FOSWIKI_ASSERTS=0\n";
-    $ENV{FOSWIKI_ASSERTS} = 1;
-}
-
 if ( $ENV{FOSWIKI_ASSERTS} ) {
     print "Assert checking on $ENV{FOSWIKI_ASSERTS}\n";
@@ -94 +97 @@
 if ( $options{-clean} ) {
     require File::Path;
+    require Foswiki;
     my $rmDir = $Foswiki::cfg{DataDir};
     opendir( my $dataDir, $rmDir ) or die "Can't open directory $rmDir: $!";
@@ -114 +118 @@
 
 if ( not $options{-worker} ) {
+    require Foswiki;
     testForFiles( $Foswiki::cfg{DataDir}, '/Temp*' );
     testForFiles( $Foswiki::cfg{PubDir},  '/Temp*' );

branches/Release01x01/UnitTestContrib/test/unit/UnitTestContrib/UnitTestContribSuite.pm

@@ -8 +8 @@
 sub name { 'UnitTestContribSuite' }
 
-sub include_tests { qw(EavesdropTests) }
+sub include_tests { qw(EavesdropTests UnitTestContribTests) }
 
 1;