Author: dgolovin Date: 2011-08-01 17:10:20 -0400 (Mon, 01 Aug 2011) New Revision: 33422 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java Log: performance fix for seam configuration validation test: 1. Minimal project without optional resources 2. Unnecessary waitForIdele deleted 3. Markers are searched only for project resource because there is no reason to search seam configuration errors somewhere else Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="build/classes"/> +</classpath> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>SeamConfigValidatorsTest</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.jst.web.kb.kbbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.jboss.tools.seam.core.seambuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.jboss.tools.jst.web.kb.kbnature</nature> + <nature>org.jboss.tools.jsf.jsfnature</nature> + <nature>org.jboss.tools.seam.core.seamnature</nature> + </natures> +</projectDescription> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,8 @@ +#Mon Aug 01 11:38:21 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="SeamConfigValidatorsTest"> + <wb-resource deploy-path="/" source-path="/WebContent"/> + <wb-resource deploy-path="/WEB-INF/dev" source-path="/src/hot"/> + <property name="context-root" value="SeamConfigValidatorsTest"/> + <property name="java-output-path" value="/SeamConfigValidatorsTest/build/classes"/> + </wb-module> +</project-modules> Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,7 @@ +<root> + <facet id="jst.jsf"> + <node name="libprov"> + <attribute name="provider-id" value="jsf-no-op-library-provider"/> + </node> + </facet> +</root> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <runtime name="JBoss 5.1 Runtime"/> + <fixed facet="jst.web"/> + <fixed facet="wst.jsdt.web"/> + <fixed facet="java"/> + <installed facet="jst.web" version="2.5"/> + <installed facet="jst.jsf" version="1.2"/> + <installed facet="jst.seam" version="2.2"/> + <installed facet="wst.jsdt.web" version="1.0"/> + <installed facet="java" version="1.6"/> +</faceted-project> Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs 2011-08-01 21:10:20 UTC (rev 33422) @@ -0,0 +1,15 @@ +#Mon Aug 01 11:33:26 PDT 2011 +action.package=org.domain.seamconfigvalidatorstest.session +action.sources=/SeamConfigValidatorsTest/src/hot +eclipse.preferences.version=1 +model.package=org.domain.seamconfigvalidatorstest.entity +model.sources=/SeamConfigValidatorsTest/src/main +seam.project.connection.profile=DefaultDS +seam.project.deployment.type=war +seam.project.settings.version=1.1 +seam.project.web.root.folder=/SeamConfigValidatorsTest +seam.runtime.name=Unknown +seam.test.creating=false +seam.test.project=SeamConfigValidatorsTest-test +test.package=org.domain.seamconfigvalidatorstest.test +test.sources=/SeamConfigValidatorsTest-test/test-src Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java 2011-08-01 18:59:35 UTC (rev 33421) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java 2011-08-01 21:10:20 UTC (rev 33422) @@ -38,7 +38,7 @@ public class JBide3989Test extends TestCase { private IProject project; - private static final String PROJECT_NAME = "TestSeamELContentAssist"; + private static final String PROJECT_NAME = "SeamConfigValidatorsTest"; private boolean makeCopy = true; public static Test suite() { @@ -47,14 +47,11 @@ @Override protected void setUp() throws Exception { - super.setUp(); TestProjectProvider provider = new TestProjectProvider( "org.jboss.tools.seam.ui.test", null, PROJECT_NAME, makeCopy); project = provider.getProject(); - project.refreshLocal(IResource.DEPTH_INFINITE, null); - JobUtils.waitForIdle(); - ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); - seamProject.setRuntimeName("UNKNOWN"); +// ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); +// seamProject.setRuntimeName("UNKNOWN"); ValidatorManager.addProjectBuildValidationSupport(project); // JBIDE-4832 - call SeamProjectPropertyValidator manually project.build(IncrementalProjectBuilder.FULL_BUILD, @@ -64,19 +61,17 @@ } @Override - protected void tearDown() throws Exception { - JobUtils.waitForIdle(); - boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + protected void tearDown() { try { - project.delete(true, true, null); - } finally { - ResourcesUtils.setBuildAutomatically(saveAutoBuild); + project.delete(false, true, null); + } catch (CoreException e) { + e.printStackTrace(); } } public void testJBide3989() throws CoreException { IMarker[] markers = project.findMarkers(IMarker.PROBLEM, true, - IResource.DEPTH_INFINITE); + IResource.DEPTH_ZERO); boolean found1 = false; boolean found2 = false; for (int i = 0; i < markers.length; i++) { @@ -87,8 +82,7 @@ IMarkerResolution resolution = resolutions[j]; if (resolution instanceof SeamRuntimeMarkerResolution) { found1 = true; - } - if (resolution instanceof AddNewSeamRuntimeMarkerResolution) { + } else if (resolution instanceof AddNewSeamRuntimeMarkerResolution) { found2 = true; } }