Fix suites consisting of symbolic pages

If using a Suite-page that uses symlinks to link to different external
roots, starting with commit 16bb43e only the contents of the first
symlinked page was displayed in the output of "!contents".

This was regression was introduced by fixing unclebob#925.

src/fitnesse/wiki/BaseWikiPage.java

@@ -69,8 +69,12 @@ public boolean equals(Object other) {
     if (!(other instanceof WikiPage))
       return false;
     try {
+      WikiPage otherPage = (WikiPage) other;
+      if (isRoot() && otherPage.isRoot()) {
+        return getName().equals(otherPage.getName());
+      }
       WikiPagePath path1 = getPageCrawler().getFullPath();
-      WikiPagePath path2 = ((WikiPage) other).getPageCrawler().getFullPath();
+      WikiPagePath path2 = otherPage.getPageCrawler().getFullPath();
       return path1.equals(path2);
     } catch (Exception e) {
       return false;

test/fitnesse/wiki/BaseWikiPageTest.java

@@ -11,10 +11,7 @@
 import fitnesse.wiki.fs.*;
 import util.FileUtil;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class BaseWikiPageTest {
   private WikiPage linkingPage;
@@ -52,6 +49,11 @@ public void testGetChildUsesSymbolicPages() throws Exception {
     checkSymbolicPage(linkingPage.getChildPage("SymLink"));
   }
 
+  @Test
+  public void doesNotEqualAnotherRoot() {
+    WikiPage externalRoot = InMemoryPage.makeRoot("ExternalRoot", fileSystem);
+    assertNotEquals(root, externalRoot);
+  }
 
   @Test
   public void testThatSpecialCharsAreNotEscapedTwice() throws Exception {

test/fitnesse/wiki/SymbolicPageTest.java

@@ -49,6 +49,28 @@ public void testLinkage() throws Exception {
     assertSame(pageTwo, symPage.getRealPage());
   }
 
+  @Test
+  public void equalsAnotherSymbolicPageWithTheSameRealPage() {
+    assertEquals(symPage, new SymbolicPage("SymPage2", pageTwo, pageOne));
+  }
+
+  @Test
+  public void doesNotEqualAnotherSymbolicPageWithDifferentRealPage() {
+    WikiPage childPage = WikiPageUtil.addPage(pageTwo, PathParser.parse("ChildOne"), "child one");
+    assertNotEquals(symPage, new SymbolicPage("SymPage2", childPage, pageOne));
+  }
+
+  @Test
+  public void doesNotEqualAnotherSymbolicPageWithDifferentExternalRoot() throws Exception {
+    createExternalRoot();
+
+    FileUtil.createDir("testDir/ExternalRoot2");
+    WikiPage externalRoot2 = new FileSystemPageFactory().makePage(new File("testDir/ExternalRoot2"), "ExternalRoot2", null, new SystemVariableSource());
+    WikiPage symPage2 = new SymbolicPage("SymPage2", externalRoot2, pageOne);
+
+    assertNotEquals(symPage, symPage2);
+  }
+
   @Test
   public void testInternalData() throws Exception {
     PageData data = symPage.getData();