svn commit: r1361934 - /rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java

[marijan]

Author: marijan
Date: Mon Jul 16 08:36:48 2012
New Revision: 1361934

URL: http://svn.apache.org/viewvc?rev=1361934&view=rev
Log:
RAVE-701 Provide a simple filesystem based url to page definition mapping (xml, 
json)

- change testcase

Modified:
    
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java

Modified: 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java?rev=1361934&r1=1361933&r2=1361934&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
 (original)
+++ 
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/model/config/FilePageConfigDaoTest.java
 Mon Jul 16 08:36:48 2012
@@ -45,29 +45,24 @@ public class FilePageConfigDaoTest {
         final PageConfig config = 
dao.loadConfig(FileConfigDao.CLASSPATH_PREFIX + "example_configuration.xml");
         assertNotNull(config);
         assertEquals("default", config.getName());
-        // expected only standard page
         final List<PageDefinitionConfig> definitions = config.getDefinitions();
-        assertEquals(1, definitions.size());
+        assertEquals("expected only (1) definition (name=standard) page", 1, 
definitions.size());
         final Collection<PageDefinition> pageDefinitions = 
config.getPageDefinitions();
-        assertEquals(1, pageDefinitions.size()); // make sure it is parsed 
properly
-        // expected 2 page fragments
+        assertEquals("Expected one page definition", 1, 
pageDefinitions.size());
         final Collection<PageFragment> kids = config.getFragmentDefinitions();
-        assertEquals(3, kids.size());
-        //our fragments should have parent page:
+        assertEquals("expected 3 page fragments", 3, kids.size());
         final Map<String, PageFragment> fragmentDefinitionsMap = 
config.getFragmentDefinitionsMap();
         final PageFragment adminFragment = 
fragmentDefinitionsMap.get("adminPage");
         final PageDefinitionConfig standardPage = definitions.get(0);
         for (PageFragment kid : kids) {
             final PageFragment parent = kid.getParent();
             assertTrue("Expected valid parent, but found null", parent != 
null);
-            // user admin extends adminPage
             if (kid.getName().equals("userAdminPage")) {
-                assertEquals(parent.getName(), adminFragment.getName());
+                assertEquals("Expected that userAdmin extends adminPage", 
parent.getName(), adminFragment.getName());
             } else {
-                assertEquals(parent.getName(), standardPage.getName());
+                assertEquals("Expected that other pages extend standard page", 
parent.getName(), standardPage.getName());
             }
 
-
         }
 
 
@@ -85,7 +80,6 @@ public class FilePageConfigDaoTest {
         }
         assertTrue(standardHeader != null);
         assertTrue(adminKids.contains(standardHeader));
-        // admin footer has a child nodes
         PageFragment adminFooter = null;
         for (PageFragment adminKid : adminKids) {
             if (adminKid.getName().equals("footer")) {
@@ -94,7 +88,7 @@ public class FilePageConfigDaoTest {
             }
         }
 
-        assertTrue(adminFooter != null);
+        assertTrue("Expected that footer has a child nodes", adminFooter != 
null);
         assertEquals(1, adminFooter.getChildren().size());
         final PageFragment userAdminFragment = 
fragmentDefinitionsMap.get("userAdminPage");
         assertEquals(4, userAdminFragment.getChildren().size());
@@ -105,13 +99,13 @@ public class FilePageConfigDaoTest {
     public void testLoadConfigFail() throws Exception {
         PageConfigDao dao = new FilePageConfigDao();
         // this should throw InvalidConfigurationException exception
-        dao.loadConfig(FilePageConfigDao.CLASSPATH_PREFIX + 
"NONE_EXISTING_example_configuration.xml");
+        dao.loadConfig(FileConfigDao.CLASSPATH_PREFIX + 
"NONE_EXISTING_example_configuration.xml");
     }
 
     @Test
     public void testNoParent() throws Exception {
         PageConfigDao dao = new FilePageConfigDao();
-        final PageConfig config = 
dao.loadConfig(FilePageConfigDao.CLASSPATH_PREFIX + 
"example_configuration.xml");
+        final PageConfig config = 
dao.loadConfig(FileConfigDao.CLASSPATH_PREFIX + "example_configuration.xml");
         assertNotNull(config);
         final List<PageDefinitionConfig> definitions = config.getDefinitions();
         final PageDefinitionConfig standardPage = definitions.get(0);