Author: ard
Date: Tue Sep 11 10:42:57 2012
New Revision: 1383342
URL: http://svn.apache.org/viewvc?rev=1383342&view=rev
Log:
RAVE-695 align unit tests with removing of page definition interface
Added:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/
- copied from r1383330,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/noExtensionsPageDefinitions.xml
- copied unchanged from r1383341,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/noExtensionsPageDefinitions.xml
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancingmappings/singlePageExtensionPageDefinitions.xml
- copied unchanged from r1383341,
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/testenhancedmappings/singlePageExtensionPageDefinitions.xml
Removed:
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/EnhancedPagesConfigManagerTest.java
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java?rev=1383342&r1=1383341&r2=1383342&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/java/org/apache/rave/portal/web/mvc/config/EnhancedPagesConfigManagerTest.java
Tue Sep 11 10:42:57 2012
@@ -46,7 +46,7 @@ public class EnhancedPagesConfigManagerT
assertEquals(1, pageFragments.size());
- final PageFragment pageDefinition = pageFragments.get(0);
+ final PageFragment pageDefinition = pageFragments.get("top");
assertEquals("top", pageDefinition.getName());
assertNull(pageDefinition.getExtend());
assertNull(pageDefinition.getViewName());
Modified:
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml?rev=1383342&r1=1383341&r2=1383342&view=diff
==============================================================================
---
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
(original)
+++
rave/sandbox/content-services/rave-web-hmvc/src/test/resources/config/enhanced-pages-config-manager-test.xml
Tue Sep 11 10:42:57 2012
@@ -25,7 +25,7 @@
<constructor-arg>
<bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
<property name="routesPath" value="classpath:routes.xml"/>
- <property name="pageDefinitionsPath"
value="classpath:config/noExtensionsPageDefinitions.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/testenhancingmappings/noExtensionsPageDefinitions.xml"/>
</bean>
</constructor-arg>
</bean>
@@ -34,7 +34,7 @@
<constructor-arg>
<bean
class="org.apache.rave.portal.web.mvc.config.xml.XmlPagesConfigManager">
<property name="routesPath" value="classpath:routes.xml"/>
- <property name="pageDefinitionsPath"
value="classpath:config/singlePageExtensionPageDefinitions.xml"/>
+ <property name="pageDefinitionsPath"
value="classpath:config/testenhancingmappings/singlePageExtensionPageDefinitions.xml"/>
</bean>
</constructor-arg>
</bean>
