Author: dazarov Date: 2011-08-26 20:46:51 -0400 (Fri, 26 Aug 2011) New Revision: 34349 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java Log: fixed, jsf.ui.tests JSPProblemMarkerResolutionTest failure https://issues.jboss.org/browse/JBIDE-9532 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-08-27 00:18:39 UTC (rev 34348) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2011-08-27 00:46:51 UTC (rev 34349) @@ -34,6 +34,8 @@ org.jboss.tools.vpe.ui.palette, org.eclipse.gef, org.eclipse.pde.ui, - org.eclipse.wst.validation + org.eclipse.wst.validation, + org.eclipse.wst.html.core;bundle-version="1.1.500", + org.eclipse.wst.html.ui;bundle-version="1.0.600" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2011-08-27 00:18:39 UTC (rev 34348) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JSPProblemMarkerResolutionTest.java 2011-08-27 00:46:51 UTC (rev 34349) @@ -1,17 +1,32 @@ package org.jboss.tools.jsf.ui.test; +import java.util.List; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jst.jsp.ui.internal.validation.JSPContentSourceValidator; import org.eclipse.ui.IMarkerResolution; -import org.jboss.tools.common.base.test.validation.TestUtil; +import org.eclipse.wst.html.internal.validation.HTMLValidator; +import org.eclipse.wst.validation.ValidationResult; +import org.eclipse.wst.validation.ValidationState; +import org.eclipse.wst.validation.internal.MarkerManager; +import org.eclipse.wst.validation.internal.core.Message; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.jst.web.ui.action.JSPProblemMarkerResolutionGenerator; import org.jboss.tools.tests.AbstractResourceMarkerTest; public class JSPProblemMarkerResolutionTest extends AbstractResourceMarkerTest{ IProject project = null; + private static final String JSP_MARKER_TYPE = "org.eclipse.jst.jsp.core.validationMarker"; + private static final String XHTML_MARKER_TYPE = "org.eclipse.wst.html.core.validationMarker"; + private static final String JSP_EXT = "jsp"; + private static final String XHTML_EXT = "xhtml"; public JSPProblemMarkerResolutionTest() { super("JSP Problem Marker Resolution Tests"); @@ -25,13 +40,72 @@ protected void setUp() throws Exception { project = ResourcesPlugin.getWorkspace().getRoot().getProject("test_jsf_project"); } - + + private void validate(IFile file) throws CoreException{ + MarkerManager manager = MarkerManager.getDefault(); + + if(JSP_EXT.equals(file.getFileExtension())){ + file.deleteMarkers(JSP_MARKER_TYPE, true, IResource.DEPTH_INFINITE); + JSPContentSourceValidator validator = new JSPContentSourceValidator(); + + ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor()); + + IReporter reporter = result.getReporter(new NullProgressMonitor()); + List messages = reporter.getMessages(); + for(Object m : messages){ + if(m instanceof Message){ + Message message = (Message)m; + IMarker marker = file.createMarker(JSP_MARKER_TYPE); + marker.setAttributes(message.getAttributes()); + marker.setAttribute(IMarker.MESSAGE, message.getText()); + int markerSeverity = IMarker.SEVERITY_INFO; + int sev = message.getSeverity(); + if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR; + else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING; + marker.setAttribute(IMarker.SEVERITY, markerSeverity); + marker.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber()); + marker.setAttribute(IMarker.CHAR_START, message.getOffset()); + marker.setAttribute(IMarker.CHAR_END, message.getOffset()+message.getLength()); + } + } + }else if(XHTML_EXT.equals(file.getFileExtension())){ + file.deleteMarkers(XHTML_MARKER_TYPE, true, IResource.DEPTH_INFINITE); + + HTMLValidator validator = new HTMLValidator(); + + ValidationResult result = validator.validate(file, 0, new ValidationState(), new NullProgressMonitor()); + + IReporter reporter = result.getReporter(new NullProgressMonitor()); + List messages = reporter.getMessages(); + for(Object m : messages){ + if(m instanceof Message){ + Message message = (Message)m; + IMarker marker = file.createMarker(XHTML_MARKER_TYPE); + marker.setAttributes(message.getAttributes()); + marker.setAttribute(IMarker.MESSAGE, message.getText()); + int markerSeverity = IMarker.SEVERITY_INFO; + int sev = message.getSeverity(); + if ((sev & IMessage.HIGH_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_ERROR; + else if ((sev & IMessage.NORMAL_SEVERITY) != 0)markerSeverity = IMarker.SEVERITY_WARNING; + marker.setAttribute(IMarker.SEVERITY, markerSeverity); + marker.setAttribute(IMarker.LINE_NUMBER, message.getLineNumber()); + marker.setAttribute(IMarker.CHAR_START, message.getOffset()); + marker.setAttribute(IMarker.CHAR_END, message.getOffset()+message.getLength()); + } + } + } + } + public void testProblemMarkerResolutionInJSP() throws CoreException { IFile jspFile = project.getFile("WebContent/pages/test_page1.jsp"); + + assertTrue("File must be exists.",jspFile.exists()); + + validate(jspFile); - assertMarkerIsCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag (h:commandButton).", true, 8); + assertMarkerIsCreated(jspFile, JSP_MARKER_TYPE, "Unknown tag (h:commandButton).", true, 8); - IMarker[] markers = findMarkers(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag (h:commandButton)."); + IMarker[] markers = findMarkers(jspFile, JSP_MARKER_TYPE, "Unknown tag (h:commandButton)."); assertEquals(1, markers.length); @@ -45,17 +119,21 @@ } } - TestUtil.validate(jspFile); + validate(jspFile); - assertMarkerIsNotCreated(jspFile, "org.eclipse.jst.jsp.core.validationMarker", "Unknown tag (h:commandButton)."); + assertMarkerIsNotCreated(jspFile, JSP_MARKER_TYPE, "Unknown tag (h:commandButton)."); } public void testProblemMarkerResolutionInXHTML() throws CoreException { IFile jspFile = project.getFile("WebContent/pages/test_page2.xhtml"); + + assertTrue("File must be exists.",jspFile.exists()); + + validate(jspFile); - assertMarkerIsCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag (ui:insert).", true, 8, 17, 31); + assertMarkerIsCreated(jspFile, XHTML_MARKER_TYPE, "Unknown tag (ui:insert).", true, 8, 17, 31); - IMarker[] markers = findMarkers(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag (ui:insert)."); + IMarker[] markers = findMarkers(jspFile, XHTML_MARKER_TYPE, "Unknown tag (ui:insert)."); assertEquals(3, markers.length); @@ -69,8 +147,8 @@ } } - TestUtil.validate(jspFile); + validate(jspFile); - assertMarkerIsNotCreated(jspFile, "org.eclipse.wst.html.core.validationMarker", "Unknown tag (ui:insert)."); + assertMarkerIsNotCreated(jspFile, XHTML_MARKER_TYPE, "Unknown tag (ui:insert)."); } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-27 00:18:39 UTC (rev 34348) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-08-27 00:46:51 UTC (rev 34349) @@ -92,10 +92,10 @@ "org.jboss.tools.jsf.ui.test", new String[]{"projects/test_add_jsf_capabilities"}, new String[]{"test_add_jsf_capabilities"})); -// suite.addTest(new ValidationProjectTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class), -// "org.jboss.tools.jsf.ui.test", -// new String[]{"projects/test_jsf_project"}, -// new String[]{"test_jsf_project"})); + suite.addTest(new ValidationProjectTestSetup(new TestSuite(JSPProblemMarkerResolutionTest.class), + "org.jboss.tools.jsf.ui.test", + new String[]{"projects/test_jsf_project"}, + new String[]{"test_jsf_project"})); suite.addTest( new ProjectImportTestSetup(new TestSuite(TestPalette.class), "org.jboss.tools.jsf.ui.test",