Issue 13192 edit mode cleanup

dotCMS/src/functional-test/java/com/dotcms/publisher/ajax/RemotePublishAjaxActionTest.java

@@ -388,7 +388,7 @@ public void push_archived_issue5086 () throws Exception {
 		Identifier containerIdentifier = APILocator.getIdentifierAPI().find(containerId);
 		Identifier contenletIdentifier = APILocator.getIdentifierAPI().find(contentlet);
 		MultiTree multiTree = MultiTreeFactory.getMultiTree(htmlPageIdentifier, containerIdentifier,contenletIdentifier);
-		int contentletCount = MultiTreeFactory.getMultiTree(workinghtmlPageAsset.getInode()).size();
+		int contentletCount = MultiTreeFactory.getMultiTrees(workinghtmlPageAsset.getIdentifier()).size();
 
 		if (!InodeUtils.isSet(multiTree.getParent1()) && !InodeUtils.isSet(multiTree.getParent2()) && !InodeUtils.isSet(multiTree.getChild())) {
 			MultiTree mTree = new MultiTree(htmlPageIdentifier.getInode(), containerIdentifier.getInode(),
@@ -400,7 +400,7 @@ public void push_archived_issue5086 () throws Exception {
 		 * Relating content to archived page
 		 */
 		multiTree = MultiTreeFactory.getMultiTree(htmlPageIdentifier, containerIdentifier,contenletIdentifier);
-		contentletCount = MultiTreeFactory.getMultiTree(workinghtmlPageAsset.getInode()).size();
+		contentletCount = MultiTreeFactory.getMultiTrees(workinghtmlPageAsset.getIdentifier()).size();
 
 		if (!InodeUtils.isSet(multiTree.getParent1()) && !InodeUtils.isSet(multiTree.getParent2()) && !InodeUtils.isSet(multiTree.getChild())) {
 			MultiTree mTree = new MultiTree(htmlPageIdentifier.getInode(), containerIdentifier.getInode(),
@@ -544,8 +544,8 @@ public void push_archived_issue5086 () throws Exception {
         }
 
 
-		Assert.assertEquals(0,MultiTreeFactory.getMultiTree(workinghtmlPageAsset.getInode()).size());
-		Assert.assertEquals(0,MultiTreeFactory.getMultiTreeByChild(contentlet.getIdentifier()).size());
+		Assert.assertEquals(0,MultiTreeFactory.getMultiTrees(workinghtmlPageAsset.getInode()).size());
+		Assert.assertEquals(0,MultiTreeFactory.getMultiTreesByChild(contentlet.getIdentifier()).size());
 
 		folder = APILocator.getFolderAPI().findFolderByPath(folderPath, host, systemUser, false);
 		assertTrue(!UtilMethods.isSet(folder.getInode()));
@@ -708,7 +708,7 @@ public void push_container_issue5189 () throws Exception {
 		Identifier containerIdentifier = APILocator.getIdentifierAPI().find(containerId);
 		Identifier contenletIdentifier1 = APILocator.getIdentifierAPI().find(contentlet1);
 		MultiTree multiTree = MultiTreeFactory.getMultiTree(htmlPageIdentifier, containerIdentifier,contenletIdentifier1);
-		int contentletCount = MultiTreeFactory.getMultiTree(htmlPageIdentifier).size();
+		int contentletCount = MultiTreeFactory.getMultiTrees(htmlPageIdentifier).size();
 
 		if (!InodeUtils.isSet(multiTree.getParent1()) && !InodeUtils.isSet(multiTree.getParent2()) && !InodeUtils.isSet(multiTree.getChild())) {
 			MultiTree mTree = new MultiTree(htmlPageIdentifier.getInode(), containerIdentifier.getInode(),
@@ -718,7 +718,7 @@ public void push_container_issue5189 () throws Exception {
 
 		Identifier contenletIdentifier2 = APILocator.getIdentifierAPI().find(contentlet2);
 		multiTree = MultiTreeFactory.getMultiTree(htmlPageIdentifier, containerIdentifier,contenletIdentifier2);
-		contentletCount = MultiTreeFactory.getMultiTree(htmlPageIdentifier).size();
+		contentletCount = MultiTreeFactory.getMultiTrees(htmlPageIdentifier).size();
 
 		if (!InodeUtils.isSet(multiTree.getParent1()) && !InodeUtils.isSet(multiTree.getParent2()) && !InodeUtils.isSet(multiTree.getChild())) {
 			MultiTree mTree = new MultiTree(htmlPageIdentifier.getInode(), containerIdentifier.getInode(),
@@ -728,7 +728,7 @@ public void push_container_issue5189 () throws Exception {
 
 		Identifier contenletIdentifier3 = APILocator.getIdentifierAPI().find(contentlet3);
 		multiTree = MultiTreeFactory.getMultiTree(htmlPageIdentifier, containerIdentifier,contenletIdentifier3);
-		contentletCount = MultiTreeFactory.getMultiTree(htmlPageIdentifier).size();
+		contentletCount = MultiTreeFactory.getMultiTrees(htmlPageIdentifier).size();
 
 		if (!InodeUtils.isSet(multiTree.getParent1()) && !InodeUtils.isSet(multiTree.getParent2()) && !InodeUtils.isSet(multiTree.getChild())) {
 			MultiTree mTree = new MultiTree(htmlPageIdentifier.getInode(), containerIdentifier.getInode(),
@@ -741,7 +741,7 @@ public void push_container_issue5189 () throws Exception {
 		 * Validations
 		 */
 		assertTrue(workinghtmlPageAsset.isLive());
-		contentletCount = MultiTreeFactory.getMultiTree(htmlPageIdentifier).size();
+		contentletCount = MultiTreeFactory.getMultiTrees(htmlPageIdentifier).size();
 		assertTrue(contentletCount == 3);
 
 		/*

dotCMS/src/integration-test/java/com/dotcms/velocity/VelocityMacroCacheTest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/VelocityMacroCacheTest.java

@@ -1,4 +1,4 @@
-package com.dotcms.velocity;
+package com.dotcms.rendering.velocity;
 
 import org.apache.velocity.context.Context;
 import org.junit.BeforeClass;
@@ -9,7 +9,7 @@
 import static org.junit.Assert.*;
 import com.dotcms.util.IntegrationTestInitService;
 import com.dotmarketing.business.CacheLocator;
-import com.dotmarketing.util.VelocityUtil;
+import com.dotcms.rendering.velocity.util.VelocityUtil;
 
 /**
  * VelocityUtilTest

dotCMS/src/integration-test/java/com/dotcms/velocity/VelocityUtilTest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/VelocityUtilTest.java

@@ -1,8 +1,8 @@
-package com.dotcms.velocity;
+package com.dotcms.rendering.velocity;
 
 import com.dotcms.util.IntegrationTestInitService;
 import com.dotmarketing.util.Config;
-import com.dotmarketing.util.VelocityUtil;
+import com.dotcms.rendering.velocity.util.VelocityUtil;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;

dotCMS/src/integration-test/java/com/dotmarketing/viewtools/BrowserAPITest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/viewtools/BrowserAPITest.java

@@ -1,4 +1,4 @@
-package com.dotmarketing.viewtools;
+package com.dotcms.rendering.velocity.viewtools;
 
 import com.dotcms.IntegrationTestBase;
 import com.dotcms.contenttype.exception.NotFoundInDbException;

dotCMS/src/integration-test/java/com/dotmarketing/viewtools/LanguageWebAPITest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/viewtools/LanguageWebAPITest.java

@@ -1,4 +1,4 @@
-package com.dotmarketing.viewtools;
+package com.dotcms.rendering.velocity.viewtools;
 
 import static com.dotcms.contenttype.model.type.KeyValueContentType.MULTILINGUABLE_FALLBACK_KEY;
 import static org.junit.Assert.assertEquals;

dotCMS/src/integration-test/java/com/dotmarketing/viewtools/content/ContentToolTest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/viewtools/content/ContentToolTest.java

@@ -1,4 +1,4 @@
-package com.dotmarketing.viewtools.content;
+package com.dotcms.rendering.velocity.viewtools.content;
 
 import com.dotcms.IntegrationTestBase;
 import com.dotcms.contenttype.model.type.ContentType;

dotCMS/src/integration-test/java/com/dotmarketing/viewtools/navigation/NavToolTest.java → dotCMS/src/integration-test/java/com/dotcms/rendering/velocity/viewtools/navigation/NavToolTest.java

@@ -1,6 +1,7 @@
-package com.dotmarketing.viewtools.navigation;
+package com.dotcms.rendering.velocity.viewtools.navigation;
 
 import com.dotcms.IntegrationTestBase;
+import com.dotcms.rendering.velocity.viewtools.LanguageWebAPI;
 import com.dotcms.util.IntegrationTestInitService;
 import com.dotmarketing.beans.Host;
 import com.dotmarketing.beans.Identifier;
@@ -10,7 +11,7 @@
 import com.dotmarketing.portlets.folders.model.Folder;
 import com.dotmarketing.portlets.htmlpageasset.model.IHTMLPage;
 import com.dotmarketing.util.Config;
-import com.dotmarketing.viewtools.LanguageWebAPI;
+
 import com.liferay.portal.model.User;
 
 import org.junit.AfterClass;
@@ -65,14 +66,14 @@ public void testAboutUsDefaultPageToLanguageTrue() throws Exception { // https:/
         //Using Identifier to get the path.
         Identifier aboutUsIdentifier=APILocator.getIdentifierAPI().find(aboutUsFolder);
 
-        NavResult navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 1, user);
+        NavResult navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 1, user);
         assertNotNull(navResult);
 
         //We are expecting 3 children result for English Language.
         int englishResultChildren = navResult.getChildren().size();
         assertEquals(englishResultChildren, 3);
 
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         int spanishResultChildren = navResult.getChildren().size();
@@ -86,7 +87,7 @@ public void testAboutUsDefaultPageToLanguageTrue() throws Exception { // https:/
 
         createSpanishPagesCopy(user, liveHTMLPages, contentletsCreated);
 
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         //Now We are expecting more children result for Spanish Language than English Language.
@@ -98,7 +99,7 @@ public void testAboutUsDefaultPageToLanguageTrue() throws Exception { // https:/
         APILocator.getContentletAPI().delete(contentletsCreated, user, false);
 
         //We should back to 2 in Spanish Nav.
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         //Now We are expecting original amount children result for Spanish Language.
@@ -125,14 +126,14 @@ public void testAboutUsDefaultPageToLanguageFalse() throws Exception { // https:
         //Using Identifier to get the path.
         Identifier aboutUsIdentifier=APILocator.getIdentifierAPI().find(aboutUsFolder);
 
-        NavResult navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 1, user);
+        NavResult navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 1, user);
         assertNotNull(navResult);
 
         //We are expecting 3 children result for English Language.
         int englishResultChildren = navResult.getChildren().size();
         assertEquals(englishResultChildren, 3);
 
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         int spanishResultChildren = navResult.getChildren().size();
@@ -146,7 +147,7 @@ public void testAboutUsDefaultPageToLanguageFalse() throws Exception { // https:
 
         createSpanishPagesCopy(user, liveHTMLPages, contentletsCreated);
 
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         //Now We are expecting same children result for Spanish Language and English Language.
@@ -158,7 +159,7 @@ public void testAboutUsDefaultPageToLanguageFalse() throws Exception { // https:
         APILocator.getContentletAPI().delete(contentletsCreated, user, false);
 
         //We should back to 2 in Spanish Nav.
-        navResult = NavTool.getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
+        navResult = new NavTool().getNav(demoHost, aboutUsIdentifier.getPath(), 2, user);
         assertNotNull(navResult);
 
         //Now We are expecting original amount children result for Spanish Language.

dotCMS/src/integration-test/java/com/dotmarketing/factories/MultiTreeFactoryTest.java

@@ -0,0 +1,161 @@
+package com.dotmarketing.factories;
+
+import static org.junit.Assert.assertTrue;
+
+import com.dotcms.IntegrationTestBase;
+import com.dotcms.util.IntegrationTestInitService;
+
+import com.dotmarketing.beans.MultiTree;
+import com.dotmarketing.startup.runonce.Task04315UpdateMultiTreePK;
+import com.dotmarketing.util.Logger;
+
+import java.util.List;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MultiTreeFactoryTest extends IntegrationTestBase {
+
+
+    private static final String CONTAINER = "CONTAINER";
+    private static final String PAGE = "PAGE";
+    private static final String CONTENTLET = "CONTENTLET";
+    private static final String RELATION_TYPE = "RELATION_TYPE";
+
+    final static int runs =2;
+    final static int contentlets =5;
+    @BeforeClass
+    public static void initData() throws Exception {
+        IntegrationTestInitService.getInstance().init();
+      //  testUpgradeTask();
+        buildInitalData();
+    }
+
+    public static void testUpgradeTask() throws Exception {
+        Task04315UpdateMultiTreePK task = Task04315UpdateMultiTreePK.class.newInstance();
+        task.executeUpgrade();
+    }
+
+
+    public static void buildInitalData() throws Exception {
+        for(int i=0;i<runs;i++) {
+            for(int j=0;j<contentlets;j++) {
+                MultiTree mt = new MultiTree()
+                        .setContainer(CONTAINER +i)
+                        .setHtmlPage(PAGE)
+                        .setContentlet(CONTENTLET + j)
+                        .setTreeOrder(j)
+                        .setRelationType(RELATION_TYPE + i);
+
+                MultiTreeFactory.saveMultiTree(mt);
+            }
+        }
+
+    }
+
+    @Test
+    public  void testDeletes() throws Exception {
+        deleteInitialData();
+        buildInitalData() ;
+        List<MultiTree> all = MultiTreeFactory.getAllMultiTrees();
+
+        List<MultiTree> list = MultiTreeFactory.getMultiTrees(PAGE);
+
+        deleteInitialData();
+        assertTrue("multiTree deletes", MultiTreeFactory.getAllMultiTrees().size() < all.size() );
+        assertTrue("multiTree deletes", MultiTreeFactory.getAllMultiTrees().size() == all.size() - list.size() );
+    }
+
+
+    @Test
+    public  void testReorder() throws Exception {
+        deleteInitialData();
+        buildInitalData() ;
+        MultiTree tree = MultiTreeFactory.getMultiTree(PAGE, CONTAINER+0, CONTENTLET +0, RELATION_TYPE+0);
+        assertTrue("multiTree reorders", tree.getTreeOrder()==0 );
+        MultiTreeFactory.saveMultiTree(tree.setTreeOrder(7));
+        tree = MultiTreeFactory.getMultiTree(PAGE, CONTAINER+ 0, CONTENTLET + 0, RELATION_TYPE+0);
+        assertTrue("multiTree reorders", tree.getTreeOrder()==4 );
+        MultiTreeFactory.saveMultiTree(tree.setTreeOrder(2));
+        List<MultiTree> list = MultiTreeFactory.getMultiTrees(PAGE, CONTAINER+0, RELATION_TYPE+0);
+        assertTrue("multiTree reorders", list.get(2).equals(tree));
+
+    }
+
+    @Test
+    public  void findByChild() throws Exception {
+        deleteInitialData();
+        buildInitalData() ;
+
+        List<MultiTree> list = MultiTreeFactory.getMultiTreesByChild(CONTENTLET + "0");
+
+        assertTrue("getByChild returns all results", list.size() == runs );
+
+
+
+    }
+
+
+
+    @AfterClass
+    public static void deleteInitialData() throws Exception {
+
+        List<MultiTree> list = MultiTreeFactory.getMultiTrees(PAGE);
+
+        for(MultiTree tree : list) {
+            MultiTreeFactory.deleteMultiTree(tree);
+        }
+
+    }
+
+
+
+
+
+    @Test
+    public  void testSaveMultiTree() throws Exception {
+        MultiTree mt = new MultiTree()
+                .setContainer(CONTAINER)
+                .setHtmlPage(PAGE)
+                .setContentlet("NEW_ONE")
+                .setTreeOrder(0)
+                .setRelationType(RELATION_TYPE + 0);
+
+        MultiTreeFactory.saveMultiTree(mt);
+
+        MultiTree mt2 = MultiTreeFactory.getMultiTree(mt.getHtmlPage(), mt.getContainer(), mt.getContentlet(), mt.getRelationType());
+        assertTrue("multiTree save and get equals", mt.equals(mt2));
+
+
+
+
+
+
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+    @Test
+    public void testGetMultiTreeIdentifierIdentifierIdentifierString() throws Exception {
+
+
+
+
+    }
+
+    @Test
+    public void testGetMultiTreeInode() throws Exception {
+
+    }
+
+}