From f3f6d0e9f5b6cb919ceb5e637b969d6bdf8d473e Mon Sep 17 00:00:00 2001
From: nttuyen <tuyennt@exoplatform.com>
Date: Mon, 28 Oct 2013 10:25:43 +0700
Subject: [PATCH] Fix switchLayout test failure with Mongo

---
 .../portal/impl/mop/mongo/MongoElementStore.java      |  2 +-
 .../org/exoplatform/portal/mop/layout/TestLayout.java | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/component/portal/src/main/java/org/gatein/portal/impl/mop/mongo/MongoElementStore.java b/component/portal/src/main/java/org/gatein/portal/impl/mop/mongo/MongoElementStore.java
index be5300850..d9469e414 100644
--- a/component/portal/src/main/java/org/gatein/portal/impl/mop/mongo/MongoElementStore.java
+++ b/component/portal/src/main/java/org/gatein/portal/impl/mop/mongo/MongoElementStore.java
@@ -294,7 +294,7 @@ public NodeData<ElementState>[] moveNode(String targetId, String fromId, String
             toChildren.add(index, targetId);
             nodes.put(targetId, target = target.withParent(toId));
             nodes.put(fromId, from = from.withChildren(fromChildren));
-            nodes.put(toId, to = to.withChildren(fromChildren));
+            nodes.put(toId, to = to.withChildren(toChildren));
         }
         return new NodeData[]{target,from,to};
     }
diff --git a/component/portal/src/test/java/org/exoplatform/portal/mop/layout/TestLayout.java b/component/portal/src/test/java/org/exoplatform/portal/mop/layout/TestLayout.java
index 814fd72df..7a87a7bb3 100644
--- a/component/portal/src/test/java/org/exoplatform/portal/mop/layout/TestLayout.java
+++ b/component/portal/src/test/java/org/exoplatform/portal/mop/layout/TestLayout.java
@@ -39,6 +39,7 @@
 import org.gatein.portal.mop.customization.CustomizationService;
 import org.gatein.portal.mop.hierarchy.NodeContext;
 import org.gatein.portal.mop.hierarchy.NodeData;
+import org.gatein.portal.mop.hierarchy.NodeStore;
 import org.gatein.portal.mop.layout.Element;
 import org.gatein.portal.mop.layout.ElementState;
 import org.gatein.portal.mop.layout.LayoutService;
@@ -173,9 +174,13 @@ public void testPage() {
     public void testSwitchLayout() {
         PageData page = createPage(createSite(SiteType.PORTAL, "test_layout_page"), "page", new PageState.Builder().build());
         NodeData<ElementState>[] containers = createElements(page, Element.container(), Element.container(), Element.container());
-        createElements(context.getLayoutStore().begin(page.layoutId, true), containers[0], FOO_PORTLET);
-        createElements(context.getLayoutStore().begin(page.layoutId, true), containers[1], BAR_PORTLET);
-        createElements(context.getLayoutStore().begin(page.layoutId, true), containers[2], FOO_PORTLET);
+
+        //Create portlet 1 on container 1
+        NodeStore<ElementState> store = context.getLayoutStore().begin(page.layoutId, true);
+        createElements(store, containers[0], FOO_PORTLET);
+        createElements(store, containers[1], BAR_PORTLET);
+        createElements(store, containers[2], FOO_PORTLET);
+        context.getLayoutStore().end(store);
 
         String layoutId = page.layoutId;