Author: ard
Date: Tue Sep 11 10:36:58 2012
New Revision: 1383341
URL: http://svn.apache.org/viewvc?rev=1383341&view=rev
Log:
RAVE-695 align unit tests with removing of page definition interface
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java?rev=1383341&r1=1383340&r2=1383341&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/xml/JaxbMappingsTest.java
Tue Sep 11 10:36:58 2012
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
public class JaxbMappingsTest {
- final static String TEST_CONFIG_PATH_JAXB_MAPPINGS = "jaxbmappings";
+ final static String TEST_CONFIG_PATH_JAXB_MAPPINGS = "config/xml";
@Test
public void testSinglePageDefintion() {
String testSrc = "singlePageDefinition.xml";
@@ -47,7 +47,6 @@ public class JaxbMappingsTest {
assertEquals("default", xmlPageDefinitions.getName());
assertEquals(1, xmlPageDefinitions.getPageFragments().size());
- assertNull("There should be no standalone fragments in '" +
testSrc + "'.", xmlPageDefinitions.getPageFragments());
final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
assertEquals("top", pageFragment.getName());
@@ -123,7 +122,6 @@ public class JaxbMappingsTest {
assertEquals("default", xmlPageDefinitions.getName());
assertEquals(2, xmlPageDefinitions.getPageFragments().size());
- assertNull("There should be no standalone fragments in
'"+testSrc+"'.", xmlPageDefinitions.getPageFragments());
{
final PageFragment pageFragment =
xmlPageDefinitions.getPageFragments().get(0);
@@ -151,8 +149,7 @@ public class JaxbMappingsTest {
assertNotNull(xmlPageDefinitions);
assertEquals("default", xmlPageDefinitions.getName());
- assertEquals(2, xmlPageDefinitions.getPageFragments().size());
- assertEquals(2, xmlPageDefinitions.getPageFragments().size());
+ assertEquals(4, xmlPageDefinitions.getPageFragments().size());
final PageFragment pageFragment1 =
xmlPageDefinitions.getPageFragments().get(0);
final PageFragment pageFragment2 =
xmlPageDefinitions.getPageFragments().get(0);
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml?rev=1383341&r1=1383340&r2=1383341&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
Tue Sep 11 10:36:58 2012
@@ -21,7 +21,7 @@
<!--
STANDARD PAGE (HAS NO PARENT)
-->
- <pageDefinition name="top" description="Page that is being extended by other
pages"
+ <pageFragment name="top" description="Page that is being extended by other
pages"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub1-nocontroller"/>
<pageFragment name="sub2-emptycontrollor" controller="">
@@ -30,6 +30,6 @@
<pageFragment name="sub3-withcontroller-withview" viewName="pages/test"
controller="org.apache.rave.unittest.NonExistingController">
<pageFragment name="sub3sub1-withextend" extend="some/fragment"
controller="org.apache.rave.unittest.NonExistingController"/>
</pageFragment>
- </pageDefinition>
+ </pageFragment>
</pageDefinitions>
\ No newline at end of file
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml?rev=1383341&r1=1383340&r2=1383341&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
Tue Sep 11 10:36:58 2012
@@ -51,8 +51,4 @@
</pageFragment>
</pageFragment>
-
-
-
-
</pageDefinitions>
\ No newline at end of file
