Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57135: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56918: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56817: MNT-9759 A link on a wiki page is red after upgrade from 3.3.5/3.4.13
         In WikiServiceImplTest was updated createUpdateDeleteEntry() test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:58:45 +00:00
parent fdff0c1848
commit 354081e5dd

View File

@@ -213,13 +213,13 @@ public class WikiServiceImplTest
page = WIKI_SERVICE.updateWikiPage(page); page = WIKI_SERVICE.updateWikiPage(page);
assertEquals("New_Title", page.getSystemName()); // Name has underscores assertEquals("New_Title", page.getSystemName()); // Name has underscores
assertEquals("New Title", page.getTitle()); assertEquals("New_Title", page.getTitle());
// Fetch, and check // Fetch, and check
page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName()); page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName());
assertEquals("New_Title", page.getSystemName()); // Name has underscores assertEquals("New_Title", page.getSystemName()); // Name has underscores
assertEquals("New Title", page.getTitle()); assertEquals("New_Title", page.getTitle());
assertEquals("This is new content", page.getContents()); assertEquals("This is new content", page.getContents());
assertEquals(TEST_USER, page.getCreator()); assertEquals(TEST_USER, page.getCreator());
assertEquals(0, page.getTags().size()); assertEquals(0, page.getTags().size());
@@ -239,7 +239,7 @@ public class WikiServiceImplTest
// Check it // Check it
assertEquals("Title_Space", page.getSystemName()); assertEquals("Title_Space", page.getSystemName());
assertEquals("Title Space", page.getTitle()); assertEquals("Title_Space", page.getTitle());
assertEquals("This Is Some Content", page.getContents()); assertEquals("This Is Some Content", page.getContents());
assertEquals(TEST_USER, page.getCreator()); assertEquals(TEST_USER, page.getCreator());
assertEquals(0, page.getTags().size()); assertEquals(0, page.getTags().size());
@@ -252,7 +252,7 @@ public class WikiServiceImplTest
// Check // Check
page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName()); page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName());
assertEquals("Title_Space", page.getSystemName()); assertEquals("Title_Space", page.getSystemName());
assertEquals("Title Space", page.getTitle()); assertEquals("Title_Space", page.getTitle());
assertEquals("Changed contents", page.getContents()); assertEquals("Changed contents", page.getContents());
assertEquals(TEST_USER, page.getCreator()); assertEquals(TEST_USER, page.getCreator());
assertEquals(0, page.getTags().size()); assertEquals(0, page.getTags().size());
@@ -265,7 +265,7 @@ public class WikiServiceImplTest
// Check // Check
page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName()); page = WIKI_SERVICE.getWikiPage(WIKI_SITE.getShortName(), page.getSystemName());
assertEquals("Alternate_Title", page.getSystemName()); assertEquals("Alternate_Title", page.getSystemName());
assertEquals("Alternate Title", page.getTitle()); assertEquals("Alternate_Title", page.getTitle());
assertEquals("Changed contents", page.getContents()); assertEquals("Changed contents", page.getContents());
assertEquals(TEST_USER, page.getCreator()); assertEquals(TEST_USER, page.getCreator());
assertEquals(0, page.getTags().size()); assertEquals(0, page.getTags().size());