[jbosstools-commits] JBoss Tools SVN: r25870 - in trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf: test/validation and 1 other directory.

Author: akazakov Date: 2010-10-15 11:21:06 -0400 (Fri, 15 Oct 2010) New Revision: 25870 Removed: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java Log: https://jira.jboss.org/browse/JBIDE-7147 Limited the number of problem markers per file. Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2010-10-15 14:58:37 UTC (rev 25869) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/ELValidatorTest.java 2010-10-15 15:21:06 UTC (rev 25870) @@ -26,7 +26,7 @@ public class ELValidatorTest extends AbstractResourceMarkerTest{ public static final String MARKER_TYPE = "org.eclipse.wst.validation.problemmarker"; - + protected void setUp() throws Exception { // JobUtils.waitForIdle(); project = ResourcesPlugin.getWorkspace().getRoot().getProject("JSFKickStartOldFormat"); @@ -43,16 +43,16 @@ try { copyContentsFile("WebContent/WEB-INF/faces-config.xml", "WebContent/WEB-INF/faces-config.1"); - + assertMarkerIsCreatedForLine( "WebContent/testElRevalidation.xhtml", JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[] {"user"}, 14); - + // Check if the validator was not invoked. copyContentsFile("WebContent/WEB-INF/faces-config.xml", "WebContent/WEB-INF/faces-config.original"); - + assertMarkerIsNotCreatedForLine( "WebContent/testElRevalidation.xhtml", JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, @@ -71,7 +71,7 @@ try { copyContentsFile("WebContent/WEB-INF/faces-config.xml", "WebContent/WEB-INF/faces-config.1"); - + assertMarkerIsCreatedForLine( "WebContent/testElRevalidation.xhtml", JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, @@ -144,9 +144,9 @@ JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[] {"wrongUserName2"}, 4); - + store.setValue(SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME, max); - + assertMarkerIsCreatedForLine( "WebContent/pages/maxNumberOfMarkers.jsp", JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, @@ -233,7 +233,7 @@ private void assertMarkerIsCreatedForLine(String fileName, String template, Object[] parameters, int lineNumber) throws CoreException{ String messagePattern = MessageFormat.format(template, parameters); IFile file = project.getFile(fileName); - + ValidationFramework.getDefault().validate(file, new NullProgressMonitor()); IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE); @@ -249,7 +249,7 @@ private void assertMarkerIsNotCreatedForLine(String fileName, String template, Object[] parameters, int lineNumber) throws CoreException{ String messagePattern = MessageFormat.format(template, parameters); IFile file = project.getFile(fileName); - + ValidationFramework.getDefault().validate(file, new NullProgressMonitor()); IMarker[] markers = file.findMarkers(null, true, IResource.DEPTH_INFINITE);