[jbosstools-commits] JBoss Tools SVN: r37307 - in trunk/jst/tests/org.jboss.tools.jst.web.test: src/org/jboss/tools/jst/web/test and 1 other directory.
Author: scabanovich
Date: 2011-12-13 20:20:58 -0500 (Tue, 13 Dec 2011)
New Revision: 37307
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java
Log:
JBIDE-10448
https://issues.jboss.org/browse/JBIDE-10448
Test is added.
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml
===================================================================
---
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml 2011-12-14
01:04:29 UTC (rev 37306)
+++
trunk/jst/tests/org.jboss.tools.jst.web.test/projects/testWebProject/WebContent/WEB-INF/web.xml 2011-12-14
01:20:58 UTC (rev 37307)
@@ -5,4 +5,10 @@
<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 2011-12-14
01:04:29 UTC (rev 37306)
+++
trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebXMLValidationTest.java 2011-12-14
01:20:58 UTC (rev 37307)
@@ -19,12 +19,15 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.base.test.validation.TestUtil;
import org.jboss.tools.common.validation.ValidatorManager;
import org.jboss.tools.jst.web.validation.WebXMLCoreValidator;
+import org.jboss.tools.jst.web.validation.WebXMLValidatorMessages;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ProjectImportTestSetup;
import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
/**
* @author Alexey Kazakov
@@ -44,6 +47,15 @@
}
/**
+ * Test position of marker when comments contain textually matching fragments.
+ */
+ public void testServletClassWithIdenticalComments() throws Exception {
+ String path0 = "WebContent/WEB-INF/web.xml";
+ IFile webxml = project.getFile(path0);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(webxml,
NLS.bind(WebXMLValidatorMessages.CLASS_NOT_EXISTS, "servlet-class",
"javax.faces.webapp.FacesServlet111"), 11);
+ }
+
+ /**
* See JBIDE-10161
* @throws Exception
*/
@@ -75,6 +87,10 @@
assertTrue(markers.length == 0);
}
+ /**
+ * Tests incremental validation
+ * @throws Exception
+ */
public void testPathsInLoginConfig() throws Exception {
String path0 = "WebContent/WEB-INF/web.xml";
IFile webxml = project.getFile(path0);