[jbosstools-commits] JBoss Tools SVN: r22842 - in trunk: seam/tests/org.jboss.tools.seam.core.test and 18 other directories.

Author: dgolovin Date: 2010-06-17 02:43:13 -0400 (Thu, 17 Jun 2010) New Revision: 22842 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithAbcField.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/IValidatorSupport.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectProbertyValidatorWrapper.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java Removed: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.core.test/build.properties trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.project trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/build.properties trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for seam tests Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-06-17 06:43:13 UTC (rev 22842) @@ -3,7 +3,6 @@ id="org.jboss.tools.seam.feature" label="%featureName" version="3.1.0.qualifier" - provider-name="%providerName" plugin="org.jboss.tools.seam.core"> @@ -19,14 +18,7 @@ %license </license> - <!-- - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/&qu... - </url> - --> - <requires> - <import feature="org.jboss.tools.richfaces.feature" version="3.1.0" match="greaterOrEqual"/> <import feature="org.jboss.ide.eclipse.as.feature" version="1.0.0" match="greaterOrEqual"/> <import feature="org.hibernate.eclipse.feature" version="3.2.0" match="greaterOrEqual"/> <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.1" match="greaterOrEqual"/> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2010-06-17 06:43:13 UTC (rev 22842) @@ -3,7 +3,6 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.seam.core.test;singleton:=true Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: seam-core-tests.jar Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.seam.core.test, org.jboss.tools.seam.core.test.project.facet, @@ -26,6 +25,14 @@ org.eclipse.text, org.eclipse.jdt.core.manipulation, org.jboss.tools.common.el.core, - org.eclipse.jst.common.project.facet.core;bundle-version="1.4.1" + org.eclipse.jst.jee.web;bundle-version="1.0.201", + org.eclipse.jpt.core;bundle-version="2.2.1", + org.eclipse.jst.jsp.core;bundle-version="1.2.204", + org.eclipse.wst.validation.ui;bundle-version="1.2.104", + org.jboss.tools.common.el.core, + org.eclipse.jst.common.project.facet.core;bundle-version="1.4.1", + org.jboss.tools.vpe;bundle-version="3.1.0", + org.jboss.tools.jst.jsp;bundle-version="3.1.0", + org.jboss.tools.jsf.text.ext.richfaces;bundle-version="3.1.0" Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/build.properties 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/build.properties 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,18 +1,17 @@ bin.includes = META-INF/,\ - seam-core-tests.jar,\ projects/,\ info.xml,\ seam/,\ about.html,\ ant.properties,\ - plugin.properties -src.includes = META-INF/,\ - ant.properties,\ - build.properties,\ + plugin.properties,\ + . +src.includes = ant.properties,\ info.xml,\ src/,\ projects/,\ seam/,\ about.html -source.seam-core-tests.jar = src/ -jars.compile.order = seam-core-tests.jar +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,14 +1,64 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> <parent> - <relativePath>../../../parent-pom.xml</relativePath> - <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <relativePath>../../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.seam.core.test</artifactId> + <artifactId>org.jboss.tools.seam.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbeap,eapseamgen,seamfp,seam-2.0.1.GA,seam-2.1.1.GA</requirements> + <projectRoot>${basedir}/../../..</projectRoot> + <requirements.build>${projectRoot}/requirements/target</requirements.build> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <skip>false</skip> + <explodedBundles> + <bundle>org.jboss.tools.seam.core.test</bundle> + <bundle>org.jboss.tools.seam.core</bundle> + </explodedBundles> + <product>org.jboss.tools.tests</product> + <argLine>-Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/SeamValidatorsAllTests.class</include> + <include>org/jboss/tools/seam/core/test/SeamCoreAllTests.class</include> + <include>org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.class</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>prepare-eclipse-base</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant dir="${projectRoot}/requirements" inheritAll="true"> + <property name="requirements" value="${requirements}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.project =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.project 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/.project 2010-06-17 06:43:13 UTC (rev 22842) @@ -6,11 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -21,16 +16,6 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.jboss.tools.common.verification.verifybuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.jboss.tools.jst.web.kb.kbbuilder</name> <arguments> </arguments> @@ -51,7 +36,6 @@ <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.jboss.tools.jsf.jsfnature</nature> <nature>org.jboss.tools.seam.core.seamnature</nature> <nature>org.jboss.tools.jst.web.kb.kbnature</nature> Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/WEB-INF/components.3 2010-06-17 06:43:13 UTC (rev 22842) @@ -12,7 +12,7 @@ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-1.2.xsd http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd"> - <component class="org.domain.SeamWebWarTestProject.session.StatefulComponent" scope="application"> + <component class="org.domain.SeamWebWarTestProject.session.StatefulComponentWithAbcField" scope="application"> <property name="abc">value1</property> </component> Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,25 +0,0 @@ -package org.domain.SeamWebWarTestProject.session; - -import java.util.ArrayList; -import java.util.List; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.datamodel.DataModel; -import org.jboss.seam.log.Log; -import org.jboss.seam.core.FacesMessages; - -@Name("component12") -public class Component12 { - @Factory("testFactory1") - public String getComp() { - return ""; - } - - @Factory("testFactory1") - public String getComp2() { - return ""; - } -} \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1 =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1 (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,25 @@ +package org.domain.SeamWebWarTestProject.session; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.datamodel.DataModel; +import org.jboss.seam.log.Log; +import org.jboss.seam.core.FacesMessages; + +(a)Name(&quot;duplicate.factory.component12&quot;) +public class DuplicateFactory { + @Factory("testFactory1") + public String getComp() { + return ""; + } + + @Factory("testFactory1") + public String getComp2() { + return ""; + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1 ___________________________________________________________________ Name: svn:executable + * Copied: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java (from rev 22821, trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory) =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,25 @@ +package org.domain.SeamWebWarTestProject.session; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.datamodel.DataModel; +import org.jboss.seam.log.Log; +import org.jboss.seam.core.FacesMessages; + +(a)Name(&quot;duplicate.factory.component12&quot;) +public class DuplicateFactory { + @Factory("testFactory1") + public String getComp() { + return ""; + } + + @Factory("testFactory2") + public String getComp2() { + return ""; + } +} \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new 2010-06-17 06:43:13 UTC (rev 22842) @@ -11,7 +11,7 @@ @Name("factoryTestName") public class FactoryTest { - @DataModel("somethings") + @DataModel("somethings1") @Out private List<String> somethingList; Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithAbcField.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithAbcField.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithAbcField.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,42 @@ +package org.domain.SeamWebWarTestProject.session; + +import javax.ejb.Remove; +import javax.ejb.Stateful; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.log.Log; + +@Name("statefulComponentWithAbcField") + +@Stateful +(a)Scope(ScopeType.APPLICATION) +public class StatefulComponentWithAbcField { + + @Logger private Log log; + + + //seam-gen method + public String statefulComponent() + { + //implement your business logic here + log.info("statefulComponent.statefulComponent() action called"); + return "success"; + } + + //add additional action methods + @Destroy + public void destroyMethod(){ + + } + + + @Remove + public void removeMethod(){ + + } + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/SeamWebWarTestProject/session/StatefulComponentWithAbcField.java ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/ScannerTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -19,6 +19,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.seam.core.BeanType; @@ -59,12 +60,14 @@ } protected void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.seam.core.test", - null,"TestScanner" ,true); - project = provider.getProject(); + project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestScanner"); + if(!project.exists()) { + provider = new TestProjectProvider("org.jboss.tools.seam.core.test", + null,"TestScanner" ,true); + project = provider.getProject(); + } project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); - //EditorTestHelper.joinBackgroundActivities(); } private ISeamProject getSeamProject() { @@ -532,6 +535,8 @@ @Override protected void tearDown() throws Exception { - provider.dispose(); + if(provider!=null) { + provider.dispose(); + } } } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamCoreAllTests.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -13,9 +13,12 @@ import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeListConverterTest; import org.jboss.tools.seam.core.test.project.facet.SeamRuntimeManagerTest; +import org.jboss.tools.test.util.ProjectImportTestSetup; /** * @author V.Kabanovich @@ -25,15 +28,18 @@ public static final String PLUGIN_ID = SeamCorePlugin.PLUGIN_ID; // public static Test suite() { + // it can be done here because it is not needed to be enabled back + JavaModelManager.getIndexManager().disable(); + JSPSearchSupport.getInstance().setCanceled(true); + TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); - suite.addTestSuite(ScannerTest.class); + suite.addTest(new ProjectImportTestSetup(new TestSuite(ScannerTest.class),"org.jboss.tools.seam.core.test","projects/TestScanner","TestScanner")); suite.addTestSuite(SerializationTest.class); suite.addTestSuite(SeamBigProjectTest.class); suite.addTestSuite(SeamEARTest.class); suite.addTestSuite(SeamRuntimeListConverterTest.class); suite.addTestSuite(SeamRuntimeManagerTest.class); - suite.addTestSuite(SeamPluginsLoadTest.class); return suite; } } \ No newline at end of file Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamPluginsLoadTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,12 +0,0 @@ -package org.jboss.tools.seam.core.test; - -import org.jboss.tools.tests.AbstractPluginsLoadTest; - -import junit.framework.TestCase; - -public class SeamPluginsLoadTest extends AbstractPluginsLoadTest { - - public void testBundlesAreLoadedForSeamFeature(){ - testBundlesAreLoadedFor("org.jboss.tools.seam.feature"); - } -} Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamProjectPropertyValidatorTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -11,6 +11,7 @@ package org.jboss.tools.seam.core.test; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -58,9 +59,10 @@ pref.put(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "invalid test package name"); // pref.put(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "invalidConnectionName"); pref.flush(); - - JobUtils.waitForIdle(); - JobUtils.delay(2000); + ejbProject.build(IncrementalProjectBuilder.FULL_BUILD, null); + warProject.build(IncrementalProjectBuilder.FULL_BUILD, null); + testProject.build(IncrementalProjectBuilder.FULL_BUILD, null); + JobUtils.waitForIdle(2000); } } @@ -88,15 +90,4 @@ assertMarkerIsCreated(warProject, null, ".*invalidRuntimeName.*"); } - /* - public void testConnectionProfileNameValidation() throws CoreException { - assertMarkerIsCreated(warProject, null, ".*invalidConnectionName.*"); - } - */ - - public static void main(String[] args) { - String errorMarker = "Model package name \"invalid model package name\" specified for Seam project \"RefactoringTestProject-war\" is not valid. Please correct this property in \"Seam settings\" page (Project->Properties->Seam Settings)."; -// String errorMarker = "Main Seam project \"invalidParentProjectName "; - System.out.println(errorMarker.matches(".*invalid model package name.*")); - } } \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsAllTests.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -16,9 +16,14 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNature; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.jst.jsp.core.internal.java.search.JSPSearchSupport; +import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; +import org.jboss.tools.test.util.ResourcesUtils; /** * @author eskimo @@ -26,7 +31,11 @@ */ public class SeamValidatorsAllTests { - public static Test suite() { + public static Test suite() throws CoreException { + JavaModelManager.getIndexManager().disable(); + JSPSearchSupport.getInstance().setCanceled(true); + ValidationFramework.getDefault().suspendAllValidation(true); + ResourcesUtils.setBuildAutomatically(false); TestSuite suite = new TestSuite(); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamValidatorsTest.class),"org.jboss.tools.seam.core.test","projects/SeamWebWarTestProject","SeamWebWarTestProject") { @Override @@ -39,7 +48,11 @@ } catch (Exception e) { JUnitUtils.fail("Cannot configure seam nature.", e); } + ResourcesUtils.setBuildAutomatically(false); } + protected void tearDown() throws Exception { + ResourcesUtils.setBuildAutomatically(true); + }; } ); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamProjectPropertyValidatorTest.class), "org.jboss.tools.seam.core.test", Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -12,19 +12,23 @@ import java.io.IOException; import java.io.InputStream; +import java.text.MessageFormat; import java.util.Set; 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.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.wst.validation.internal.core.ValidationException; import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.preferences.JSFSeverityPreferences; +import org.jboss.tools.jsf.web.validation.JSFValidationMessages; import org.jboss.tools.jst.web.kb.validation.IValidator; import org.jboss.tools.seam.core.ISeamComponent; import org.jboss.tools.seam.core.ISeamComponentMethod; @@ -32,8 +36,12 @@ import org.jboss.tools.seam.core.SeamComponentMethodType; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.SeamPreferences; +import org.jboss.tools.seam.core.test.validation.ELValidatorWrapper; +import org.jboss.tools.seam.core.test.validation.IValidatorSupport; +import org.jboss.tools.seam.core.test.validation.SeamCoreValidatorWrapper; import org.jboss.tools.seam.internal.core.SeamProject; import org.jboss.tools.seam.internal.core.validation.SeamValidationErrorManager; +import org.jboss.tools.seam.internal.core.validation.SeamValidationMessages; import org.jboss.tools.test.util.JUnitUtils; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -66,70 +74,31 @@ project = setup.importProject(); } this.project = project.getProject(); - JobUtils.waitForIdle(); +// JobUtils.waitForIdle(); } @Override protected void tearDown() throws Exception { - // restore state - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/SubclassTestComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/SubclassTestComponent.original"); - - copyContentsFile("WebContent/WEB-INF/components.xml", "WebContent/WEB-INF/components.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.original"); - - copyContentsFile("WebContent/JBIDE-1631.xhtml", - "WebContent/JBIDE-1631.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.java", - "src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java", - "src/action/org/domain/SeamWebWarTestProject/session/Component12.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java", - "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java", - "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java", - "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.original"); - - copyContentsFile("WebContent/abcComponent.xhtml", - "WebContent/abcComponent.original"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent.original"); - - refreshProject(project); + } - private void copyContentsFile(String originalName, String newContentName){ + private void copyContentsFile(String originalName, String newContentName) throws CoreException{ IFile originalFile = project.getFile(originalName); IFile newContentFile = project.getFile(newContentName); copyContentsFile(originalFile, newContentFile); } - private void copyContentsFile(IFile originalFile, String newContentName){ + private void copyContentsFile(IFile originalFile, String newContentName) throws CoreException{ IFile newContentFile = project.getFile(newContentName); - copyContentsFile(originalFile, newContentFile); } - - private void copyContentsFile(IFile originalFile, IFile newContentFile){ + + private void copyContentsFile(IFile originalFile, IFile newContentFile) throws CoreException{ InputStream is = null; - try { + try{ is = newContentFile.getContents(); originalFile.setContents(is, true, false, null); - } catch (CoreException e) { - JUnitUtils.fail("Error during changing '"+originalFile.getFullPath()+"' content to '"+newContentFile.getFullPath()+"'", e); } finally { if(is!=null) { try { @@ -139,6 +108,7 @@ } } } + originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); } private ISeamProject getSeamProject(IProject project) { @@ -157,18 +127,20 @@ /** * Test for https://jira.jboss.org/jira/browse/JBIDE-6176 * @throws CoreException + * @throws ValidationException */ - public void testFactory() throws CoreException { + public void testFactory() throws CoreException, ValidationException { IFile componentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.java"); copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.new"); - refreshProject(project); - assertMarkerIsNotCreated(componentFile, MARKER_TYPE, "Factory method \"somethings\" with a void return type must have an associated @Out/Databinder", 22); - + SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project); + seamValidator.validate(componentFile); + + assertTrue(seamValidator.isMessageCreated(SeamValidationMessages.UNKNOWN_FACTORY_NAME, new String[]{"somethings"})); copyContentsFile(componentFile, "src/action/org/domain/SeamWebWarTestProject/session/FactoryTest.original"); - refreshProject(project); } + /** * Test for https://jira.jboss.org/jira/browse/JBIDE-784 * @throws CoreException @@ -186,8 +158,7 @@ public void testJBIDE1318() throws CoreException { getSeamProject(project); IFile testJSP = project.getFile("WebContent/test.jsp"); - testJSP.touch(null); - JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); assertMarkerIsNotCreated(testJSP, MARKER_TYPE, "actor cannot be resolved"); } @@ -205,224 +176,293 @@ assertEquals("Problem marker was found in messagesValidation.jsp file. Validator did not recognize a message bundle.", 0, number); } - public void testJiraJbide1696() throws CoreException { + public void testJiraJbide1696() throws CoreException, ValidationException { //getSeamProject(project); // Test for http://jira.jboss.com/jira/browse/JBIDE-1696 IFile subclassComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SubclassTestComponent.java"); - assertMarkerIsCreated(subclassComponentFile, MARKER_TYPE, "Stateful component \"testComponentJBIDE1696\" must have a method marked @Remove", 25); + SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project); + seamValidator.validate(subclassComponentFile); + + assertTrue(seamValidator.isMessageCreated(SeamValidationMessages.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE, new String[]{"testComponentJBIDE1696"})); + IFile superclassComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.java"); - copyContentsFile(superclassComponentFile, "src/action/org/domain/SeamWebWarTestProject/session/SuperclassTestComponent.withRemove"); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + + seamValidator = new SeamCoreValidatorWrapper(project); + seamValidator.validate(subclassComponentFile); - refreshProject(project); - int number = getMarkersNumberByGroupName(subclassComponentFile, SeamValidationErrorManager.MARKED_SEAM_PROJECT_MESSAGE_GROUP); - assertTrue("We changed super class of component but it still don't see changes.", number == 0); + assertTrue("We changed super class of component but it still don't see changes.", seamValidator.getMessages().size()==0); } - public void testJiraJbide1631() throws CoreException { + public void testJiraJbide1631() throws CoreException, ValidationException { // Test for http://jira.jboss.com/jira/browse/JBIDE-1631 - String jbide1631XHTMLFile = "WebContent/JBIDE-1631.xhtml"; - String jbide1631XHTMLFile2 = "WebContent/JBIDE-1631.1"; + IFile jbide1631XHTMLFile = project.getFile("WebContent/JBIDE-1631.xhtml"); + IFile jbide1631XHTMLFile2 = project.getFile("WebContent/JBIDE-1631.1"); - assertMarkerIsCreated(jbide1631XHTMLFile, jbide1631XHTMLFile2, "\"foo1\" cannot be resolved", 16 ); - assertMarkerIsCreated(project.getFile(jbide1631XHTMLFile), MARKER_TYPE, "\"foo2\" cannot be resolved", 16 ); + copyContentsFile(jbide1631XHTMLFile, jbide1631XHTMLFile2); + + ELValidatorWrapper elValidator = new ELValidatorWrapper(project); + elValidator.validate(jbide1631XHTMLFile); + + assertTrue(elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo1"})); + assertTrue(elValidator.isMessageCreated(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, new Object[]{"foo2"})); } - public void testDuplicateComponentName_Validator() throws CoreException { + public void testDuplicateComponentNameValidator() throws CoreException, ValidationException { + copyContentsFile( + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java", + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.original"); IFile bbcComponentFile = project .getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java"); - - String markerText = "Duplicate component name: \"abcComponent\""; - assertMarkerIsNotCreated(bbcComponentFile, MARKER_TYPE, markerText); - + SeamCoreValidatorWrapper seamValidator = new SeamCoreValidatorWrapper(project); + seamValidator.validate(bbcComponentFile); + assertTrue(!seamValidator.isMessageCreated( + SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, new Object[]{"abcComponent"})); + // Duplicate component name - assertMarkerIsCreated( + copyContentsFile( "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java", - "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2", - markerText, 7); - - IFile newContentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.3"); - IFile targetFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java"); - FileUtil.copyContent(newContentFile, targetFile, true, false, null); - refreshProject(project); + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2"); + seamValidator = new SeamCoreValidatorWrapper(project); + seamValidator.validate(bbcComponentFile); + assertTrue(seamValidator.isMessageCreated( + SeamValidationMessages.NONUNIQUE_COMPONENT_NAME_MESSAGE, new Object[]{"abcComponent"})); + + // restore file content + copyContentsFile( + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.java", + "src/action/org/domain/SeamWebWarTestProject/session/BbcComponent.2"); } - public void testStatefulComponentWithoutRemoveMethod_Validator() throws CoreException { + public void testStatefulComponentWithoutRemoveMethodValidator() throws CoreException, ValidationException { IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); String markerText = "Stateful component \"statefulComponent\" must have a method marked @Remove"; - assertMarkerIsNotCreated(statefulComponentFile, MARKER_TYPE, markerText); +// assertMarkerIsNotCreated(statefulComponentFile, MARKER_TYPE, markerText); // Stateful component does not contain @Remove method - assertMarkerIsCreated( - "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", + assertMarkerIsCreatedForLine("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.2", - markerText, 16); + SeamValidationMessages.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_REMOVE, + new Object[]{"statefulComponent"}, + 16); } - public void testStatefulComponentWithoutDestroyMethod_Validator() throws CoreException { - IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); - - String markerText = "Stateful component \"statefulComponent\" must have a method marked @Destroy"; - - assertMarkerIsNotCreated(statefulComponentFile, MARKER_TYPE, markerText); - + private void assertMarkerIsCreatedForLine(String target, String newContent, String markerTemplate, + Object[] parameters,int lineNumber) throws CoreException, ValidationException { + IValidatorSupport validator = new SeamCoreValidatorWrapper(project); + assertMarkerIsCreatedForLine(validator, target, newContent, markerTemplate, parameters, lineNumber); + } + + private void assertMarkerIsCreatedForLine(IValidatorSupport validator,String target, String newContent, String markerTemplate, + Object[] parameters,int lineNumber) throws CoreException, ValidationException { + copyContentsFile( + target, + newContent); + assertMarkerIsCreatedForLine(validator,target,markerTemplate,parameters,lineNumber); + } + + private void assertMarkerIsCreatedForLine(String target, String markerTemplate, + Object[] parameters,int lineNumber) throws CoreException, ValidationException { + IValidatorSupport validator = new SeamCoreValidatorWrapper(project); + assertMarkerIsCreatedForLine(validator, target, markerTemplate, parameters, lineNumber); + } + + private void assertMarkerIsCreatedForLine(IValidatorSupport validator,String target, String markerTemplate, + Object[] parameters,int lineNumber) throws CoreException, ValidationException { + IFile targetFile = project.getFile(target); + validator.validate(targetFile); + assertTrue(validator.isMessageCreated(markerTemplate, parameters)); + assertTrue(validator.isMessageCreatedOnLine(markerTemplate, parameters,lineNumber)); + } + + private void assertMarkerIsNotCreatedForFile(String target, String newContent, String markerTemplate, + Object[] parameters) throws CoreException, ValidationException { + IValidatorSupport validator = new SeamCoreValidatorWrapper(project); + assertMarkerIsNotCreatedForFile(validator, target, newContent, markerTemplate, parameters); + } + + private void assertMarkerIsNotCreatedForFile(IValidatorSupport validator,String target, String newContent, String markerTemplate, + Object[] parameters) throws CoreException, ValidationException { + copyContentsFile( + target, + newContent); + assertMarkerIsNotCreatedForFile(validator,target,markerTemplate, parameters); + } + + private void assertMarkerIsNotCreatedForFile(String target, String markerTemplate, Object[] parameters) + throws ValidationException, CoreException { + IValidatorSupport validator = new SeamCoreValidatorWrapper(project); + assertMarkerIsNotCreatedForFile(validator, target, markerTemplate, parameters); + } + + private void assertMarkerIsNotCreatedForFile(IValidatorSupport validator, String target, String markerTemplate, Object[] parameters) + throws ValidationException, CoreException { + IFile targetFile = project.getFile(target); + validator.validate(targetFile); + assertTrue(!validator.isMessageCreated(markerTemplate, parameters)); + } + + public void testStatefulComponentWithoutDestroyMethodValidator() throws CoreException, ValidationException { // Stateful component does not contain @Destroy method - assertMarkerIsCreated( - "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", + assertMarkerIsCreatedForLine("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.3", - markerText, 16); + SeamValidationMessages.STATEFUL_COMPONENT_DOES_NOT_CONTAIN_DESTROY, + new Object[] {"statefulComponent"}, + 16); } - public void testStatefulComponentHasWrongScope_Validator() throws CoreException { - IFile statefulComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"); - - String markerText = "Stateful component \"statefulComponent\" should not have org.jboss.seam.ScopeType.PAGE, nor org.jboss.seam.ScopeType.STATELESS"; - - assertMarkerIsNotCreated(statefulComponentFile, MARKER_TYPE, markerText); - + public void testStatefulComponentHasWrongScopeValidator() throws CoreException, ValidationException { // Stateful component has wrong scope - - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.4", - markerText, 16); + SeamValidationMessages.STATEFUL_COMPONENT_WRONG_SCOPE, + new Object[] {"statefulComponent"}, + 16); } - public void testComponentType_Validator() throws CoreException { - IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); - - String markerText = "\"org.domain.SeamWebWarTestProject.session.StateComponent\" cannot be resolved to a type"; - - assertMarkerIsNotCreated(componentsFile, MARKER_TYPE, markerText); - + public void testComponentTypeValidator() throws CoreException, ValidationException { // Component class name cannot be resolved to a type - - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( "WebContent/WEB-INF/components.xml", "WebContent/WEB-INF/components.2", - markerText, 15); + SeamValidationMessages.UNKNOWN_COMPONENT_CLASS_NAME, + new Object[] {"org.domain.SeamWebWarTestProject.session.StateComponent"}, + 15); } - public void testComponentWithoutSetter_Validator() throws CoreException { - IFile componentsFile = project.getFile("WebContent/WEB-INF/components.xml"); - + public void testComponentWithoutSetterValidator() throws CoreException, ValidationException { // Component class does not contain setter for property - - copyContentsFile(componentsFile, "WebContent/WEB-INF/components.3"); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java", "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.5"); - - refreshProject(project); - - assertMarkerIsCreated( - componentsFile, - MARKER_TYPE, - "Class \"StatefulComponent\" of component \"statefulComponent\" does not have a setter or a field for the property \"abc\"", 16); + assertMarkerIsCreatedForLine( + "WebContent/WEB-INF/components.xml", + "WebContent/WEB-INF/components.3", + SeamValidationMessages.UNKNOWN_COMPONENT_PROPERTY, + new Object[] {"StatefulComponentWithAbcField", "statefulComponentWithAbcField","abc"}, + 16); } - public void testEntityHasWrongScope_Validator() throws CoreException { - IFile abcEntityFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.java"); - - String markerText = "Entity component \"abcEntity\" should not have org.jboss.seam.ScopeType.STATELESS"; - - assertMarkerIsNotCreated(abcEntityFile, MARKER_TYPE, markerText); - + public void testEntityHasWrongScopeValidator() throws CoreException, ValidationException { // Entity component has wrong scope - - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( "src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.java", "src/action/org/domain/SeamWebWarTestProject/entity/abcEntity.2", - markerText, 15); + SeamValidationMessages.ENTITY_COMPONENT_WRONG_SCOPE, + new Object[]{"abcEntity"}, 15); } final String TARGET_FILE_NAME = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.java"; - public void testDuplicateDestroyMethod_Validator() throws CoreException { + public void testDuplicateDestroyMethodValidator() throws CoreException, ValidationException { final String NEW_CONTENT_FILE_NAME6 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.6"; - // Duplicate @Destroy method - - refreshProject(project); - - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( TARGET_FILE_NAME, NEW_CONTENT_FILE_NAME6, - ".*\"destroyMethod\".*", 34); + SeamValidationMessages.DUPLICATE_DESTROY,new Object[]{"destroyMethod"}, 34); - assertMarkerIsCreated( - TARGET_FILE_NAME, ".*\"destroyMethod2\"", 39); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + SeamValidationMessages.DUPLICATE_DESTROY,new Object[]{"destroyMethod2"}, 39); } - public void testDuplicateCreateMethod_Validator() throws CoreException { + public void testDuplicateCreateMethodValidator() throws CoreException, ValidationException { // Duplicate @Create method final String NEW_CONTENT_FILE_NAME7 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.7"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME7, &quot;.*(a)Create.*\&quot;createMethod\&quot;.*&quot;, 36); - assertMarkerIsCreated( - TARGET_FILE_NAME, &quot;.*(a)Create.*\&quot;createMethod2\&quot;.*&quot;, 41); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME7, + SeamValidationMessages.DUPLICATE_CREATE, + new Object[]{"createMethod"},36); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, SeamValidationMessages.DUPLICATE_CREATE, + new Object[]{"createMethod2"}, 41); } - public void testDuplicateUnwrapMethod_Validator() throws CoreException { + public void testDuplicateUnwrapMethodValidator() throws CoreException, ValidationException { // Duplicate @Unwrap method final String NEW_CONTENT_FILE_NAME8 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.8"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME8, &quot;.*(a)Unwrap.*\&quot;unwrapMethod\&quot;.*&quot;, 40); - assertMarkerIsCreated( - TARGET_FILE_NAME, &quot;.*(a)Unwrap.*\&quot;unwrapMethod2\&quot;.*&quot;, 45); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME8, + SeamValidationMessages.DUPLICATE_UNWRAP, + new Object[] { "unwrapMethod"}, 40); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, SeamValidationMessages.DUPLICATE_UNWRAP, + new Object[] { "unwrapMethod2"}, 45); } - public void testOnlyJavaBeansAndStatefulSessionBeansSupportDestroyMethod_Validator() throws CoreException { + public void testOnlyJavaBeansAndStatefulSessionBeansSupportDestroyMethodValidator() throws CoreException, ValidationException { // Only JavaBeans and stateful session beans support @Destroy methods final String NEW_CONTENT_FILE_NAME9 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.9"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME9, &quot;.*(a)Destroy.*\&quot;destroyMethod\&quot;.*&quot;, 25); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME9, + SeamValidationMessages.DESTROY_METHOD_BELONGS_TO_STATELESS_SESSION_BEAN, + new Object[] {"destroyMethod"}, + 25); } - public void testOnlyComponentClassCanHaveCreateMethod_Validator() throws CoreException { + public void testOnlyComponentClassCanHaveCreateMethodValidator() throws CoreException, ValidationException { // Only component class can have @Create method final String NEW_CONTENT_FILE_NAME10 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.10"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME10, &quot;.*(a)Create.*\&quot;createMethod\&quot;.*&quot;, 25); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME10, + SeamValidationMessages.CREATE_DOESNT_BELONG_TO_COMPONENT, + new Object[]{"createMethod"}, + 25); } - public void testOnlyComponentClassCanHaveUnwrapMethod_Validator() throws CoreException { + public void testOnlyComponentClassCanHaveUnwrapMethodValidator() throws CoreException, ValidationException { // Only component class can have @Unwrap method final String NEW_CONTENT_FILE_NAME11 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.11"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME11, "Only component class can have @Unwrap method \"unwrapMethod\"", 26); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME11, + SeamValidationMessages.UNWRAP_DOESNT_BELONG_TO_COMPONENT, new Object[] {"unwrapMethod"}, 26); } - public void testOnlyComponentClassCanHaveObserverMethod_Validator() throws CoreException { + public void testOnlyComponentClassCanHaveObserverMethodValidator() throws CoreException, ValidationException { // Only component class can have @Observer method final String NEW_CONTENT_FILE_NAME12 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.12"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME12, "Only component class can have @Observer method \"observerMethod\"", 26); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME12, + SeamValidationMessages.OBSERVER_DOESNT_BELONG_TO_COMPONENT, new Object[] {"observerMethod"}, 26); } - public void testDuplicateRemoveMethod_Validator() throws CoreException { + public void testDuplicateRemoveMethodValidator() throws CoreException, ValidationException { // Duplicate @Remove method final String NEW_CONTENT_FILE_NAME1 = "src/action/org/domain/SeamWebWarTestProject/session/StatefulComponent.1"; - assertMarkerIsCreated( - TARGET_FILE_NAME,NEW_CONTENT_FILE_NAME1, "Duplicate @Remove method \"removeMethod1\"", 18); - assertMarkerIsCreated( - TARGET_FILE_NAME,"Duplicate @Remove method \"removeMethod2\"", 22); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + NEW_CONTENT_FILE_NAME1, + SeamValidationMessages.DUPLICATE_REMOVE, + new Object[] {"removeMethod1"}, + 18); + assertMarkerIsCreatedForLine( + TARGET_FILE_NAME, + SeamValidationMessages.DUPLICATE_REMOVE, + new Object[]{"removeMethod2"}, + 22); } /** @@ -436,20 +476,7 @@ IFile newContentFile = project.getFile(newContentPath); IFile targetFile = project.getFile(targetPath); - InputStream is = null; - try { - is = newContentFile.getContents(); - targetFile.setContents(is, true, false, null); - } finally { - if(is!=null) { - try { - is.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - refreshProject(project); + copyContentsFile(targetFile, newContentFile); assertMarkerIsCreated(targetFile, MARKER_TYPE, pattern, line); } @@ -477,35 +504,46 @@ assertEquals("Problem marker was found in UsualComponent.java file", 0, number); } - public void testFactoriesValidator() throws CoreException { - IFile component12File = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/Component12.java"); + public void testUnknownFactoryNameValidator() throws CoreException, ValidationException { + assertMarkerIsNotCreatedForFile( + "src/action/org/domain/SeamWebWarTestProject/session/Component12.java", + SeamValidationMessages.UNKNOWN_FACTORY_NAME, + new Object[] {"messageList2"}); - String markerText = "Factory method \"messageList2\" with a void return type must have an associated @Out/Databinder"; - - assertMarkerIsNotCreated(component12File, MARKER_TYPE, markerText); - // Unknown factory name - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( "src/action/org/domain/SeamWebWarTestProject/session/Component12.java", "src/action/org/domain/SeamWebWarTestProject/session/Component12.2", - markerText, 24); - + SeamValidationMessages.UNKNOWN_FACTORY_NAME, + new Object[] {"messageList2"}, + 24); + } + + public void testDuplicateFactoryNameValidator() throws CoreException, ValidationException { + assertMarkerIsNotCreatedForFile( + "src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java", + SeamValidationMessages.DUPLICATE_VARIABLE_NAME, + new Object[] {"testFactory1"}); - copyContentsFile(component12File, "src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory"); + assertMarkerIsCreatedForLine( + "src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java", + "src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.1", + SeamValidationMessages.DUPLICATE_VARIABLE_NAME, + new Object[] {"testFactory1"}, + 16); - refreshProject(project); - - int number = getMarkersNumber(component12File); - assertEquals("Duplicate factory name markers were not found", 2, number); + assertMarkerIsCreatedForLine( + "src/action/org/domain/SeamWebWarTestProject/session/DuplicateFactory.java", + SeamValidationMessages.DUPLICATE_VARIABLE_NAME, + new Object[] {"testFactory1"}, + 21); } - public void testMultipleDataBinder_Validator() throws CoreException { + public void testMultipleDataBinderValidator() throws CoreException { IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java"); IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java"); - refreshProject(project); - int number = getMarkersNumber(selectionTestFile); assertEquals("Problem marker was found in SelectionIndexTest.java", 0, number); @@ -518,7 +556,6 @@ copyContentsFile(selectionIndexTestFile, "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.2"); - refreshProject(project); number = getMarkersNumber(selectionTestFile); assertFalse("Problem marker 'Multiple data binder' was not found", number == 0); @@ -549,26 +586,24 @@ } - public void testUnknownDataModelName_Validator() throws CoreException { + public void testUnknownDataModelNameValidator() throws CoreException, ValidationException { IFile selectionTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java"); IFile selectionIndexTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java"); // Unknown @DataModel/@Out name - copyContentsFile(selectionTestFile, "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.3"); - - copyContentsFile(selectionIndexTestFile, "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.3"); + assertMarkerIsCreatedForLine( + "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.java", + "src/action/org/domain/SeamWebWarTestProject/session/SelectionTest.3", + SeamValidationMessages.UNKNOWN_DATA_MODEL, + new Object[] {"messageList2"}, + 27); - refreshProject(project); - - assertMarkerIsCreated( - selectionTestFile, - MARKER_TYPE, - "Unknown @DataModel/@Out name: \"messageList2\"", 27); - - assertMarkerIsCreated( - selectionIndexTestFile, - MARKER_TYPE, - "Unknown @DataModel/@Out name: \"messageList2\"", 27); + assertMarkerIsCreatedForLine( + "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.java", + "src/action/org/domain/SeamWebWarTestProject/session/SelectionIndexTest.3", + SeamValidationMessages.UNKNOWN_DATA_MODEL, + new Object[] {"messageList2"}, + 27); } public void testDuplicateVariableName_Validator() throws CoreException { @@ -602,7 +637,7 @@ } - public void testUnknownVariableName_Validator() throws CoreException { + public void testUnknownVariableNameValidator() throws CoreException, ValidationException { IFile contextVariableTestFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java"); String markerText = "Unknown context variable name: \"messageList5\""; @@ -611,89 +646,94 @@ // Unknown variable name - assertMarkerIsCreated( + assertMarkerIsCreatedForLine( "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.java", "src/action/org/domain/SeamWebWarTestProject/session/ContextVariableTest.3", - markerText, 22); + SeamValidationMessages.UNKNOWN_VARIABLE_NAME, + new Object[]{"messageList5"}, 22); } - public void testContextVariableCannotBeResolved_Validator() throws CoreException { + public void testContextVariableCannotBeResolvedValidator() throws CoreException, ValidationException { modifyPreferences(); - IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); + assertMarkerIsNotCreatedForFile(new ELValidatorWrapper(project), + "WebContent/abcComponent.xhtml", + JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, + new Object[]{"bcComponent"}); - refreshProject(project); - - assertMarkerIsNotCreated(abcComponentXHTMLFile, MARKER_TYPE, "\"bcComponent\" cannot be resolved"); - // Context variable cannot be resolved - assertMarkerIsCreated( + assertMarkerIsCreatedForLine(new ELValidatorWrapper(project), "WebContent/abcComponent.xhtml", "WebContent/abcComponent.2", - "\"bcComponent\" cannot be resolved", 22); + JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, + new Object[]{"bcComponent"}, 22); } - public void testPropertyCannotBeResolved_Validator() throws CoreException { - IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); + public void testPropertyCannotBeResolvedValidator() throws CoreException, ValidationException { - String markerText = "\"actionType2\" cannot be resolved"; + assertMarkerIsNotCreatedForFile( + new ELValidatorWrapper(project), + "WebContent/abcComponent.xhtml", + JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, + new Object[]{"actionType2"}); - assertMarkerIsNotCreated(abcComponentXHTMLFile, MARKER_TYPE, markerText); - // Property cannot be resolved - - assertMarkerIsCreated( - "WebContent/abcComponent.xhtml", - "WebContent/abcComponent.3", - markerText, 22); + assertMarkerIsCreatedForLine( + new ELValidatorWrapper(project), + "WebContent/abcComponent.xhtml", + "WebContent/abcComponent.3", + JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, + new Object[]{"actionType2"}, + 22); } - public void testPropertyHasOnlySetter_Validator() throws CoreException { - IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); - IFile abcComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java"); - - String markerText = "Property \"actionType\" has only Setter. Getter is missing."; - - assertMarkerIsNotCreated(abcComponentXHTMLFile, MARKER_TYPE, markerText); - - assertMarkerIsNotCreated(abcComponentFile, MARKER_TYPE, markerText); - + public void testPropertyHasOnlySetterValidator() throws CoreException, ValidationException { // Unpaired Getter/Setter + try { + enableUnpairGetterOrSetterValidation(true); - enableUnpairGetterOrSetterValidation(true); - - copyContentsFile(abcComponentFile, "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2"); - - refreshProject(project); - - assertMarkerIsCreated( - "WebContent/abcComponent.xhtml", - "WebContent/abcComponent.4", - markerText, 22); - - enableUnpairGetterOrSetterValidation(false); + assertMarkerIsNotCreatedForFile( + new ELValidatorWrapper(project), + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.2", + JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, + new Object[] {"actionType","Setter","Getter"}); + + assertMarkerIsCreatedForLine( + new ELValidatorWrapper(project), + "WebContent/abcComponent.xhtml", + "WebContent/abcComponent.4", + JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, + new Object[] {"actionType","Setter","Getter"}, + 22); + } finally { + enableUnpairGetterOrSetterValidation(false); + } } - public void testPropertyHasOnlyGetter_Validator() throws CoreException { - IFile abcComponentXHTMLFile = project.getFile("WebContent/abcComponent.xhtml"); + public void testPropertyHasOnlyGetterValidator() throws CoreException, ValidationException { + project.build(IncrementalProjectBuilder.CLEAN_BUILD, null); + try { + enableUnpairGetterOrSetterValidation(true); - String markerText = "Property \"actionType\" has only Getter. Setter is missing."; - - assertMarkerIsNotCreated(abcComponentXHTMLFile, MARKER_TYPE, markerText); - - enableUnpairGetterOrSetterValidation(true); - - copyContentsFile("src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3"); - - refreshProject(project); - - assertMarkerIsCreated( - abcComponentXHTMLFile, - MARKER_TYPE, - markerText, 22); - - enableUnpairGetterOrSetterValidation(false); + assertMarkerIsNotCreatedForFile( + new ELValidatorWrapper(project), + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.java", + "src/action/org/domain/SeamWebWarTestProject/session/AbcComponent.3", + JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, + new Object[] {"actionType", "Getter", "Setter"}); + + assertMarkerIsCreatedForLine( + new ELValidatorWrapper(project), + "WebContent/abcComponent.xhtml", + "WebContent/abcComponent.original", + JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, + new Object[] {"actionType", "Getter", "Setter"}, + 22); + } finally { + enableUnpairGetterOrSetterValidation(false); + } } private void enableUnpairGetterOrSetterValidation(boolean enable) { @@ -726,15 +766,13 @@ } // See https://jira.jboss.org/jira/browse/JBIDE-4393 - public void testDuplicateComponents() { + public void testDuplicateComponents() throws CoreException { refreshProject(project); IFile duplicateJavaComponentFile = project.getFile("src/action/org/domain/SeamWebWarTestProject/session/DuplicateComponent.java"); IFile componentsXmlFile = project.getFile("WebContent/WEB-INF/components.xml"); copyContentsFile(componentsXmlFile, "WebContent/WEB-INF/duplicateComponents.test"); - refreshProject(project); - Integer[] lineNumbers = getMarkersNumbersOfLine(duplicateJavaComponentFile, SEAM_MARKER_FILTER); assertEquals("There should be the only one error marker in DuplicateComponent.java.", 1, lineNumbers.length); assertEquals("Problem marker has wrong line number", 5, lineNumbers[0].intValue()); @@ -776,13 +814,13 @@ } // See https://jira.jboss.org/browse/JBIDE-6352 - public void testErrorMarkerForEL() throws CoreException{ - refreshProject(project); - - IFile xhtmlFile = project.getFile("WebContent/markerTest.xhtml"); - - IMarker[] markers = findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testtt\" cannot be resolved"); - assertEquals("There should be an unresolved EL in markerTest.xhtml for 'testtt' segment.", 1, markers.length); + public void testErrorMarkerForEL() throws CoreException, ValidationException{ + assertMarkerIsCreatedForLine( + new ELValidatorWrapper(project), + "WebContent/markerTest.xhtml", + JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, + new Object[] {"testtt"}, + 9); } public static int getMarkersNumber(IResource resource) { @@ -813,7 +851,7 @@ store = JSFModelPlugin.getDefault().getPreferenceStore(); store.putValue(JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.ERROR); store.putValue(JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, SeamPreferences.ERROR); -// store.putValue(JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.ERROR); + //store.putValue(JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, SeamPreferences.ERROR); store.putValue(JSFSeverityPreferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.ENABLE); if(store instanceof IPersistentPreferenceStore) { @@ -825,14 +863,31 @@ } } + private void modifyPreference(String name, String value){ + IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore(); + + if(store instanceof IPersistentPreferenceStore) { + try { + ((IPersistentPreferenceStore)store).save(); + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + } + + store = JSFModelPlugin.getDefault().getPreferenceStore(); + store.putValue(name, value); + + if(store instanceof IPersistentPreferenceStore) { + try { + ((IPersistentPreferenceStore)store).save(); + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + } + } + private void refreshProject(IProject project){ - try { - project.refreshLocal(IResource.DEPTH_INFINITE, null); - JobUtils.waitForIdle(); - JobUtils.delay(2000); - } catch (CoreException e) { - // ignore - } + JobUtils.waitForIdle(); } public static class SeamMarkerFilter implements IMarkerFilter { @@ -841,4 +896,8 @@ return groupName!=null && (groupName.equals(SeamValidationErrorManager.MARKED_SEAM_PROJECT_MESSAGE_GROUP) || groupName.equals(IValidator.MARKED_RESOURCE_MESSAGE_GROUP)); } } + + private void invokeIncrementalBuild() throws CoreException { + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); + } } \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -4,7 +4,9 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import junit.framework.TestCase; @@ -87,18 +89,18 @@ SeamRuntimeManager.getInstance().addRuntime(SEAM_1_2_0, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true); seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_1_2_0); - } public static final String SYS_PROP_IS_NOT_DEFINED = "System property {0} is not defined"; + protected File getSeamHomeFolder() { - String seamHomeFolder = "C:\\JBoss\\jboss-seam-1.2.1.GA";//System.getProperty(getSystemPropertyName()); + String seamHomeFolder = System.getProperty(getSystemPropertyName()); if(seamHomeFolder==null) { throw new IllegalStateException( MessageFormat.format(SYS_PROP_IS_NOT_DEFINED, getSystemPropertyName()) ); } - return new File(seamHomeFolder); + return new File(seamHomeFolder).getAbsoluteFile(); } public static final String SEAM_EAP_121_HOME_PROPERY = "jbosstools.test.seam.1.2.1.eap.home"; @@ -130,7 +132,6 @@ } } r.delete(true, null); -// JobUtils.delay(5000); } catch(Exception e) { e.printStackTrace(); last = e; Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamRefactoringAllTests.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -22,10 +22,10 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamPropertyRefactoringTest.class), - "org.jboss.tools.seam.core.test", - new String[]{"projects/RefactoringTestProject-war", "projects/RefactoringTestProject-ejb", "projects/RefactoringTestProject-test"}, - new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb", "RefactoringTestProject-test"})); +// suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamPropertyRefactoringTest.class), +// "org.jboss.tools.seam.core.test", +// new String[]{"projects/RefactoringTestProject-war", "projects/RefactoringTestProject-ejb", "projects/RefactoringTestProject-test"}, +// new String[]{"RefactoringTestProject-war", "RefactoringTestProject-ejb", "RefactoringTestProject-test"})); suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamComponentRefactoringTest.class), "org.jboss.tools.seam.core.test", Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,69 @@ +package org.jboss.tools.seam.core.test.validation; + +import java.text.MessageFormat; +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.runtime.CoreException; +import org.eclipse.wst.validation.internal.core.ValidationException; +import org.jboss.tools.jsf.web.validation.ELValidator; + +public class ELValidatorWrapper extends ELValidator implements IValidatorSupport{ + + ValidatorSupport validatorSupport; + + public ELValidatorWrapper(IProject project) { + this.validatorSupport = new ValidatorSupport(project,this); + } + @Override + public IMarker addError(String message, int severity, + String[] messageArguments, int length, int offset, + IResource target) { + + IMarker marker= super.addError(message, severity, messageArguments, length, offset, + target); + validatorSupport.add(marker); + return marker; + } + + @Override + public IMarker addError(String message, String preferenceKey, + String[] messageArguments, int length, int offset, + IResource target) { + IMarker marker = super.addError(message, preferenceKey, messageArguments, length, offset, + target); + validatorSupport.add(marker); + return marker; + } + + public boolean isMessageCreated(String template, Object[] parameters) { + return validatorSupport.isMessageCreated(template,parameters); + } + + public List<IMarker> getMarkers() { + return validatorSupport.getMarkers(); + } + + public void addFile(IFile o) { + validatorSupport.addFile(o); + } + + public void validate() throws ValidationException { + validatorSupport.validate(); + } + public void validate(IFile file) throws ValidationException { + validatorSupport.addFile(file); + validatorSupport.validate(); + } + public void add(IMarker message) { + validatorSupport.add(message); + + } + public boolean isMessageCreatedOnLine(String markerTemplate, + Object[] parameters, int lineNumber) throws CoreException { + return validatorSupport.isMessageCreatedOnLine(markerTemplate, parameters, lineNumber); + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ELValidatorWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/IValidatorSupport.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/IValidatorSupport.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/IValidatorSupport.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,30 @@ +package org.jboss.tools.seam.core.test.validation; + +import java.text.MessageFormat; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.validation.internal.core.ValidationException; + +public interface IValidatorSupport { + + public abstract void validate() throws ValidationException; + + public abstract void validate(IFile file) throws ValidationException; + + public abstract void add(IMarker marker); + + public abstract boolean isMessageCreated(String template, + Object[] parameters); + + public abstract void addFile(IFile o); + + public abstract List<IMarker> getMarkers(); + + public abstract boolean isMessageCreatedOnLine(String markerTemplate, + Object[] parameters, int lineNumber) throws CoreException; + +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/IValidatorSupport.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,78 @@ +package org.jboss.tools.seam.core.test.validation; + +import java.text.MessageFormat; +import java.util.HashSet; +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.runtime.CoreException; +import org.eclipse.wst.validation.internal.core.ValidationException; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper; +import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; +import org.jboss.tools.seam.internal.core.validation.SeamCoreValidator; + +public class SeamCoreValidatorWrapper extends SeamCoreValidator implements IValidatorSupport{ + + ValidatorSupport validatorSupport; + + public SeamCoreValidatorWrapper(IProject project) { + this.validatorSupport = new ValidatorSupport(project,this); + } + @Override + public IMarker addError(String message, int severity, + String[] messageArguments, int length, int offset, + IResource target) { + IMarker marker = super.addError(message, severity, messageArguments, length, offset, + target); + validatorSupport.add(marker); + return marker; + } + @Override + public IMarker addError(String message, String preferenceKey, + String[] messageArguments, int length, int offset, + IResource target) { + + IMarker marker = super.addError(message, preferenceKey, messageArguments, length, offset, + target); + validatorSupport.add(marker); + return marker; + } + + public boolean isMessageCreated(String template, Object[] parameters) { + return validatorSupport.isMessageCreated(template,parameters); + } + + public List<IMarker> getMessages() { + return validatorSupport.getMarkers(); + } + + public void addFile(IFile o) { + validatorSupport.addFile(o); + } + + public void validate() throws ValidationException { + validatorSupport.validate(); + } + + public void validate(IFile file) throws ValidationException { + validatorSupport.addFile(file); + validatorSupport.validate(); + } + public void add(IMarker marker) { + validatorSupport.add(marker); + } + + public List<IMarker> getMarkers() { + // TODO Auto-generated method stub + return null; + } + public boolean isMessageCreatedOnLine(String markerTemplate, + Object[] parameters, int lineNumber) throws CoreException { + return validatorSupport.isMessageCreatedOnLine(markerTemplate, parameters, lineNumber); + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamCoreValidatorWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectProbertyValidatorWrapper.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectProbertyValidatorWrapper.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectProbertyValidatorWrapper.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,55 @@ +package org.jboss.tools.seam.core.test.validation; + +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.runtime.CoreException; +import org.eclipse.wst.validation.internal.core.ValidationException; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IValidator; +import org.jboss.tools.seam.internal.core.validation.SeamProjectPropertyValidator; + +public class SeamProjectProbertyValidatorWrapper extends SeamProjectPropertyValidator implements IValidatorSupport{ + ValidatorSupport support; + private IProject project; + + public SeamProjectProbertyValidatorWrapper(IProject project) { + this.project = project; + } + + public void validate() throws ValidationException { + support.validate(); + } + + public void add(IMarker marker) { + support.add(marker); + } + + public boolean isMessageCreated(String template, Object[] parameters) { + return support.isMessageCreated(template, parameters); + } + + public void addFile(IFile o) { + support.addFile(o); + } + + public List<IMarker> getMarkers() { + return support.getMarkers(); + } + + public void addMessage(IValidator origin, IMessage message) { + support.addMessage(origin, message); + } + + public void validate(IFile file) throws ValidationException { + support.validate(file); + } + + public boolean isMessageCreatedOnLine(String markerTemplate, + Object[] parameters, int lineNumber) throws CoreException { + return support.isMessageCreatedOnLine(markerTemplate, parameters, + lineNumber); + } +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/SeamProjectProbertyValidatorWrapper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,141 @@ +package org.jboss.tools.seam.core.test.validation; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +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.runtime.CoreException; +import org.eclipse.wst.validation.internal.core.ValidationException; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper; +import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; +import org.jboss.tools.jst.web.kb.validation.IValidator; + +public class ValidatorSupport implements IReporter, IValidatorSupport { + + List<IMarker> markers = new ArrayList<IMarker>(); + Set<IFile> files = new HashSet<IFile>(); + private IProject project; + IValidator validator; + + public ValidatorSupport(IProject project, IValidator validator) { + this.project = project; + this.validator = validator; + } + + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.test.validation.IValidatorSupport#validate() + */ + public void validate() throws ValidationException { + ContextValidationHelper helper = new ContextValidationHelper(); + helper.setProject(this.project); + validator.validate(files, project, helper, new ValidatorManager(), this); + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.test.validation.IValidatorSupport#add(java.lang.String) + */ + public void add(IMarker marker) { + if(marker!=null) { + markers.add(marker); + } + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.test.validation.IValidatorSupport#isMessageCreated(java.lang.String, java.lang.Object[]) + */ + public boolean isMessageCreated(String template, Object[] parameters) { + String messagePattern = MessageFormat.format(template,parameters); + boolean result = false; + for (IMarker marker : markers) { + String message = marker.getAttribute(IMarker.MESSAGE,"").toString(); + if(messagePattern.matches(message)) { + result = true; + break; + } + } + return result; + } + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.test.validation.IValidatorSupport#addFile(org.eclipse.core.resources.IFile) + */ + public void addFile(IFile o) { + files.add(o); + } + + // IRepoter File + + /* (non-Javadoc) + * @see org.jboss.tools.seam.core.test.validation.IValidatorSupport#getMessages() + */ + public List<IMarker> getMarkers() { + return markers; + } + + public boolean isCancelled() { + return false; + } + + public void addMessage( + org.eclipse.wst.validation.internal.provisional.core.IValidator origin, + IMessage message) { + } + + public void displaySubtask( + org.eclipse.wst.validation.internal.provisional.core.IValidator validator, + IMessage message) { + } + + public void removeAllMessages( + org.eclipse.wst.validation.internal.provisional.core.IValidator origin) { + } + + public void removeAllMessages( + org.eclipse.wst.validation.internal.provisional.core.IValidator origin, + Object object) { + } + + public void removeMessageSubset( + org.eclipse.wst.validation.internal.provisional.core.IValidator validator, + Object obj, String groupName) { + } + + + public List getMessages() { + return null; + } + + + public void validate(IFile file) throws ValidationException { + addFile(file); + validate(); + } + + + public boolean isMessageCreatedOnLine(String markerTemplate, + Object[] parameters, int lineNumber) throws CoreException { + String messagePattern = MessageFormat.format(markerTemplate,parameters); + boolean result = false; + for (IMarker marker : markers) { + String message = marker.getAttribute(IMarker.MESSAGE,"").toString(); + if(messagePattern.matches(message)) { + Object line = marker.getAttribute(IMarker.LINE_NUMBER); + if(line!=null && line instanceof Integer && ((Integer)line).intValue()==lineNumber) { + result = true; + break; + } + } + } + return result; + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/validation/ValidatorSupport.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/META-INF/MANIFEST.MF 2010-06-17 06:43:13 UTC (rev 22842) @@ -3,7 +3,6 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.seam.pages.xml.test;singleton:=true Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: seam-pages-xml-tests.jar Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.seam.pages.xml.test Require-Bundle: Modified: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/build.properties 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/build.properties 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,10 +1,10 @@ bin.includes = META-INF/,\ - seam-pages-xml-tests.jar,\ projects/,\ info.xml,\ about.html,\ ant.properties,\ - plugin.properties + plugin.properties,\ + . src.includes = META-INF/,\ ant.properties,\ build.properties,\ @@ -12,5 +12,6 @@ src/,\ projects/,\ about.html -source.seam-pages-xml-tests.jar = src/ -jars.compile.order = seam-pages-xml-tests.jar +jars.compile.order = . +source.. = src/ +output.. = bin/ Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-06-17 06:43:13 UTC (rev 22842) @@ -11,4 +11,15 @@ <artifactId>org.jboss.tools.seam.ui.bot.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2010-06-17 06:43:13 UTC (rev 22842) @@ -29,7 +29,8 @@ org.jboss.tools.vpe.ui.test, org.jboss.tools.common.el.core, org.jboss.tools.common.ui, - org.jboss.tools.common.el.ui + org.jboss.tools.common.el.ui, + org.jboss.tools.jsf.text.ext;bundle-version="3.1.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.ca, org.jboss.tools.seam.ui.test.hyperlink, @@ -37,6 +38,5 @@ org.jboss.tools.seam.ui.test.preferences, org.jboss.tools.seam.ui.test.view, org.jboss.tools.seam.ui.test.wizard -Bundle-ClassPath: seam-ui.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/build.properties 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,12 +1,10 @@ bin.includes = META-INF/,\ - seam-ui.jar,\ projects/,\ seam/,\ - plugin.properties -source.seam-ui.jar = src/ -jars.compile.order = seam-ui.jar -src.includes = src/,\ - build.properties,\ - META-INF/,\ - projects/,\ + plugin.properties,\ + . +jars.compile.order = . +src.includes = projects/,\ seam/ +source.. = src/ +output.. = bin/ Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-06-17 06:43:13 UTC (rev 22842) @@ -10,5 +10,52 @@ <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.seam.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> + <properties> + <requirements>jbossas</requirements> + <projectRoot>${basedir}/../../..</projectRoot> + <requirements.build>${projectRoot}/requirements/target</requirements.build> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <skip>false</skip> + <explodedBundles> + <bundle>org.jboss.tools.seam.core.test</bundle> + <bundle>org.jboss.tools.seam.core</bundle> + </explodedBundles> + <product>org.jboss.tools.tests</product> + <argLine>-Djbosstools.test.jboss.home.4.2=${requirements.build}/jboss-4.2.3.GA -Djbosstools.test.seam.1.2.1.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seam -Djbosstools.test.seam.2fp.eap.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp -Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA -Djbosstools.test.seam.2.1.0.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/SeamUiAllTests.class</include> + </includes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>prepare-eclipse-base</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant dir="${projectRoot}/requirements" inheritAll="true"> + <property name="requirements" value="${requirements}" /> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -17,6 +17,7 @@ import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1645Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistJbide1676Test; import org.jboss.tools.seam.ui.test.ca.SeamELContentAssistTest; +import org.jboss.tools.seam.ui.test.el.ELExprPartitionerTest; import org.jboss.tools.seam.ui.test.hyperlink.SeamViewHyperlinkPartitionerTest; import org.jboss.tools.seam.ui.test.jbide.JBide3989Test; import org.jboss.tools.seam.ui.test.preferences.SeamPreferencesPageTest; @@ -41,7 +42,7 @@ public static Test suite() { TestSuite suite = new TestSuite("Seam UI tests"); - + suite.addTestSuite(ELExprPartitionerTest.class); suite.addTestSuite(OpenSeamComponentDialogTest.class); suite.addTest(SeamComponentsViewAllTests.suite()); suite.addTest(SeamProjectNewWizardTest.suite()); Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -0,0 +1,301 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.ui.test.el; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocumentExtension3; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; +import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.AxisUtil; +import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +public class ELExprPartitionerTest extends TestCase { + TestProjectProvider provider = null; + IProject project = null; + boolean makeCopy = false; + private static final String PROJECT_NAME = "numberguess"; + private static final String PAGE_NAME = "/web/giveup.jspx"; + + public static Test suite() { + return new TestSuite(ELExprPartitionerTest.class); + } + + public void setUp() throws Exception { + provider = new TestProjectProvider("org.jboss.tools.jsf.text.ext.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy); + project = provider.getProject(); + Throwable exception = null; + + assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + } + } + + public void testELExprPartitioner() { + try { + JobUtils.waitForIdle(); + } catch (Exception e) { + assertNull("An exception caught: " + e.getMessage(), e); + } + assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null)); + + IFile jspFile = project.getFile(PAGE_NAME); + + assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile != null)); + assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile.exists())); + + FileEditorInput editorInput = new FileEditorInput(jspFile); + + IDocumentProvider documentProvider = null; + Throwable exception = null; + try { + documentProvider = DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput); + } catch (Exception x) { + exception = x; + x.printStackTrace(); + } + assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + + assertNotNull("The document provider for the file \"" + PAGE_NAME + "\" is not loaded", documentProvider); + + try { + documentProvider.connect(editorInput); + } catch (Exception x) { + exception = x; + x.printStackTrace(); + assertTrue("The document provider is not able to be initialized with the editor input", false); + } + assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + + IDocument document = documentProvider.getDocument(editorInput); + + assertNotNull("The document for the file \"" + PAGE_NAME + "\" is not loaded", document); + + IStructuredModel model = null; + if (document instanceof IStructuredDocument) { + // corresponding releaseFromEdit occurs in + // dispose() + model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document); + EditorModelUtil.addFactoriesTo(model); + } + + assertNotNull("The document model for the file \"" + PAGE_NAME + "\" is not loaded", model); + + JSPExprHyperlinkPartitioner elPartitioner = new JSPExprHyperlinkPartitioner(); + + HashMap<Object, ArrayList<Region>> recognitionTest = new HashMap<Object, ArrayList<Region>>(); + + ArrayList<Region> regionList = new ArrayList<Region>(); + regionList.add(new Region(673, 7)); + regionList.add(new Region(680, 9)); + regionList.add(new Region(756, 7)); + regionList.add(new Region(763, 9)); + regionList.add(new Region(863, 7)); + regionList.add(new Region(870, 11)); + regionList.add(new Region(964, 19)); + regionList.add(new Region(1022, 18)); + regionList.add(new Region(1091, 17)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE", regionList); + + regionList = new ArrayList<Region>(); + regionList.add(new Region(920, 1)); + regionList.add(new Region(1168, 1)); + regionList.add(new Region(1251, 1)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION", regionList); + + regionList = new ArrayList<Region>(); + regionList.add(new Region(909, 11)); + regionList.add(new Region(921, 16)); + regionList.add(new Region(1157, 11)); + regionList.add(new Region(1169, 13)); + regionList.add(new Region(1237, 14)); + regionList.add(new Region(1252, 8)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", regionList); + + int counter = 0; + for (int i = 0; i < document.getLength(); i++) { + TestData testData = new TestData(document, i); + boolean recognized = elPartitioner.recognize(testData.document, testData.getHyperlinkRegion()); + if (recognized) { + String childPartitionType = elPartitioner.getChildPartitionType(testData.document, testData.getHyperlinkRegion()); + if (childPartitionType != null) { + ArrayList<Region> test = (ArrayList<Region>)recognitionTest.get(childPartitionType); + boolean testResult = false; + Iterator<Region> regions = test.iterator(); + Region r = null; + while (!testResult && regions.hasNext()) { + r = regions.next(); + if (r.getOffset() <= testData.offset && testData.offset < (r.getOffset() + r.getLength())) + testResult = true; + } + StringBuffer assertMessage = new StringBuffer(); + assertMessage.append("Wrong recognition for the region #") + .append(i) + .append(": ") + .append(testData.getHyperlinkRegion().toString()) + .append(" doesn't matches the regions for PARTITION_TYPE '") + .append(childPartitionType) + .append("' {"); + boolean first = true; + for (Region reg : test) { + if (!first) { + assertMessage.append(", "); + } else { + first = false; + } + assertMessage.append("[") + .append(reg.getOffset()) + .append("-") + .append(reg.getOffset() + reg.getLength()) + .append("]"); + } + assertMessage.append("}"); + + assertTrue(assertMessage.toString() , testResult); + counter++; + } else { + recognized = false; + } + } + if (!recognized) { + boolean testResult = false; + Iterator keys = recognitionTest.keySet().iterator(); + Region r = null; + while (keys != null && keys.hasNext()) { + Object key = keys.next(); + ArrayList test = (ArrayList)recognitionTest.get(key); + Iterator regions = test.iterator(); + while (!testResult && regions.hasNext()) { + r = (Region)regions.next(); + if (r.getOffset() <= testData.offset && testData.offset < (r.getOffset() + r.getLength())) + testResult = true; + } + } + assertFalse("Wrong recognition for the region: " + testData.getHyperlinkRegion().toString() + + " matches the wrong region [" + r.getOffset() + "-" + (r.getOffset() + r.getLength()) + "]" , testResult); + } + } + + assertEquals("Wrong recognized region count: ", 180, counter); + + model.releaseFromEdit(); + + documentProvider.disconnect(editorInput); + } + + class TestData { + IDocument document; + int offset; + ITypedRegion region; + String contentType; + private IHyperlinkRegion hyperlinkRegion = null; + + TestData (IDocument document, int offset) { + this.document = document; + this.offset = offset; + init(); + } + + private void init() { + this.region = getDocumentRegion(); + this.contentType = getContentType(); + this.hyperlinkRegion = getHyperlinkRegion(); + } + + private ITypedRegion getDocumentRegion() { + ITypedRegion region = null; + try { + region = (document instanceof IDocumentExtension3 ? + ((IDocumentExtension3)document).getDocumentPartitioner("org.eclipse.wst.sse.core.default_structured_text_partitioning").getPartition(offset) : + document.getDocumentPartitioner().getPartition(offset)); + } catch (Exception x) {} + + return region; + } + + public IHyperlinkRegion getHyperlinkRegion() { + if (hyperlinkRegion != null) + return hyperlinkRegion; + + return new IHyperlinkRegion() { + public String getAxis() { + return AxisUtil.getAxis(document, region.getOffset()); + } + public String getContentType() { + return contentType; + } + public String getType() { + return region.getType(); + } + public int getLength() { + return region.getLength(); + } + public int getOffset() { + return region.getOffset(); + } + public String toString() { + return "[" + getOffset() + "-" + (getOffset() + getLength() - 1) + ":" + getType() + ":" + getContentType() + "]"; + } + }; + } + + + /** + * Returns the content type of document + * + * @param document - + * assumes document is not null + * @return String content type of given document + */ + private String getContentType() { + String type = null; + + IModelManager mgr = StructuredModelManager.getModelManager(); + IStructuredModel model = null; + try { + model = mgr.getExistingModelForRead(document); + if (model != null) { + type = model.getContentTypeIdentifier(); + } + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + return type; + } + } + +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20EARNewOperationTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -59,7 +59,7 @@ @Override protected File getSeamHomeFolder() { - return new File(System.getProperty(SEAM_2_0_HOME)); + return new File(System.getProperty(SEAM_2_0_HOME)).getAbsoluteFile(); } @Override Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -62,7 +62,7 @@ @Override protected File getSeamHomeFolder() { - return new File(System.getProperty(SEAM_2_0_HOME)); + return new File(System.getProperty(SEAM_2_0_HOME)).getAbsoluteFile(); } @Override Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-06-17 06:43:13 UTC (rev 22842) @@ -1,5 +1,6 @@ +bin.includes = META-INF/,\ + projects/,\ + . +jars.compile.order = . source.. = src/ output.. = bin/ -bin.includes = META-INF/,\ - .,\ - projects/ Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -303,4 +303,9 @@ } return parent; } + + public static IProject importProject(String bundleName, String projectPath, + String name, Object object) throws IOException, CoreException, InvocationTargetException, InterruptedException { + return importProject(Platform.getBundle(bundleName), projectPath, name, null); + } } Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2010-06-17 05:57:41 UTC (rev 22841) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2010-06-17 06:43:13 UTC (rev 22842) @@ -58,7 +58,7 @@ if( null == projectPath ) { project = ResourcesUtils.importProject(bundleName, "projects" + Path.SEPARATOR + name, null); } else { - project = ResourcesUtils.importProject(bundleName, projectPath, null); + project = ResourcesUtils.importProject(bundleName, projectPath, name, null); } } catch (IOException e) { throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e));