twiki-dev

[<de...@de...>]

Author: HaraldJoerg
Date: 2017-04-11 21:41:14 +0000 (Tue, 11 Apr 2017)
New Revision: 30329
Trac url: http://develop.twiki.org/trac/changeset/30329

Modified:
   twiki/trunk/UnitTestContrib/test/unit/Fn_INCLUDE.pm
   twiki/trunk/UnitTestContrib/test/unit/FuncTests.pm
   twiki/trunk/UnitTestContrib/test/unit/TemplatesTests.pm
Log:
Item7623: Eliminate non-functional test without LWP

Modified: twiki/trunk/UnitTestContrib/test/unit/Fn_INCLUDE.pm
===================================================================
--- twiki/trunk/UnitTestContrib/test/unit/Fn_INCLUDE.pm	2017-04-10 21:43:37 UTC (rev 30328)
+++ twiki/trunk/UnitTestContrib/test/unit/Fn_INCLUDE.pm	2017-04-11 21:41:14 UTC (rev 30329)
@@ -134,7 +134,7 @@
 Out of scope
 THIS
     my $handledTopicText = $topicText;
-    $handledTopicText =~ s/%(START|END)SECTION{"suction"}%//g;
+    $handledTopicText =~ s/%(START|END)SECTION\{"suction"}%//g;
     
     $this->{twiki}->{store}->saveTopic(
         $this->{twiki}->{user}, $this->{other_web},

Modified: twiki/trunk/UnitTestContrib/test/unit/FuncTests.pm
===================================================================
--- twiki/trunk/UnitTestContrib/test/unit/FuncTests.pm	2017-04-10 21:43:37 UTC (rev 30328)
+++ twiki/trunk/UnitTestContrib/test/unit/FuncTests.pm	2017-04-11 21:41:14 UTC (rev 30329)
@@ -555,17 +555,6 @@
     $this->assert_matches(qr/Welcome to DevelopBranch TWiki/s, $response->content());
     $this->assert(!$response->is_error());
     $this->assert(!$response->is_redirect());
-
-    # Now force the braindead sockets impl
-    $TWiki::Net::LWPAvailable = 0;
-    $response = TWiki::Func::getExternalResource('http://develop.twiki.org');
-    $this->assert_equals(200, $response->code());
-    $this->assert_str_equals('OK', $response->message());
-    $this->assert_str_equals('text/html; charset=UTF-8',
-                             $response->header('content-type'));
-    $this->assert_matches(qr/Welcome to DevelopBranch TWiki/s, $response->content());
-    $this->assert(!$response->is_error());
-    $this->assert(!$response->is_redirect());
 }
 
 sub test_isTrue {

Modified: twiki/trunk/UnitTestContrib/test/unit/TemplatesTests.pm
===================================================================
--- twiki/trunk/UnitTestContrib/test/unit/TemplatesTests.pm	2017-04-10 21:43:37 UTC (rev 30328)
+++ twiki/trunk/UnitTestContrib/test/unit/TemplatesTests.pm	2017-04-11 21:41:14 UTC (rev 30329)
@@ -42,8 +42,8 @@
     $TWiki::cfg{TemplateDir} = $test_tmpls;
     $TWiki::cfg{DataDir} = $test_data;
     $TWiki::cfg{TemplatePath} = '$TWiki::cfg{PubDir}/$web/$name.$skin.tmpl,$TWiki::cfg{TemplateDir}/$web/$name.$skin.tmpl,$TWiki::cfg{TemplateDir}/$name.$skin.tmpl,$TWiki::cfg{TemplateDir}/$web/$name.tmpl,$TWiki::cfg{TemplateDir}/$name.tmpl,$web.$skinSkin$nameTemplate,$TWiki::cfg{SystemWebName}.$skinSkin$nameTemplate,$web.$nameTemplate,$TWiki::cfg{SystemWebName}.$nameTemplate';
-    $TWiki::cfg{TemplatePath} =~ s/\$TWiki::cfg{TemplateDir}/$TWiki::cfg{TemplateDir}/geo;
-    $TWiki::cfg{TemplatePath} =~ s/\$TWiki::cfg{SystemWebName}/$TWiki::cfg{SystemWebName}/geo;
+    $TWiki::cfg{TemplatePath} =~ s/\$TWiki::cfg\{TemplateDir}/$TWiki::cfg{TemplateDir}/geo;
+    $TWiki::cfg{TemplatePath} =~ s/\$TWiki::cfg\{SystemWebName}/$TWiki::cfg{SystemWebName}/geo;
 
 }