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

Author: vrubezhny Date: 2012-01-16 10:01:27 -0500 (Mon, 16 Jan 2012) New Revision: 37864 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java Log: JBIDE-10472 CLONE - XHTML Validator hangs eclipse JUnit Test is added for XHTML/Non-XHTML file detection and validtion Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2012-01-16 14:25:24 UTC (rev 37863) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/XHTMLValidator.java 2012-01-16 15:01:27 UTC (rev 37864) @@ -146,10 +146,10 @@ IDocument doc = resource instanceof IFile ? getDocument((IFile)resource) : null; if (doc == null || !isXHTML(doc)) { - System.out.println("XHTML is NOT Detected: " + resource.getFullPath().toString()); +// System.out.println("XHTML is NOT Detected: " + resource.getFullPath().toString()); return report; } else { - System.out.println("XHTML is Detected: " + resource.getFullPath().toString()); +// System.out.println("XHTML is Detected: " + resource.getFullPath().toString()); } XHTMLElementHandler handler = new XHTMLElementHandler(uri, @@ -194,7 +194,7 @@ return report; } - boolean isXHTML(IDocument document) { + public boolean isXHTML(IDocument document) { XHTMLDetector detector = new XHTMLDetector(new StringReader(document.get())); return detector.detect(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-01-16 14:25:24 UTC (rev 37863) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-01-16 15:01:27 UTC (rev 37864) @@ -28,6 +28,7 @@ import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; import org.jboss.tools.jsf.test.validation.WebContentTest; +import org.jboss.tools.jsf.test.validation.XHTMLDetectorAndValidatorTest; import org.jboss.tools.jsf.test.validation.XHTMLValidatorTest; import org.jboss.tools.jsf.web.validation.XHTMLValidator; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -54,6 +55,7 @@ old.addTestSuite(JSFBeansTest.class); suite.addTestSuite(WebContentTest.class); suite.addTestSuite(XHTMLValidatorTest.class); + suite.addTestSuite(XHTMLDetectorAndValidatorTest.class); suite.addTestSuite(XMLCatalogTest.class); suite.addTestSuite(JSFPaletteTest.class); suite.addTest(new ProjectImportTestSetup(old, Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java 2012-01-16 15:01:27 UTC (rev 37864) @@ -0,0 +1,278 @@ +package org.jboss.tools.jsf.test.validation; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jface.text.Document; +import org.eclipse.jface.text.IDocument; +import org.eclipse.wst.validation.ValidationResult; +import org.eclipse.wst.validation.ValidationState; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.common.util.FileUtil; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.web.validation.XHTMLValidator; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; +import org.osgi.framework.Bundle; + +public class XHTMLDetectorAndValidatorTest extends AbstractResourceMarkerTest { + + protected static String PLUGIN_ID = "org.jboss.tools.jsf.test"; + protected static String PROJECT_NAME = "jsf2pr"; + protected static String PROJECT_PATH = "/projects/jsf2pr"; + + protected static final String XHTML_FILE_NAME = "/XHTMLDetectorAndValidatorTest.xhtml"; + protected static final String HTML_FILE_NAME = "/XHTMLDetectorAndValidatorTest.html"; + + /* + protected static Set<String> LOCALIZED_ERROR_MESSAGES = new HashSet<String>(); + static { + LOCALIZED_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_END_TAG, + XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME)); + LOCALIZED_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_START_TAG, + XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME)); + } + protected static Set<String> LOCALIZED_LARGE_ERROR_MESSAGES = new HashSet<String>(); + static { + LOCALIZED_LARGE_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_END_TAG, + XHTMLValidationTestMessages.XHTML_LARGE_GOOD_TAGNAME)); + LOCALIZED_LARGE_ERROR_MESSAGES.add(MessageFormat.format(JSFValidationMessage.XHTML_VALIDATION_NO_START_TAG, + XHTMLValidationTestMessages.XHTML_LARGE_WRONG_TAGNAME)); + } + protected static String LOCALIZED_BROKEN_ERROR_MESSAGE = XHTMLValidationTestMessages.XHTML_MARKUP_IS_BROKEN_ERROR; + */ + + // "Bad" file validation time should be not greater than "Good" file validation time multiplied by 10 + protected static final double NOT_BAD_DIFF_PERCENTAGE = 1000.0; + + // Each validation session should take less that 1 second (1000ms) + protected static final long MAX_VALIDATION_TIME = 1000; + + protected static final String[] XHTML_FILE_LIST = new String[] { + "/xhtml_page_0.xhtml", + "/xhtml_page_1.xhtml", + "/xhtml_page_2.xhtml" + }; + protected static final String[] HTML_FILE_LIST = new String[] { + "/html_page_0.html", + "/html_page_1.html", + "/html_page_2.html" + }; + + + IProject project; + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + if(!project.exists()) { + project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + } + TestUtil._waitForValidation(project); + } + + public void testXHTMLDetectorAndValidator() throws CoreException { + XHTMLValidator validator = new XHTMLValidator(); + ValidationState state = new ValidationState(); + try { + // Detect and Validate on XHTML Content + for (String source : XHTML_FILE_LIST) { + IFile file = createTestFile(source, XHTML_FILE_NAME); + IDocument document = getDocument(file); + + long start = System.currentTimeMillis(); + boolean xhtmlDetected = validator.isXHTML(document); + long total = System.currentTimeMillis() - start; + System.out.println("XHTML file [Source: " + source + "] detection time: " + total + " ms"); + assertTrue("XHTML file [Source: " + source + "] detection FAILED", xhtmlDetected); + + start = System.currentTimeMillis(); + ValidationResult result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + total = System.currentTimeMillis() - start; + System.out.println("XHTML file [Source: " + source + "] validation time: " + total + " ms"); + assertTrue("XHTML file [Source: " + source + "] validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (total < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + List messages = result.getReporter(null).getMessages(); + System.out.println("Total error messages reported by XHTML file [Source: " + source + "] validation: " + (messages == null ? 0 : messages.size())); + } + } finally { + removeTestFile(XHTML_FILE_NAME); + } + + try { + // Detect and Validate on NON-XHTML Content + for (String source : HTML_FILE_LIST) { + IFile file = createTestFile(source, HTML_FILE_NAME); + IDocument document = getDocument(file); + + long start = System.currentTimeMillis(); + boolean xhtmlDetected = validator.isXHTML(document); + long total = System.currentTimeMillis() - start; + System.out.println("Non-XHTML file [Source: " + source + "] detection time: " + total + " ms"); + assertFalse("Non-XHTML file [Source: " + source + "] detection FAILED", xhtmlDetected); + + start = System.currentTimeMillis(); + ValidationResult result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + total = System.currentTimeMillis() - start; + System.out.println("Non-XHTML file [Source: " + source + "] validation time: " + total + " ms"); + assertTrue("Non-XHTML file [Source: " + source + "] validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (total < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + List messages = result.getReporter(null).getMessages(); + System.out.println("Total error messages reported by Non-XHTML file [Source: " + source + "] validation: " + (messages == null ? 0 : messages.size())); + assertEquals("Wrong number of error messages reported", 0, messages == null ? 0 : messages.size()); + } + } finally { + removeTestFile(HTML_FILE_NAME); + } + + /* + + long start = System.currentTimeMillis(); + ValidationResult result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + long goodValidationTime = System.currentTimeMillis() - start; + System.out.println("XHTML file with good DOCTYPE declaration and no XHTML Syntax errors validation time: " + goodValidationTime + " ms"); + assertTrue("XHTML file with good DOCTYPE declaration and no XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (goodValidationTime < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + List messages = result.getReporter(null).getMessages(); + assertEquals("Wrong number of error messages reported", 0, messages == null ? 0 : messages.size()); + + // Validate file with bad DOCTYPE declaration and no XHTML Syntax errors + file = createTestFile(XHTMLValidationTestMessages.XHTML_CONTENT_TEMPLATE, + XHTMLValidationTestMessages.XHTML_WRONG_PUBLIC_ID, XHTMLValidationTestMessages.XHTML_WRONG_URI, + XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME, XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME); + start = System.currentTimeMillis(); + result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + long badValidationTime = System.currentTimeMillis() - start; + System.out.println("XHTML file with bad DOCTYPE declaration and no XHTML Syntax errors validation time: " + badValidationTime + " ms"); + assertTrue("XHTML file with bad DOCTYPE declaration and no XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (badValidationTime < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + messages = result.getReporter(null).getMessages(); + assertEquals("Wrong number of error messages reported", 0, messages == null ? 0 : messages.size()); + + // Check that the difference between good and bad files validation time is not greater that NOT_BAD_DIFF_PERCENTAGE (%) of a good value + double diff = 100*badValidationTime/goodValidationTime; + System.out.println("(With no errors) Validation time difference: " + diff + "%"); + assertTrue("Validation time difference between good and wrong content is greater than " + NOT_BAD_DIFF_PERCENTAGE + "%", (diff < NOT_BAD_DIFF_PERCENTAGE)); + + // Validate file with good DOCTYPE declaration and XHTML Syntax errors + file = createTestFile(XHTMLValidationTestMessages.XHTML_CONTENT_TEMPLATE, + XHTMLValidationTestMessages.XHTML_GOOD_PUBLIC_ID, XHTMLValidationTestMessages.XHTML_GOOD_URI, + XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME, XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME); + start = System.currentTimeMillis(); + result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + goodValidationTime = System.currentTimeMillis() - start; + System.out.println("XHTML file with good DOCTYPE declaration and XHTML Syntax errors validation time: " + goodValidationTime + " ms"); + assertTrue("XHTML file with good DOCTYPE declaration and XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (goodValidationTime < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + messages = result.getReporter(null).getMessages(); + assertEquals("Wrong number of error messages reported", 2, messages == null ? 0 : messages.size()); + for (Object m : messages) { + assertTrue("Wrong type of validation message is returned", (m instanceof Message)); + Message message = (Message)m; + assertTrue("Unexpected error message found: " + message.getText(), LOCALIZED_ERROR_MESSAGES.contains(message.getText())); + } + + // Validate file with bad DOCTYPE declaration and XHTML Syntax errors + file = createTestFile(XHTMLValidationTestMessages.XHTML_CONTENT_TEMPLATE, + XHTMLValidationTestMessages.XHTML_WRONG_PUBLIC_ID, XHTMLValidationTestMessages.XHTML_WRONG_URI, + XHTMLValidationTestMessages.XHTML_GOOD_TAGNAME, XHTMLValidationTestMessages.XHTML_WRONG_TAGNAME); + start = System.currentTimeMillis(); + result = validator.validate(file, IResourceDelta.CHANGED, state, new NullProgressMonitor()); + badValidationTime = System.currentTimeMillis() - start; + System.out.println("XHTML file with bad DOCTYPE declaration and XHTML Syntax errors validation time: " + badValidationTime + " ms"); + assertTrue("XHTML file with bad DOCTYPE declaration and XHTML Syntax errors validation takes too much time (more than " + MAX_VALIDATION_TIME + " ms)", (badValidationTime < MAX_VALIDATION_TIME)); + assertNotNull("No validation result is returned", result); + assertNotNull("No validation result is returned", result.getReporter(null)); + messages = result.getReporter(null).getMessages(); + assertEquals("Wrong number of error messages reported", 2, messages == null ? 0 : messages.size()); + for (Object m : messages) { + assertTrue("Wrong type of validation message is returned", (m instanceof Message)); + Message message = (Message)m; + assertTrue("Unexpected error message found: " + message.getText(), LOCALIZED_ERROR_MESSAGES.contains(message.getText())); + } + // Check that the difference between good and bad files validation time is not greater that NOT_BAD_DIFF_PERCENTAGE (%) of a good value + diff = 100*badValidationTime/goodValidationTime; + System.out.println("(With errors) Validation time difference: " + diff + "%"); + assertTrue("Validation time difference between good and wrong content is greater than " + NOT_BAD_DIFF_PERCENTAGE + "%", (diff < NOT_BAD_DIFF_PERCENTAGE)); + } finally { + removeTestFile(); + } + */ + } + + private static final String SOURCE_FOLDER = "/resources/pages2validate"; + private static final String WEB_CONTENT_SUFFIX = "/WebContent"; + + private IFile createTestFile(String sourceFile, String destinationFile) { + IFile testFile = project.getFile(WEB_CONTENT_SUFFIX + destinationFile); + + try { + Bundle b = Platform.getBundle(PLUGIN_ID); + IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); + String projectPath = p.getLocation().toOSString(); + String resourcePath = FileLocator.resolve(b.getEntry(SOURCE_FOLDER)).getFile(); + + File from = new File(resourcePath + sourceFile); + File to = new File(projectPath + WEB_CONTENT_SUFFIX + destinationFile); + FileUtil.clear(to); + if (!FileUtil.copyFile(from, to)) { + return null; + } + p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + TestUtil._waitForValidation(p); + } catch (IOException e) { + fail(e.getLocalizedMessage()); + } catch (CoreException e) { + fail(e.getLocalizedMessage()); + } + return testFile; + } + + private void removeTestFile(String destinationFile) { + IFile testFile = project.getFile(WEB_CONTENT_SUFFIX + destinationFile); + if (testFile.exists()) { + try { + testFile.delete(true, new NullProgressMonitor()); + } catch (CoreException e) { + // Do not throw the exception + e.printStackTrace(); + } + } + } + + private IDocument getDocument(IFile file) { + if (file == null) { + return null; + } + + String content; + try { + content = FileUtil.readStream(file); + } catch (CoreException e) { + JSFModelPlugin.getDefault().logError(e); + return null; + } + + return (content == null ? null : new Document(content)); + } + + +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/XHTMLDetectorAndValidatorTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain