Changeset 14058

Timestamp:

02/22/12 12:50:13 (5 hours ago)

Author:

PaulHarvey

Message:

Item11366: Avoid using Foswiki::Address in test

File:

• branches/Release01x01/UnitTestContrib/test/unit/FormattingTests.pm (modified) (3 diffs)

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

@@ -1743 +1743 @@
     my $part;
 
-    require Foswiki::Address;
     require HTML::Entities;
     print "[[$linktext]]\n\t$html\n" if TRACE;
@@ -1765 +1764 @@
         $expectedAddress = "$this->{test_web}.$this->{test_topic}";
     }
-    $addrObj = Foswiki::Address->new(
-        string => $address,
-        web    => $this->{test_web},
-        topic  => $this->{test_topic},
-        isA    => 'topic'
-    );
-    $expectedAddrObj = Foswiki::Address->new(
-        string => $expectedAddress,
-        web    => $this->{test_web},
-        topic  => $this->{test_topic},
-        isA    => 'topic'
-    );
+    my ( $actualWeb, $actualTopic ) =
+      Foswiki::Func::normalizeWebTopicName( $this->{test_web}, $address );
+    my ( $expectedWeb, $expectedTopic ) =
+      Foswiki::Func::normalizeWebTopicName( $this->{test_web},
+        $expectedAddress );
     print "\tfrag: "
       . ( defined $fragment ? $fragment : 'undef' )
@@ -1784 +1776 @@
       . ( defined $address ? $address : 'undef' ) . "\n"
       if TRACE;
-    $this->assert_str_equals( $expectedAddrObj->stringify(),
-        $addrObj->stringify(), "address mismatch checking [[$linktext]]" );
+    $this->assert_str_equals( "$expectedWeb.$expectedTopic",
+        "$actualWeb.$actualTopic", "address mismatch checking [[$linktext]]" );
     $this->assert_deep_equals( $expected->{query}, $query,
         "query mismatch checking [[$linktext]]" );