[jbosstools-commits] JBoss Tools SVN: r24470 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/SeamWebWarTestProject/WebContent/WEB-INF and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2010-08-26 09:01:14 -0400 (Thu, 26 Aug 2010)
New Revision: 24470

Modified:
   trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml
   trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/login.page.xml
   trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6360

Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml	2010-08-26 12:58:10 UTC (rev 24469)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/pages.xml	2010-08-26 13:01:14 UTC (rev 24470)
@@ -10,6 +10,12 @@
             <rule if-outcome="home">
                 <redirect view-id="/home.xhtml"/>
             </rule>
+            <rule if-outcome="home1">
+                <redirect view-id="/home1.xhtml"/>
+            </rule>
+            <rule if-outcome="home2">
+                <render view-id="/home2.xhtml"/>
+            </rule>
         </navigation>
     </page>
 

Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/login.page.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/login.page.xml	2010-08-26 12:58:10 UTC (rev 24469)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/login.page.xml	2010-08-26 13:01:14 UTC (rev 24470)
@@ -7,5 +7,8 @@
       <rule if="#{identity.loggedIn}">
          <redirect view-id="/home.xhtml"/>
       </rule>
+      <rule if-outcome="ok">
+         <redirect view-id="/home1.xhtml"/>
+      </rule>
    </navigation>
 </page>
\ No newline at end of file

Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java	2010-08-26 12:58:10 UTC (rev 24469)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java	2010-08-26 13:01:14 UTC (rev 24470)
@@ -813,6 +813,23 @@
 			9);
 	}
 
+	public void testErrorMarkerInPagesXML() throws CoreException, ValidationException {
+		SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project);
+		
+		assertMarkerIsCreatedForLine(
+				seamValidator, 
+				"WebContent/WEB-INF/pages.xml", 
+				SeamValidationMessages.UNRESOLVED_VIEW_ID, 
+				new Object[] {"/home1.xhtml"}, 
+				14);
+		assertMarkerIsCreatedForLine(
+				seamValidator, 
+				"WebContent/WEB-INF/pages.xml", 
+				SeamValidationMessages.UNRESOLVED_VIEW_ID, 
+				new Object[] {"/home2.xhtml"}, 
+				17);
+	}
+
 	public static int getMarkersNumber(IResource resource) {
 		return getMarkersNumberByGroupName(resource, SeamValidationErrorManager.MARKED_SEAM_PROJECT_MESSAGE_GROUP);
 	}