From effe4fa01a0adbde942d1372a68ab4ea332ee068 Mon Sep 17 00:00:00 2001
From: CrawfordCurrie <CrawfordCurrie@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Sat, 22 Nov 2008 21:05:26 +0000
Subject: [PATCH] Item175: removed redundant condition from test request and
 response

git-svn-id: http://svn.foswiki.org/trunk@854 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 UnitTestContrib/lib/Unit/Request.pm  | 17 +----------------
 UnitTestContrib/lib/Unit/Response.pm | 24 ++++++------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/UnitTestContrib/lib/Unit/Request.pm b/UnitTestContrib/lib/Unit/Request.pm
index b2f57ccd96..649b890122 100644
--- a/UnitTestContrib/lib/Unit/Request.pm
+++ b/UnitTestContrib/lib/Unit/Request.pm
@@ -1,19 +1,4 @@
 package Unit::Request;
-use strict;
-
-BEGIN {
-    use Foswiki;
-    use CGI;
-    my ($release) = $Foswiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
-    if ( $release >= 2 ) {
-        require Foswiki::Request;
-        import Foswiki::Request;
-        @Unit::Request::ISA = 'Foswiki::Request';
-    }
-    else {
-        @Unit::Request::ISA = 'CGI';
-    }
-}
-
+use base 'Foswiki::Request';
 
 1;
diff --git a/UnitTestContrib/lib/Unit/Response.pm b/UnitTestContrib/lib/Unit/Response.pm
index ddb5581174..026eae90be 100644
--- a/UnitTestContrib/lib/Unit/Response.pm
+++ b/UnitTestContrib/lib/Unit/Response.pm
@@ -1,4 +1,5 @@
 package Unit::Response;
+use base 'Foswiki::Response';
 use strict;
 
 use vars qw($res);
@@ -6,25 +7,12 @@ use vars qw($res);
 BEGIN {
     use Foswiki;
     use CGI;
-    my ($release) = $Foswiki::RELEASE =~ /-(\d+)\.\d+\.\d+/;
     no warnings qw(redefine);
-    if ( $release >= 2 ) {
-        require Foswiki::Response;
-        import Foswiki::Response;
-        @Unit::Response::ISA = qw(Foswiki::Response);
-        my $twiki_new = \&Foswiki::new;
-        *Foswiki::new =
-          sub { my $t = $twiki_new->(@_); $res = $t->{response}; return $t };
-    }
-    else {
-        @Unit::Response::ISA = qw(CGI);
-        *charset = sub { shift; CGI::charset(@_) };
-        my $twiki_new = \&Foswiki::new;
-        *Foswiki::new =
-          sub { my $t = $twiki_new->(@_); $res = $t->{cgiQuery}; return $t };
-    }
-    my $twiki_finish = \&Foswiki::finish;
-    *Foswiki::finish = sub { $twiki_finish->(@_); $res = undef; };
+    my $_new = \&Foswiki::new;
+    *Foswiki::new =
+      sub { my $t = $_new->(@_); $res = $t->{response}; return $t };
+    my $_finish = \&Foswiki::finish;
+    *Foswiki::finish = sub { $_finish->(@_); $res = undef; };
 }
 
 sub new {