Author: tkobayas(a)redhat.com Date: 2013-01-25 00:28:08 -0500 (Fri, 25 Jan 2013) New Revision: 9083 Modified: epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ891247_BZ895343/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java Log: BZ895343 fixing TestUserPortalConfigService by picking 03f0096877a355f9d6986b8fbf27f6255b3e166a commit Modified: epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ891247_BZ895343/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ891247_BZ895343/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2013-01-25 04:39:38 UTC (rev 9082) +++ epp/portal/branches/EPP_5_2_2_GA_BZ851985_BZ861377_BZ891247_BZ895343/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2013-01-25 05:28:08 UTC (rev 9083) @@ -196,11 +196,13 @@ 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"); @@ -283,12 +285,14 @@ 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"); } @@ -309,12 +313,14 @@ 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(); }