Author: scabanovich
Date: 2012-05-04 14:54:50 -0400 (Fri, 04 May 2012)
New Revision: 40801
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
Log:
JBIDE-11782
https://issues.jboss.org/browse/JBIDE-11782
Methods in WebXMLValidationTest are made independent of the order of their execution.
Added:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original
(rev 0)
+++
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml.original 2012-05-04
18:54:50 UTC (rev 40801)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<web-app version="2.5"
xmlns="http://java.sun.com/xml/ns/javaee"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jsf</display-name>
+ <listener>
+ <listener-class>abc</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <!-- <servlet-class>javax.faces.webapp.FacesServlet111</servlet-class>
-->
+ <servlet-class>javax.faces.webapp.FacesServlet111</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+</web-app>
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-05-04
17:36:57 UTC (rev 40800)
+++
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2012-05-04
18:54:50 UTC (rev 40801)
@@ -108,6 +108,9 @@
markers = webxml.findMarkers(WebXMLCoreValidator.PROBLEM_TYPE, false,
IResource.DEPTH_ZERO);
assertTrue(hasMarkerOnLine(markers, 18));
assertFalse(hasMarkerOnLine(markers, 19));
+
+ String patho = "WebContent/WEB-INF/web.xml.original";
+ replaceFile(project, patho, path0);
}
static boolean hasMarkerOnLine(IMarker[] ms, int line) {