Author: akazakov Date: 2011-08-22 19:05:30 -0400 (Mon, 22 Aug 2011) New Revision: 34154 Added: trunk/common/tests/org.jboss.tools.common.validation.test/ trunk/common/tests/org.jboss.tools.common.validation.test/.classpath trunk/common/tests/org.jboss.tools.common.validation.test/.project trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/ trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF trunk/common/tests/org.jboss.tools.common.validation.test/build.properties trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml trunk/common/tests/org.jboss.tools.common.validation.test/projects/ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.classpath trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.project trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/bin/ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/test/ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/test/Test.java trunk/common/tests/org.jboss.tools.common.validation.test/src/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java Modified: trunk/common/tests/pom.xml Log: JBIDE-6153 Added: trunk/common/tests/org.jboss.tools.common.validation.test/.classpath =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/.classpath (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/.classpath 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/common/tests/org.jboss.tools.common.validation.test/.project =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/.project (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/.project 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.common.validation.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/META-INF/MANIFEST.MF 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,18 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Common Validation Test +Bundle-SymbolicName: org.jboss.tools.common.validation.test;singleton:=true +Bundle-Version: 3.3.0.qualifier +Bundle-Vendor: JBoss by Red Hat +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.jboss.tools.tests, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.junit, + org.jboss.tools.common.validation, + org.eclipse.jdt.core, + org.eclipse.wst.validation, + org.jboss.tools.common, + org.jboss.tools.common.base.test, + org.eclipse.ui +Export-Package: org.jboss.tools.common.validation.test Added: trunk/common/tests/org.jboss.tools.common.validation.test/build.properties =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/build.properties (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/build.properties 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + .,\ + plugin.xml,\ + build.properties,\ + projects/ Added: trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.0"?> +<plugin> + <extension + id="TestValidator" + point="org.jboss.tools.common.validation.validator"> + <validator + class="org.jboss.tools.common.validation.test.TestValidator" + name="TestValidator" + id="org.jboss.common.validation.test.TestValidator"> + </validator> + </extension> +</plugin> Added: trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/pom.xml 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.common</groupId> + <artifactId>tests</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.common.tests</groupId> + <artifactId>org.jboss.tools.common.validation.test</artifactId> + + <packaging>eclipse-test-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <configuration> + <product>org.jboss.tools.tests.product</product> + <explodedBundles> + <bundle>org.jboss.tools.common.validation.test</bundle> + </explodedBundles> + </configuration> + </plugin> + </plugins> + </build> + +</project> Added: trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.classpath =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.classpath (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.classpath 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.project =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.project (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/.project 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>JavaProject</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/test/Test.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/test/Test.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/projects/JavaProject/src/test/Test.java 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,5 @@ +package test; + +public class Test { + +} \ No newline at end of file Added: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.validation.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.common.base.test.validation.ValidationExceptionTest; +import org.jboss.tools.test.util.ProjectImportTestSetup; + +/** + * @author Alexey Kazakov + */ +public class CommonValidationAllTests { + + public static Test suite() { + // it could be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + + ValidationExceptionTest.initLogger(); + + TestSuite suiteAll = new TestSuite("Common Validation Tests"); + + TestSuite suite = new TestSuite(ValidationTest.class.getName()); + suite.addTestSuite(ValidationTest.class); + + ProjectImportTestSetup testSetup = new ProjectImportTestSetup(suite, + "org.jboss.tools.common.validation.test", + new String[]{"projects/JavaProject"}, + new String[]{"JavaProject"}); + suiteAll.addTest(testSetup); + + return suiteAll; + } +} \ No newline at end of file Added: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestValidator.java 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,103 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.validation.test; + +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.validation.internal.core.ValidationException; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.common.preferences.SeverityPreferences; +import org.jboss.tools.common.validation.ContextValidationHelper; +import org.jboss.tools.common.validation.IProjectValidationContext; +import org.jboss.tools.common.validation.IValidatingProjectTree; +import org.jboss.tools.common.validation.IValidator; +import org.jboss.tools.common.validation.ValidationErrorManager; +import org.jboss.tools.common.validation.ValidatorManager; +import org.jboss.tools.common.validation.internal.SimpleValidatingProjectTree; + +/** + * @author Alexey Kazakov + */ +public class TestValidator extends ValidationErrorManager implements IValidator { + + @Override + public IStatus validate(Set<IFile> changedFiles, IProject project, + ContextValidationHelper validationHelper, + IProjectValidationContext validationContext, + ValidatorManager manager, IReporter reporter) + throws ValidationException { + init(project, validationHelper, validationContext, manager, reporter); + + validate(); + + return OK_STATUS; + } + + @Override + public IStatus validateAll(IProject project, + ContextValidationHelper validationHelper, + IProjectValidationContext validationContext, + ValidatorManager manager, IReporter reporter) + throws ValidationException { + init(project, validationHelper, validationContext, manager, reporter); + + validate(); + + return OK_STATUS; + } + + private void validate() { + throw new RuntimeException("Test excpetion"); + } + + @Override + public String getId() { + return "org.jboss.common.validation.test.TestValidator"; + } + + @Override + public String getBuilderId() { + return null; + } + + @Override + public IValidatingProjectTree getValidatingProjects(IProject project) { + return new SimpleValidatingProjectTree(project); + } + + @Override + public boolean shouldValidate(IProject project) { + return true; + } + + @Override + public boolean isEnabled(IProject project) { + return true; + } + + @Override + protected String getPreference(IProject project, String preferenceKey) { + return SeverityPreferences.WARNING; + } + + @Override + public int getMaxNumberOfMarkersPerFile(IProject project) { + return 20; + } + + @Override + public String getMarkerType() { + return ValidationErrorManager.DEFAULT_VALIDATION_MARKER; + } +} \ No newline at end of file Added: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java 2011-08-22 23:05:30 UTC (rev 34154) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.validation.test; + +import java.util.Set; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IStatus; +import org.jboss.tools.common.base.test.validation.TestUtil; +import org.jboss.tools.common.base.test.validation.ValidationExceptionTest; +import org.jboss.tools.common.validation.CommonValidationPlugin; +import org.jboss.tools.common.validation.JBTValidationException; + +/** + * @author Alexey Kazakov + */ +public class ValidationTest extends ValidationExceptionTest { + + @Override + public void testExceptions() throws Exception { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("JavaProject"); + TestUtil._waitForValidation(project); + Set<IStatus> exceptions = LOGGER.getExceptions(); + assertFalse(exceptions.isEmpty()); + } + + @Override + public void testLogger() { + initLogger(); + CommonValidationPlugin.getDefault().logError(new JBTValidationException("Test logger", null)); + Set<IStatus> exceptions = LOGGER.getExceptions(); + assertEquals(1, exceptions.size()); + } +} \ No newline at end of file Modified: trunk/common/tests/pom.xml =================================================================== --- trunk/common/tests/pom.xml 2011-08-22 22:58:39 UTC (rev 34153) +++ trunk/common/tests/pom.xml 2011-08-22 23:05:30 UTC (rev 34154) @@ -15,6 +15,7 @@ <module>org.jboss.tools.common.model.test</module> <module>org.jboss.tools.common.model.ui.test</module> <module>org.jboss.tools.common.test</module> + <module>org.jboss.tools.common.validation.test</module> <module>org.jboss.tools.common.verification.test</module> <module>org.jboss.tools.common.verification.ui.test</module> </modules>