GTNPORTAL-2541: Fix JUnit test failures and revert changes introduced…

… by GTNPORTAL-2540
gatein · Aug 23, 2012 · 03f0096 · 03f0096
1 parent e2a4edc
commit 03f0096
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java b/component/portal/src/main/java/org/exoplatform/portal/mop/user/UserPortalImpl.java
@@ -188,23 +188,14 @@ public UserNavigation getNavigation(SiteKey key) throws NullPointerException, Us
       {
          throw new NullPointerException("No null key accepted");
       }
-
-      if (service.getUserACL().getSuperUser().equals(userName))
-      {
-         NavigationContext navCtx = service.getNavigationService().loadNavigation(key);
-         return navCtx != null ? new UserNavigation(this, navCtx, true) : null;
-      }
-      else
+      for (UserNavigation navigation : getNavigations())
       {
-         for (UserNavigation navigation : getNavigations())
+         if (navigation.getKey().equals(key))
          {
-            if (navigation.getKey().equals(key))
-            {
-               return navigation;
-            }
+            return navigation;
          }
-         return null;
       }
+      return null;
    }
 
    public void refresh()

diff --git a/...onent/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java b/...onent/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java
@@ -197,11 +197,13 @@ public void execute() throws Exception
             UserPortal userPortal = userPortalCfg.getUserPortal();
             assertNotNull(userPortal.getNavigations());
             Map<String, UserNavigation> navigations = toMap(userPortal);
-            assertEquals("expected to have 5 navigations instead of " + navigations, 5, navigations.size());
+            assertEquals("expected to have 7 navigations instead of " + navigations, 7, navigations.size());
             assertTrue(navigations.containsKey("portal::classic"));
             assertTrue(navigations.containsKey("group::/platform/administrators"));
             assertTrue(navigations.containsKey("group::/platform/users"));
             assertTrue(navigations.containsKey("group::/organization/management/executive-board"));
+            assertTrue(navigations.containsKey("group::/test/normalized"));
+            assertTrue(navigations.containsKey("group::/test/legacy"));
             assertTrue(navigations.containsKey("user::root"));
          }
       }.execute("root");
@@ -284,12 +286,14 @@ public void execute() throws Exception
             UserPortalConfig userPortalCfg = userPortalConfigSer_.getUserPortalConfig("classic", "root");
             UserPortal userPortal = userPortalCfg.getUserPortal();
             List<UserNavigation> navigations = userPortal.getNavigations();
-            assertEquals("expected to have 5 navigations instead of " + navigations, 5, navigations.size());
+            assertEquals("expected to have 7 navigations instead of " + navigations, 7, navigations.size());
             assertEquals("classic", navigations.get(0).getKey().getName()); // 1
             assertEquals("/platform/administrators", navigations.get(1).getKey().getName()); // 2
             assertEquals("root", navigations.get(2).getKey().getName()); // 3
             assertEquals("/organization/management/executive-board", navigations.get(3).getKey().getName()); // 5
             assertEquals("/platform/users", navigations.get(4).getKey().getName()); // 8
+            assertEquals("/test/legacy", navigations.get(5).getKey().getName());
+            assertEquals("/test/normalized", navigations.get(6).getKey().getName());
          }
       }.execute("root");
    }
@@ -310,12 +314,14 @@ public void execute() throws Exception
             UserPortal userPortal = userPortalCfg.getUserPortal();
             assertNotNull(userPortal.getNavigations());
             Map<String, UserNavigation> navigations = toMap(userPortal);
-            assertEquals("expected to have 5 navigations instead of " + navigations, 5, navigations.size());
+            assertEquals("expected to have 7 navigations instead of " + navigations, 7, navigations.size());
             assertTrue(navigations.containsKey("portal::jazz"));
             assertTrue(navigations.containsKey("group::/platform/administrators"));
             assertTrue(navigations.containsKey("group::/organization/management/executive-board"));
             assertTrue(navigations.containsKey("group::/platform/users"));
             assertTrue(navigations.containsKey("user::root"));
+            assertTrue(navigations.containsKey("group::/test/legacy"));
+            assertTrue(navigations.containsKey("group::/test/normalized"));
 
             queryPage();
          }