From ae7655a0799c3e0e4a0d4418023cffbb4dddf765 Mon Sep 17 00:00:00 2001 From: amelentev Date: Tue, 7 Aug 2007 20:44:51 +0000 Subject: [PATCH] XWIKI-1459: keep document history in a separate table - fixed XWIKI-1468: History page version and normal page version do not match - fixed XWIKI-962: Ability to alter the document history - only code XWIKI-1447: Minor edit of document - only code New histore storage implemented. It is quate hard to separate this issues now. git-svn-id: https://svn.xwiki.org/svnroot/xwiki/xwiki-products/xwiki-enterprise/trunk@4119 f329d543-caf0-0310-9063-dda96c69346f --- .../src/test/it/com/xpn/xwiki/it/xmlrpc/PagesTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/PagesTest.java b/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/PagesTest.java index e3583adb7..e388d7c73 100644 --- a/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/PagesTest.java +++ b/distribution-test/xmlrpc-tests/src/test/it/com/xpn/xwiki/it/xmlrpc/PagesTest.java @@ -3,6 +3,8 @@ import java.util.HashMap; import java.util.Map; +import org.suigeneris.jrcs.rcs.Version; + import com.xpn.xwiki.it.xmlrpc.framework.AbstractXmlRpcTestCase; import com.xpn.xwiki.xmlrpc.Page; import com.xpn.xwiki.xmlrpc.PageHistorySummary; @@ -72,7 +74,7 @@ public void testAddModifyRemovePage() throws Exception // modify the page String newContent = "Some Other Content"; - int newVersion = resultPage.getVersion() + 1; + int newVersion = Page.constructVersion(new Version(2,1)); pageProperties = new HashMap(); pageProperties.put("id", id); pageProperties.put("space", spaceKey); @@ -101,7 +103,7 @@ public void testAddModifyRemovePage() throws Exception assertEquals(2, historyObjs.length); PageHistorySummary phs0 = new PageHistorySummary((Map)historyObjs[0]); assertEquals(id, phs0.getId()); - assertEquals(newVersion-1, phs0.getVersion()); + assertEquals(page.getVersion(), phs0.getVersion()); assertNotNull(phs0.getModified()); assertEquals("XWiki.Admin", phs0.getModifier()); PageHistorySummary phs1 = new PageHistorySummary((Map)historyObjs[1]);