[jboss-svn-commits] JBL Code SVN: r28971 - in labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src: test/java/org/jboss/labs/clearspace/plugin/nfm and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: lkrzyzanek
Date: 2009-08-18 07:03:58 -0400 (Tue, 18 Aug 2009)
New Revision: 28971

Modified:
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java
   labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/resources/communities-test.properties
Log:
Added sub-sub-space configuration handling

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2009-08-18 10:14:30 UTC (rev 28970)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/main/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManager.java	2009-08-18 11:03:58 UTC (rev 28971)
@@ -869,14 +869,36 @@
       int j = 1;
       Set<CommunityDefBean> subCommunities = new LinkedHashSet<CommunityDefBean>();
       while (true) {
-        String subCommunityName = layoutDef.getProperty(prefix + j + ".name");
+        final String subPrefix = prefix + j;
+        String subCommunityName = layoutDef.getProperty(subPrefix + ".name");
         if (subCommunityName == null) {
           break;
         }
         CommunityDefBean subCommunityDef = createCommunityDef(subCommunityName,
-            layoutDef.getProperty(prefix + j + ".forumIDs"), layoutDef
-                .getProperty(prefix + j + ".dname"), layoutDef
-                .getProperty(prefix + j + ".desc"));
+            layoutDef.getProperty(subPrefix + ".forumIDs"), layoutDef
+                .getProperty(subPrefix + ".dname"), layoutDef
+                .getProperty(subPrefix + ".desc"));
+
+        int k = 1;
+        Set<CommunityDefBean> subSubCommunities = new LinkedHashSet<CommunityDefBean>();
+        while (true) {
+          final String subSubPrefix = subPrefix + "." + k;
+          String subSubCommunityName = layoutDef.getProperty(subSubPrefix
+              + ".name");
+          if (subSubCommunityName == null) {
+            break;
+          }
+          CommunityDefBean subSubCommunityDef = createCommunityDef(
+              subSubCommunityName, layoutDef.getProperty(subSubPrefix
+                  + ".forumIDs"), layoutDef
+                  .getProperty(subSubPrefix + ".dname"), layoutDef
+                  .getProperty(subSubPrefix + ".desc"));
+          subSubCommunities.add(subSubCommunityDef);
+
+          k++;
+        }
+        subCommunityDef.setSubCommunityDefBeans(subSubCommunities);
+
         subCommunities.add(subCommunityDef);
         j++;
       }

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java	2009-08-18 10:14:30 UTC (rev 28970)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/java/org/jboss/labs/clearspace/plugin/nfm/DbNukesForumsManagerTest.java	2009-08-18 11:03:58 UTC (rev 28971)
@@ -123,8 +123,26 @@
     assertArrayEquals(new Long[] { 5l, 6l, 7l, 8l }, jbossASDev.getForumIDs()
         .toArray());
 
+    Iterator<CommunityDefBean> jbossASSubSubs = jbossASDev
+        .getSubCommunityDefBeans().iterator();
+    CommunityDefBean jbossASDevSub = jbossASSubSubs.next();
+    assertEquals("sub", jbossASDevSub.getDisplayName());
+    assertEquals("JBoss AS Developers sub space", jbossASDevSub.getName());
+    assertEquals("JBoss AS Developers Space sub space ...", jbossASDevSub.getDescription());
+    assertArrayEquals(new Long[] { 30l, 40l }, jbossASDevSub.getForumIDs()
+        .toArray());
+
+    CommunityDefBean jbossASDevSub2 = jbossASSubSubs.next();
+    assertEquals("sub2", jbossASDevSub2.getDisplayName());
+    assertEquals("JBoss AS Developers sub2 space", jbossASDevSub2.getName());
+    assertEquals("JBoss AS Developers Space sub2 space ...", jbossASDevSub2.getDescription());
+    assertArrayEquals(new Long[] { 50l }, jbossASDevSub2.getForumIDs()
+        .toArray());
+
+    
     CommunityDefBean jbossASSub = jbossASSubs.next();
     assertEquals("Another sub community", jbossASSub.getName());
+    assertEquals("sub-community", jbossASSub.getDisplayName());
     assertArrayEquals(new Long[] { 101l }, jbossASSub.getForumIDs().toArray());
 
     CommunityDefBean portal = layoutIt.next();

Modified: labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/resources/communities-test.properties
===================================================================
--- labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/resources/communities-test.properties	2009-08-18 10:14:30 UTC (rev 28970)
+++ labs/jbosslabs/labs-3.0-build/integration/cs-nfm/trunk/src/test/resources/communities-test.properties	2009-08-18 11:03:58 UTC (rev 28971)
@@ -6,6 +6,15 @@
 community.1.1.name=JBoss AS Developers
 community.1.1.desc=JBoss AS Developers Space
 community.1.1.forumIDs=5,6,7,8
+community.1.1.1.dname=sub
+community.1.1.1.name=JBoss AS Developers sub space
+community.1.1.1.desc=JBoss AS Developers Space sub space ...
+community.1.1.1.forumIDs=30,40
+community.1.1.2.dname=sub2
+community.1.1.2.name=JBoss AS Developers sub2 space
+community.1.1.2.desc=JBoss AS Developers Space sub2 space ...
+community.1.1.2.forumIDs=50
+
 community.1.2.dname=sub-community
 community.1.2.name=Another sub community
 community.1.2.forumIDs=101