Item11479: skip rather than expect_failure

git-svn-id: http://svn.foswiki.org/trunk@13854 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 29, 2012 · 944c324 · 944c324
1 parent 16986b8
commit 944c324
Show file tree

Hide file tree

Showing 10 changed files with 217 additions and 135 deletions.
diff --git a/UnitTestContrib/test/unit/AddToHeadTests.pm b/UnitTestContrib/test/unit/AddToHeadTests.pm
@@ -15,6 +15,14 @@ sub new {
     return $self;
 }
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->check_dependency('Foswiki,>=,1.1')
+      ? 'Feature removed from Foswiki 1.1+'
+      : undef;
+}
+
 sub set_up {
     my $this = shift;
     $this->SUPER::set_up();

diff --git a/UnitTestContrib/test/unit/AddressTests.pm b/UnitTestContrib/test/unit/AddressTests.pm
@@ -256,6 +256,14 @@ sub new {
     return $this;
 }
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->check_dependency('Foswiki,<,1.2')
+      ? 'Foswiki 1.1 has no Foswiki::Address'
+      : undef;
+}
+
 sub set_up {
     my ($this) = @_;
 
@@ -355,8 +363,6 @@ HERE
 sub test_roundtrips {
     my ($this) = @_;
 
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     $this->gendata( \%test_roundtrip_range );
     my %test_range = $this->gen_roundtrip_range_tests( \%test_roundtrip_range );
 
@@ -391,8 +397,6 @@ sub gen_testspec_fns {
 
         no strict 'refs';
         *{$fn} = sub {
-            $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-                with_dep => 'Foswiki,<,1.2' );
             my $addrObj = Foswiki::Address->new( %{ $test->{atoms} } );
             my $parsedaddrObj =
               Foswiki::Address->new( string => $test->{string} );
@@ -512,8 +516,6 @@ sub _newAddrTestingWebpathParam {
 
 sub test_meta1 {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web     => "$test_web/SubWeb",
         topic   => 'Topic',
@@ -535,8 +537,6 @@ sub test_meta1 {
 
 sub test_meta2 {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web     => "$test_web/SubWeb",
         topic   => 'Topic',
@@ -567,8 +567,6 @@ sub test_meta2 {
 
 sub test_meta3 {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web     => "$test_web/SubWeb",
         topic   => 'Topic',
@@ -591,8 +589,6 @@ sub test_meta3 {
 
 sub test_meta4 {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web     => "$test_web/SubWeb",
         topic   => 'Topic',
@@ -615,8 +611,6 @@ sub test_meta4 {
 
 sub test_chain_new_web {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addrObj = Foswiki::Address->new( web => 'Main', topic => 'WebHome' );
     my $web = Foswiki::Address->new( web => 'Main', topic => 'WebHome' )->web();
 
@@ -662,8 +656,6 @@ sub test_timing_normaliseWebTopicName_default {
 
 sub test_timing_normaliseWebTopicName_equiv {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addr;
     my $benchmark = timeit(
         10000,
@@ -682,8 +674,6 @@ sub test_timing_normaliseWebTopicName_equiv {
 
 sub test_timing_normaliseWebTopicName_equiv_default {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addr;
     my $benchmark = timeit(
         10000,
@@ -703,8 +693,6 @@ sub test_timing_normaliseWebTopicName_equiv_default {
 
 sub test_timing_creation {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addr;
     my $benchmark = timeit(
         100000,
@@ -745,8 +733,6 @@ sub test_timing_hashref_creation {
 
 sub test_timing_reparse_default {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addr =
       Foswiki::Address->new( topic => 'Topic', webpath => [qw(Web SubWeb)] );
     my $benchmark = timeit(
@@ -767,8 +753,6 @@ sub test_timing_reparse_default {
 
 sub test_timing_reparse {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my $addr =
       Foswiki::Address->new( topic => 'Topic', webpath => [qw(Web SubWeb)] );
     my $benchmark = timeit(
@@ -799,8 +783,6 @@ sub test_timing_reparse {
 
 sub test_attachment_constructor_tompath {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web     => "$test_web/SubWeb",
         topic   => 'Topic',
@@ -822,8 +804,6 @@ sub test_attachment_constructor_tompath {
 
 sub test_attachment_constructor {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web        => "$test_web/SubWeb",
         topic      => 'Topic',
@@ -845,8 +825,6 @@ sub test_attachment_constructor {
 
 sub test_attachment_getsetters {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor = (
         web   => "$test_web/SubWeb",
         topic => 'Topic',
@@ -875,8 +853,6 @@ sub test_attachment_getsetters {
 
 sub test_root {
     my ($this) = @_;
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Address',
-        with_dep => 'Foswiki,<,1.2' );
     my %constructor   = ( root => 1 );
     my $addrObj       = Foswiki::Address->new(%constructor);
     my $parsedaddrObj = Foswiki::Address->new( string => "/" );

diff --git a/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm b/UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm
@@ -8,7 +8,6 @@ use FoswikiFnTestCase();
 our @ISA = qw( FoswikiFnTestCase );
 
 use Foswiki          ();
-use Foswiki::Address ();
 use Foswiki::Meta    ();
 use Foswiki::Plugins ();
 use Foswiki::Configure::Dependency();
@@ -54,6 +53,14 @@ my $MrOrange;
 my $MrGreen;
 my $MrYellow;
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->check_dependency('Foswiki,<,1.2')
+      ? 'Foswiki 1.1 has no Foswiki::Access'
+      : undef;
+}
+
 sub set_up {
     my $this = shift;
     $this->SUPER::set_up();
@@ -82,8 +89,6 @@ sub set_up {
 THIS
     $topicObject->save();
     $topicObject->finish();
-    $this->expect_failure( 'Foswiki 1.1 has no Foswiki::Access',
-        with_dep => 'Foswiki,<,1.2' );
 
     return;
 }

diff --git a/UnitTestContrib/test/unit/ConfigureTests.pm b/UnitTestContrib/test/unit/ConfigureTests.pm
@@ -18,6 +18,28 @@ use Foswiki::Configure::Valuer         ();
 use Foswiki::Configure::UI             ();
 use Foswiki::Configure::GlobalControls ();
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->SUPER::skip_test_if(
+        $test,
+        {
+            condition => { without_dep => 'Archive::Tar' },
+            tests     => {
+                'ConfigureTests::test_Util_createArchive_perlTar' =>
+                  'Missing Archive::Tar'
+            }
+        },
+        {
+            condition => { without_dep => 'Archive::Zip' },
+            tests     => {
+                'ConfigureTests::test_Util_createArchive_perlZip' =>
+                  'Missing Archive::Zip'
+            }
+        }
+    );
+}
+
 sub set_up {
     my $this = shift;
     $this->SUPER::set_up();
@@ -1744,12 +1766,12 @@ sub test_Util_createArchive_perlTar {
     mkpath("$tempdir/$extbkup");
     _makePackage( "$tempdir/$extbkup", $extension );
 
-    eval { require Archive::Tar; 1; } or do {
-        my $mess = $@;
-        $mess =~ s/\(\@INC contains:.*$//s;
-        $this->expect_failure("CANNOT RUN test for tar archive:  $mess");
-        $this->assert(0);
-    };
+    #eval { require Archive::Tar; 1; } or do {
+    #    my $mess = $@;
+    #    $mess =~ s/\(\@INC contains:.*$//s;
+    #    $this->expect_failure("CANNOT RUN test for tar archive:  $mess");
+    #    $this->assert(0);
+    #};
 
     ( $file, $rslt ) =
       Foswiki::Configure::Util::createArchive( "$extbkup", "$tempdir", '0',
@@ -1787,12 +1809,12 @@ sub test_Util_createArchive_perlZip {
     mkpath("$tempdir/$extbkup");
     _makePackage( "$tempdir/$extbkup", $extension );
 
-    eval { require Archive::Zip; 1; } or do {
-        my $mess = $@;
-        $mess =~ s/\(\@INC contains:.*$//s;
-        $this->expect_failure("CANNOT RUN test for zip archive:  $mess");
-        $this->assert(0);
-    };
+    #eval { require Archive::Zip; 1; } or do {
+    #    my $mess = $@;
+    #    $mess =~ s/\(\@INC contains:.*$//s;
+    #    $this->expect_failure("CANNOT RUN test for zip archive:  $mess");
+    #    $this->assert(0);
+    #};
 
     ( $file, $rslt ) =
       Foswiki::Configure::Util::createArchive( "$extbkup", "$tempdir", '0',

diff --git a/UnitTestContrib/test/unit/Fn_SEARCH.pm b/UnitTestContrib/test/unit/Fn_SEARCH.pm
@@ -1661,17 +1661,10 @@ sub verify_formQuery3 {
 sub verify_formQuery4 {
     my $this = shift;
 
-    if (
-            ( $Foswiki::cfg{OS} eq 'WINDOWS' )
-        and ( $Foswiki::cfg{DetailedOS} ne 'cygwin' )
-        and ( $Foswiki::cfg{Store}{SearchAlgorithm} eq
-            'Foswiki::Store::SearchAlgorithms::Forking' )
-      )
-    {
-        $this->expect_failure();
-        $this->annotate(
-            "THIS IS WINDOWS & grep; Test will fail because of Item1072");
-    }
+    $this->expect_failure(
+        "THIS IS WINDOWS & grep; Test will fail because of Item1072",
+        using => [ 'PlatformWindows', 'SearchAlgorithmForking' ]
+    );
 
     $this->set_up_for_queries();
 
@@ -1686,17 +1679,10 @@ sub verify_formQuery4 {
 sub verify_formQuery5 {
     my $this = shift;
 
-    if (
-            ( $Foswiki::cfg{OS} eq 'WINDOWS' )
-        and ( $Foswiki::cfg{DetailedOS} ne 'cygwin' )
-        and ( $Foswiki::cfg{Store}{SearchAlgorithm} eq
-            'Foswiki::Store::SearchAlgorithms::Forking' )
-      )
-    {
-        $this->expect_failure();
-        $this->annotate(
-            "THIS IS WINDOWS & grep; Test will fail because of Item1072");
-    }
+    $this->expect_failure(
+        "THIS IS WINDOWS & grep; Test will fail because of Item1072",
+        using => [ 'PlatformWindows', 'SearchAlgorithmForking' ]
+    );
 
     $this->set_up_for_queries();
 

diff --git a/UnitTestContrib/test/unit/FormattingTests.pm b/UnitTestContrib/test/unit/FormattingTests.pm
@@ -114,6 +114,21 @@ sub new {
     return $self;
 }
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->SUPER::skip_test_if(
+        $test,
+        {
+            condition => { with_dep => 'Foswiki,<,1.2' },
+            tests     => {
+                'FormattingTests::test_lists' =>
+                  'Post-Foswiki 1.1.x TML syntax',
+            }
+        }
+    );
+}
+
 sub set_up {
     my $this = shift;
 
@@ -1311,8 +1326,6 @@ None
    : Sunny
 Pleasant
 ACTUAL
-    $this->expect_failure( 'Post-Foswiki 1.1.x TML syntax',
-        with_dep => 'Foswiki,<,1.2' );
     $this->do_test( $expected, $actual );
 }
 

diff --git a/UnitTestContrib/test/unit/HoistREsTests.pm b/UnitTestContrib/test/unit/HoistREsTests.pm
@@ -11,6 +11,21 @@ use Foswiki::Query::HoistREs;
 use Foswiki::Query::Node;
 use Foswiki::Meta;
 
+sub skip {
+    my ( $this, $test ) = @_;
+
+    return $this->SUPER::skip_test_if(
+        $test,
+        {
+            condition => { with_dep => 'Foswiki,<,1.2' },
+            tests     => {
+                'HoistREsTests::test_hoist_mixed_or' =>
+                  'n-ary query nodes are Foswiki 1.2+ only',
+            }
+        }
+    );
+}
+
 sub set_up {
     my $this = shift;
     $this->SUPER::set_up();
@@ -532,8 +547,6 @@ sub test_hoist_mixed_or {
     my $query       = $queryParser->parse($s);
 
     my $filter = $this->_hoist($query);
-    $this->expect_failure( 'n-ary query nodes are Foswiki 1.2+ only',
-        with_dep => 'Foswiki,<,1.2' );
     $this->assert_num_equals( 0, $this->_getFilterNumElements($filter) );
 }