Item12888: fixes for unit tests

foswiki · Oct 18, 2014 · 953c751 · 953c751
1 parent 6e786df
commit 953c751
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/UnitTestContrib/test/unit/Fn_SEARCH.pm b/UnitTestContrib/test/unit/Fn_SEARCH.pm
@@ -2418,8 +2418,8 @@ HERE
     );
 
     #test a few others to try to not break things
-    $this->assert_str_equals(
-        'Apache is the well known web server.',
+    $this->assert_matches(
+qr/Apache is the\s+http:\/\/www\.apache\.org\/httpd\/ well known web server\s*\./,
         $this->{session}->{renderer}->TML2PlainText(
 'Apache is the [[http://www.apache.org/httpd/ well known web server]].'
         )

diff --git a/UnitTestContrib/test/unit/FormattingTests.pm b/UnitTestContrib/test/unit/FormattingTests.pm
@@ -521,31 +521,31 @@ ACTUAL
 }
 
 # [[Url Alt TextAlt]]
-sub test_squabbedUrlAltTextOldUndocumentedUse {
-    my $this     = shift;
-    my $expected = <<EXPECTED;
-<a href="$this->{sup}/$Foswiki::cfg{SystemWebName}/$Foswiki::cfg{HomeTopicName}" target="_top">Alt <nop>TextAlt</a>
-EXPECTED
-
-    my $actual = <<ACTUAL;
-[[$this->{sup}/$Foswiki::cfg{SystemWebName}/$Foswiki::cfg{HomeTopicName} Alt TextAlt]]
-ACTUAL
-    $this->do_test( $expected, $actual );
-}
-
+#sub test_squabbedUrlAltTextOldUndocumentedUse {
+#    my $this     = shift;
+#    my $expected = <<EXPECTED;
+#<a href="$this->{sup}/$Foswiki::cfg{SystemWebName}/$Foswiki::cfg{HomeTopicName}" target="_top">Alt <nop>TextAlt</a>
+#EXPECTED
+#
+#    my $actual = <<ACTUAL;
+#[[$this->{sup}/$Foswiki::cfg{SystemWebName}/$Foswiki::cfg{HomeTopicName} Alt TextAlt]]
+#ACTUAL
+#    $this->do_test( $expected, $actual );
+#}
+#
 # [[mailtoUrl Alt TextAlt]]
-sub test_squabbedMailtoUrlAltTextOldUndocumentedUse {
-    my $this     = shift;
-    my $expected = <<EXPECTED;
-<a href="mailto&#58;user&#64;exampleSTUFFED&#46;com">Alt <nop>TextAlt</a>
-EXPECTED
-
-    my $actual = <<ACTUAL;
-[[mailto:user\@example.com Alt TextAlt]]
-ACTUAL
-    chomp $expected;
-    $this->do_test( $expected, $actual, 1 );
-}
+#sub test_squabbedMailtoUrlAltTextOldUndocumentedUse {
+#    my $this     = shift;
+#    my $expected = <<EXPECTED;
+#<a href="mailto&#58;user&#64;exampleSTUFFED&#46;com">Alt <nop>TextAlt</a>
+#EXPECTED
+#
+#    my $actual = <<ACTUAL;
+#[[mailto:user\@example.com Alt TextAlt]]
+#ACTUAL
+#    chomp $expected;
+#    $this->do_test( $expected, $actual, 1 );
+#}
 
 # [[mailtoUrl?with params]]
 sub test_squabbedMailtoUrlWithSpaces {
@@ -1433,8 +1433,8 @@ sub test_render_PlainText {
     );
 
     #test a few others to try to not break things
-    $this->assert_str_equals(
-        'Apache is the well known web server.',
+    $this->assert_matches(
+qr/Apache is the\s+http:\/\/www\.apache\.org\/httpd\/ well known web server\s*\./,
         $this->{session}->{renderer}->TML2PlainText(
 'Apache is the [[http://www.apache.org/httpd/ well known web server]].'
         )