Item11366: Avoid using Foswiki::Address in test

git-svn-id: http://svn.foswiki.org/trunk@14057 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 22, 2012 · 59e9418 · 59e9418
1 parent d86af21
commit 59e9418
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/UnitTestContrib/test/unit/FormattingTests.pm b/UnitTestContrib/test/unit/FormattingTests.pm
@@ -1742,7 +1742,6 @@ sub _check_rendered_linktext {
     my $addrObj;
     my $part;
 
-    require Foswiki::Address;
     require HTML::Entities;
     print "[[$linktext]]\n\t$html\n" if TRACE;
     $this->assert( $html !~ $editpathregex,
@@ -1764,27 +1763,20 @@ sub _check_rendered_linktext {
     else {
         $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' )
       . ",\tquery: "
       . ( defined $query ? $query : 'undef' )
       . ",\taddr: "
       . ( 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]]" );
     $this->assert_deep_equals( $expected->{fragment}, $fragment,