June 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r22859 - in trunk/examples/tests/org.jboss.tools.project.examples.test: src/org/jboss/tools/project/examples/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-06-17 13:56:43 -0400 (Thu, 17 Jun 2010) New Revision: 22859 Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesPluginsLoadTest.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for examples component tests Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF =================================================================== --- trunk/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF 2010-06-17 15:06:58 UTC (rev 22858) +++ trunk/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF 2010-06-17 17:56:43 UTC (rev 22859) @@ -5,7 +5,8 @@ Bundle-Version: 1.1.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.junit;bundle-version="3.8.2", - org.jboss.tools.tests;bundle-version="2.0.0" + org.jboss.tools.tests;bundle-version="2.0.0", + org.jboss.tools.project.examples;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.tools.project.examples.test Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesPluginsLoadTest.java =================================================================== --- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesPluginsLoadTest.java 2010-06-17 15:06:58 UTC (rev 22858) +++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesPluginsLoadTest.java 2010-06-17 17:56:43 UTC (rev 22859) @@ -1,9 +1,10 @@ package org.jboss.tools.project.examples.test; +import org.eclipse.core.runtime.Platform; import org.jboss.tools.tests.AbstractPluginsLoadTest; public class ProjectExamplesPluginsLoadTest extends AbstractPluginsLoadTest { - public void testProjectExamplesPluginsAreResolvedAndActivated() { - testBundlesAreLoadedFor("org.jboss.tools.project.examples.feature"); + public void testOrgJbossToolsProjectExamplesAreResolvedAndActivated() { + assertPluginResolved(Platform.getBundle("org.jboss.tools.project.examples")); } }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22858 - trunk/seam/tests/org.jboss.tools.seamfp.ui.test.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-06-17 11:06:58 -0400 (Thu, 17 Jun 2010) New Revision: 22858 Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for module name in seamfp.ui.test pom.xml Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) +++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-17 15:06:58 UTC (rev 22858) @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.seam201GA.ui.test</artifactId> + <artifactId>org.jboss.tools.seamfp.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging>

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22857 - in trunk/seam/tests: org.jboss.tools.seam121EAP.ui.test and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-06-17 10:53:43 -0400 (Thu, 17 Jun 2010) New Revision: 22857 Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for missing pom.xml files in seam tests Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -1,14 +1,61 @@ <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.seam121EAP.core.test</artifactId> + <artifactId>org.jboss.tools.seam121EAP.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbeap,eapseamgen</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> + <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</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/project/facet/Seam12XFacetTestSuite121EAP.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam121EAP.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbeap,eapseamgen</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.ui.test</bundle> + <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</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam12XOperationsTestSuite121EAP.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -1,14 +1,61 @@ <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.seam201GA.core.test</artifactId> + <artifactId>org.jboss.tools.seam201GA.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.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> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite201GA.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam201GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.1.GA</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite201GA.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -1,14 +1,60 @@ <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.seam202SP1.core.test</artifactId> + <artifactId>org.jboss.tools.seam202SP1.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.2.SP1</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> + <explodedBundles> + <bundle>org.jboss.tools.seam.core.test</bundle> + <bundle>org.jboss.tools.seam.core</bundle> + </explodedBundles> + <argLine>-Djbosstools.test.seam.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.2.SP1</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite202SP1.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam202SP1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.2.SP1</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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.2.SP1</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite202SP1.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -1,14 +1,61 @@ <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.seam203CR1.core201.test</artifactId> + <artifactId>org.jboss.tools.seam203CR1.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.3.CR1</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> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.3.CR1</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite203CR1.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam203CR1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.0.3.CR1</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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.0.3.CR1</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite203CR1.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam211GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.1.1.GA</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite211GA.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam220CR1.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.2.0.CR1</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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.2.0.CR1</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -11,4 +11,52 @@ <artifactId>org.jboss.tools.seam220GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>seam-2.2.0.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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-seam-2.2.0.GA</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220GA.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> Property changes on: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -1,14 +1,61 @@ <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.seamfp.core.test</artifactId> + <artifactId>org.jboss.tools.seamfp.core.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbeap,eapseamgen,seamfp</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> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp</argLine> + <includes> + <include>org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuiteFP.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> Property changes on: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) +++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-17 14:53:43 UTC (rev 22857) @@ -8,7 +8,55 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> - <artifactId>org.jboss.tools.seamfp.ui.test</artifactId> + <artifactId>org.jboss.tools.seam201GA.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbeap,eapseamgen,seamfp</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.ui.test</bundle> + <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.2.0.1.GA.home=${projectRoot}/requirements/target/jboss-eap-4.3/seamfp</argLine> + <includes> + <include>org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuiteFP.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> Property changes on: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22856 - in trunk/seam/tests: org.jboss.tools.seam121EAP.ui.test and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-06-17 10:26:48 -0400 (Thu, 17 Jun 2010) New Revision: 22856 Added: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml Log: check in missing test poms Added: trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam121EAP.core.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam121EAP.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam201GA.core.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam201GA.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam202SP1.core.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam202SP1.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam203CR1.core201.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam203CR1.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam211GA.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam220CR1.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seam220GA.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seamfp.core.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project> Added: trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml 2010-06-17 14:26:48 UTC (rev 22856) @@ -0,0 +1,14 @@ +<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> + <parent> + <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.seamfp.ui.test</artifactId> + <version>3.1.0-SNAPSHOT</version> + <packaging>eclipse-test-plugin</packaging> +</project>

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22855 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-06-17 09:41:50 -0400 (Thu, 17 Jun 2010) New Revision: 22855 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java Log: https://jira.jboss.org/browse/JBIDE-6287 , SWTBot test: wrong selection exception was took away. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-17 12:15:13 UTC (rev 22854) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-17 13:41:50 UTC (rev 22855) @@ -13,7 +13,6 @@ import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox; import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.jboss.tools.vpe.messages.VpeUIMessages; @@ -33,12 +32,7 @@ @Override protected void closeUnuseDialogs() { -// try { -// SWTBotShell shell = bot.shell(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); -// shell.close(); -// } catch (Exception e) { -// // Do nothing -// } + } @Override @@ -198,6 +192,12 @@ */ editor.toTextEditor().selectRange(13, 0, 1); /* + * There is an exception caused by the fact that + * line delimiter was selected. + * But for this test it's ok, so just ignore this exception. + */ + setException(null); + /* * Activate the dialog */ bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click(); @@ -242,7 +242,6 @@ * Close the dialog */ bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close(); - /* * Check selection in the attribute's value */

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22854 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2010-06-17 08:15:13 -0400 (Thu, 17 Jun 2010) New Revision: 22854 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java Log: https://jira.jboss.org/browse/JBIDE-6287 , SWTBot test was updated to be able to test Empty Selection. Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-17 11:48:17 UTC (rev 22853) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-17 12:15:13 UTC (rev 22854) @@ -25,6 +25,7 @@ private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$ private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$ + private final String CANNOT_FIND_PROPERTY_VALUE = "Cannot find 'Property Value' text field"; //$NON-NLS-1$ public ExternalizeStringsDialogTest() { super(); @@ -68,16 +69,14 @@ SWTBotText defKeyText = bot.textWithLabelInGroup( VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY, VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); - if (null != defKeyText) { - assertText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY, - defKeyText); - } + assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$ + assertText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY, + defKeyText); SWTBotText defValueText = bot.textWithLabelInGroup( VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); - if (null != defValueText) { - assertText("User", defValueText); //$NON-NLS-1$ - } + assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); + assertText("User", defValueText); //$NON-NLS-1$ SWTBotCheckBox checkBox = bot.checkBox(); assertNotNull("Cannot find checkbox '" //$NON-NLS-1$ + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_NEW_FILE + "'", //$NON-NLS-1$ @@ -110,7 +109,7 @@ * Press OK and replace the text in the editor */ assertTrue("(OK) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.OK_BUTTON).isEnabled()); + bot.button(WidgetVariables.OK_BUTTON).isEnabled()); bot.button(WidgetVariables.OK_BUTTON).click(); /* * Check replaced text @@ -169,7 +168,7 @@ assertNotNull("'File Name:' text field is not found", fileName); //$NON-NLS-1$ fileName.setText("externalize.properties"); //$NON-NLS-1$ assertTrue("(OK) button should be enabled.", //$NON-NLS-1$ - bot.button(WidgetVariables.OK_BUTTON).isEnabled()); + bot.button(WidgetVariables.OK_BUTTON).isEnabled()); bot.button(WidgetVariables.OK_BUTTON).click(); /* * Check that the text was replaced @@ -186,4 +185,85 @@ String line = editor2.toTextEditor().getSelection(); assertEquals("Created file is incorrect", "key=Input", line); //$NON-NLS-1$ //$NON-NLS-2$ } + + public void test�EmptySelectionInExternalizeStringsDialog() throws Throwable { + /* + * Open simple html file in order to get the VPE toolbar + */ + SWTBotEditor editor = SWTTestExt.packageExplorer.openFile(JBT_TEST_PROJECT_NAME, + "WebContent", "pages", TEST_PAGE); //$NON-NLS-1$ //$NON-NLS-2$ + editor.setFocus(); + /* + * Select some text + */ + editor.toTextEditor().selectRange(13, 0, 1); + /* + * Activate the dialog + */ + bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate(); + /* + * Check that the property value text is empty + */ + SWTBotText defValueText = bot.textWithLabelInGroup( + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); + assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); + assertText("", defValueText); //$NON-NLS-1$ + /* + * Close the dialog + */ + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close(); + /* + * Type some text outside the tag + */ + editor.toTextEditor().typeText(13, 0, "Plain text in the JSP file"); //$NON-NLS-1$ + /* + * Select nothing and call the dialog -- + * the whole text should be selected. + */ + editor.toTextEditor().selectRange(13, 3, 0); + /* + * Activate the dialog + */ + bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate(); + /* + * Check that the property value text is empty + */ + defValueText = bot.textWithLabelInGroup( + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); + assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); + assertText("Plain text in the JSP file", defValueText); //$NON-NLS-1$ + /* + * Close the dialog + */ + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close(); + + /* + * Check selection in the attribute's value + */ + editor.toTextEditor().selectRange(18, 50, 0); + /* + * Activate the dialog + */ + bot.toolbarButtonWithTooltip(VpeUIMessages.EXTERNALIZE_STRINGS).click(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus(); + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate(); + /* + * Check that the property value text is empty + */ + defValueText = bot.textWithLabelInGroup( + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE, + VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP); + assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText); + assertText("true", defValueText); //$NON-NLS-1$ + /* + * Close the dialog + */ + bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).close(); + } }

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22853 - trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2010-06-17 07:48:17 -0400 (Thu, 17 Jun 2010) New Revision: 22853 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java Log: https://jira.jboss.org/browse/JBIDE-5979 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-17 11:45:01 UTC (rev 22852) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-17 11:48:17 UTC (rev 22853) @@ -155,7 +155,7 @@ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { /* - * Fixed by yzhishko. See https://jira.jboss.org/jira/browse/JBIDE-. + * Fixed by yzhishko. See https://jira.jboss.org/jira/browse/JBIDE-5979. */ IEditorPart editorPart = PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage().getActiveEditor();

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22852 - in trunk/jst/plugins/org.jboss.tools.jst.css: src/org/jboss/tools/jst/css/common and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2010-06-17 07:45:01 -0400 (Thu, 17 Jun 2010) New Revision: 22852 Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java Log: https://jira.jboss.org/browse/JBIDE-5979 - fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2010-06-17 11:37:43 UTC (rev 22851) +++ trunk/jst/plugins/org.jboss.tools.jst.css/META-INF/MANIFEST.MF 2010-06-17 11:45:01 UTC (rev 22852) @@ -15,7 +15,8 @@ org.eclipse.debug.ui, org.eclipse.wst.sse.core, org.eclipse.jface.text, - org.eclipse.wst.xml.core + org.eclipse.wst.xml.core, + org.eclipse.wst.sse.ui Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.jst.css, Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-17 11:37:43 UTC (rev 22851) +++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/common/CSSStyleListener.java 2010-06-17 11:45:01 UTC (rev 22852) @@ -20,9 +20,13 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.contentoutline.ContentOutline; +import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem; +import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration; import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.eclipse.wst.sse.ui.internal.properties.ConfigurablePropertySheetPage; import org.jboss.tools.jst.css.CssPlugin; @SuppressWarnings("restriction") @@ -150,6 +154,17 @@ public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) { + /* + * Fixed by yzhishko. See https://jira.jboss.org/jira/browse/JBIDE-. + */ + IEditorPart editorPart = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + StructuredTextEditor structuredTextEditor = (StructuredTextEditor) editorPart; + Object page = structuredTextEditor.getAdapter(IPropertySheetPage.class); + if (page instanceof ConfigurablePropertySheetPage) { + ((ConfigurablePropertySheetPage) page).refresh(); + } + clearListeners(newValue); clearListeners(oldValue); Object[] array = listeners.getListeners(); @@ -166,21 +181,21 @@ } } - + /* * Fixed by yzhishko. See https://jira.jboss.org/jira/browse/JBIDE-5954. */ - private void clearListeners(Object node){ + private void clearListeners(Object node) { if (!(node instanceof ICSSStyleDeclItem)) { return; } if (!(node instanceof INodeNotifier)) { return; } - ((INodeNotifier)node).removeAdapter(this); - ((INodeNotifier)node).addAdapter(this); + ((INodeNotifier) node).removeAdapter(this); + ((INodeNotifier) node).addAdapter(this); } - + public void partActivated(IWorkbenchPart part) { currentPart = part; Object[] array = listeners.getListeners();

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22851 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-06-17 07:37:43 -0400 (Thu, 17 Jun 2010) New Revision: 22851 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java Log: https://jira.jboss.org/browse/JBIDE-6474 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2010-06-17 10:47:06 UTC (rev 22850) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/AssignabilityOfRawAndParameterizedTypesTest.java 2010-06-17 11:37:43 UTC (rev 22851) @@ -45,12 +45,12 @@ */ public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes() throws CoreException { IType type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.MapProducer"); - IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QMap<QInteger;>;"); + IParametedType parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QMap<QInteger;QInteger;>;"); Set<IBean> beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]); assertEquals("Wrong number of the beans", 2, beans.size()); type = EclipseJavaUtil.findType(EclipseUtil.getJavaProject(cdiProject.getNature().getProject()), "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap"); - parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QHashMap<QInteger;>;"); + parametedType = cdiProject.getNature().getTypeFactory().getParametedType(type, "QHashMap<QInteger;QInteger;>;"); beans = cdiProject.getBeans(true, parametedType, new IQualifierDeclaration[0]); assertFalse("Wrong number of the beans", beans.isEmpty()); assertContainsBeanClass(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.IntegerHashMap"); @@ -83,7 +83,7 @@ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection"); Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals("Wrong number of the beans", 1, beans.size()); - assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object"); + assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result"); } /** @@ -96,7 +96,7 @@ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection2"); Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals("Wrong number of the beans", 1, beans.size()); - assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object"); + assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result"); } /** @@ -109,7 +109,7 @@ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection3"); Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals("Wrong number of the beans", 1, beans.size()); - assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object"); + assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result"); } /** @@ -122,6 +122,6 @@ IInjectionPointField injection = getInjectionPointField("JavaSource/org/jboss/jsr299/tck/tests/jbt/resolution/AssignabilityOfRawAndParameterizedTypes.java", "injection4"); Set<IBean> beans = cdiProject.getBeans(true, injection); assertEquals("Wrong number of the beans", 1, beans.size()); - assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result", "java.lang.Object"); + assertContainsBeanClasses(beans, "org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized.Result"); } } \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r22850 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-06-17 06:47:06 -0400 (Thu, 17 Jun 2010) New Revision: 22850 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java Log: https://jira.jboss.org/browse/JBIDE-6474 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-06-17 09:19:25 UTC (rev 22849) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2010-06-17 10:47:06 UTC (rev 22850) @@ -322,8 +322,19 @@ } public static boolean containsType(Set<IParametedType> types, IParametedType type) { + if(type == null) { + return false; + } + IType jType = type.getType(); + if(jType == null) return false; for (IParametedType t: types) { - if(t.equals(type)) return true; + IType jType1 = t.getType(); + if(!jType.equals(jType1)) continue; + if(!((ParametedType)t).getArrayPrefix().equals(((ParametedType)type).getArrayPrefix())) continue; + if(((ParametedType)t).isAssignableTo((ParametedType)type, false)) { + return true; + } + } return false; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-06-17 09:19:25 UTC (rev 22849) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2010-06-17 10:47:06 UTC (rev 22850) @@ -20,6 +20,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory; @@ -37,6 +38,10 @@ protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>(); protected boolean primitive; + protected boolean isUpper = false; + protected boolean isLower = false; + protected boolean isVariable = false; + boolean inheritanceIsBuilt = false; protected ParametedType superType = null; protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>(); @@ -62,6 +67,30 @@ this.primitive = primitive; } + public boolean isUpper() { + return isUpper; + } + + public void setUpper(boolean b) { + isUpper = b; + } + + public boolean isLower() { + return isLower; + } + + public void setLower(boolean b) { + isLower = b; + } + + public boolean isVariable() { + return isVariable; + } + + public void setVariable(boolean b) { + isVariable = b; + } + public ParametedTypeFactory getFactory() { return typeFactory; } @@ -136,7 +165,11 @@ String sc = type.getSuperclassTypeSignature(); boolean objectArray = false; if(sc != null) { - sc = resolveParameters(sc); + try { + sc = resolveParameters(sc); + } catch (Exception e) { + e.printStackTrace(); + } } else if(!"java.lang.Object".equals(type.getFullyQualifiedName())) { sc = "QObject;"; } else if("java.lang.Object".equals(type.getFullyQualifiedName()) && arrayPrefix.length() > 0) { @@ -213,15 +246,12 @@ if(j < i) { return typeSignature; } - String params = typeSignature.substring(i + 1, j); boolean replaced = false; StringBuffer newParams = new StringBuffer(); - StringTokenizer st = new StringTokenizer(params); - while(st.hasMoreTokens()) { - String param = st.nextToken(); + String[] ps = Signature.getTypeArguments(typeSignature); + for (String param: ps) { String newParam = resolveParameters( param); if(!param.equals(newParam)) replaced = true; - if(newParam.length() == 0) newParams.append(','); newParams.append(newParam); } if(replaced) { @@ -276,4 +306,50 @@ return signature + ":" + super.toString(); } + public boolean isAssignableTo(ParametedType other, boolean checkInheritance) { + if(equals(other)) return true; + if(this.type == null) return false; + if(other.isVariable && other.type == null) return true; + if(this.type.equals(other.type)) { + if(areTypeParametersAssignableTo(other)) return true; + } + if(checkInheritance) { + for (IParametedType t: getInheritedTypes()) { + if(((ParametedType)t).isAssignableTo(other, false)) return true; + } + } + return false; + } + + boolean areTypeParametersAssignableTo(ParametedType other) { + if(other.parameterTypes.size() == 0) return true; + if(this.parameterTypes.size() != other.parameterTypes.size()) return false; + for (int i = 0; i < parameterTypes.size(); i++) { + ParametedType p1 = parameterTypes.get(i); + ParametedType p2 = other.parameterTypes.get(i); + if(p1.isLower() || p1.isUpper()) return false; + if(p1.isVariable()) { + if(p2.isVariable()) { + if(p2.isAssignableTo(p1, true)) continue; + } else if(p2.isLower()) { + if(p2.isAssignableTo(p1, true)) continue; + } else if(p2.isUpper()) { + if(p2.isAssignableTo(p1, true)) continue; + if(p1.isAssignableTo(p2, true)) continue; + } else { + if(p2.isAssignableTo(p1, true)) continue; + } + } else { + if(p2.isLower()) { + if(p2.isAssignableTo(p1, true)) continue; + } else { + if(p1.isAssignableTo(p2, true)) continue; + } + } + + return false; + } + return true; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2010-06-17 09:19:25 UTC (rev 22849) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2010-06-17 10:47:06 UTC (rev 22850) @@ -36,6 +36,10 @@ inheritedTypes = type.inheritedTypes; superType = type.superType; primitive = type.primitive; + + isLower = type.isLower; + isUpper = type.isUpper; + isVariable = type.isVariable; } public int getLength() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-06-17 09:19:25 UTC (rev 22849) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-06-17 10:47:06 UTC (rev 22850) @@ -20,6 +20,7 @@ import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.internal.core.impl.ParametedType; import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration; @@ -55,6 +56,25 @@ parametedType.setFactory(this); parametedType.setType(type); if(type != null) parametedType.setSignature("Q" + type.getFullyQualifiedName() + ";"); + String[] ps = null; + try { + ps = type.getTypeParameterSignatures(); + } catch (JavaModelException e) { + //ignore + } + if(ps != null && ps.length > 0) { + for (int i = 0; i < ps.length; i++) { + try { + ParametedType p = getParametedTypeForParameter(type, ps[i], null); + if(p != null) parametedType.addParameter(p); + } catch (JavaModelException e) { + e.printStackTrace(); + } catch (Exception ee) { + ee.printStackTrace(); + } + + } + } return parametedType; } @@ -75,14 +95,25 @@ typeSignature = primitives.get(typeSignature); result.setSignature(result.getArrayPrefix() + typeSignature); result.setPrimitive(true); - } + } else if(typeSignature.startsWith("+")) { + typeSignature = typeSignature.substring(1); + result.setUpper(true); + } else if(typeSignature.startsWith("-")) { + typeSignature = typeSignature.substring(1); + result.setLower(true); + } int startToken = typeSignature.indexOf('<'); if(startToken < 0) { String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeSignature); if(resovedTypeName == null) return null; if(!context.isBinary()) { - result.setSignature(result.getArrayPrefix() + "Q" + resovedTypeName + ";"); + StringBuffer ns = new StringBuffer(); + ns.append(result.getArrayPrefix()); + if(result.isLower()) ns.append('-'); + if(result.isUpper()) ns.append('+'); + ns.append('Q').append(resovedTypeName).append(";"); + result.setSignature(ns.toString()); } IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); if(type != null) { @@ -93,51 +124,52 @@ if(context instanceof IMethod) { String[] ps = ((IMethod)context).getTypeParameterSignatures(); for (int i = 0; i < ps.length; i++) { - String t = ps[i]; - int cp = t.indexOf(":"); - if(cp > 0) t = t.substring(0, cp); - t = "Q" + t + ";"; - if(t.equals(result.getSignature())) { - cache.put(key, result); - return result; + ParametedType st = getParametedTypeForParameter(context, ps[i], result); + if(st != null) { + if(st.getSignature().indexOf(':') >= 0) { + CDICorePlugin.getDefault().logWarning("Wrong signature=" + st.getSignature()); + } + return st; } } } String[] ps = contextType.getTypeParameterSignatures(); for (int i = 0; i < ps.length; i++) { - String t = ps[i]; - if(t.endsWith(":")) t = t.substring(0, t.length() - 1); - t = "Q" + t + ";"; - if(t.equals(result.getSignature())) { - cache.put(key, result); - return result; - } + ParametedType st = getParametedTypeForParameter(contextType, ps[i], result); + if(st != null) return st; } } else { int endToken = typeSignature.lastIndexOf('>'); if(endToken < startToken) return null; String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1); - String params = typeSignature.substring(startToken + 1, endToken); String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeName); if(resovedTypeName == null) return null; IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); if(type != null) { result.setType(type); StringBuffer newParams = new StringBuffer(); - StringTokenizer st = new StringTokenizer(params, ","); - while(st.hasMoreTokens()) { - String paramSignature = st.nextToken(); + String[] paramSignatures = null; + try { + paramSignatures = Signature.getTypeArguments(typeSignature); + } catch (Exception e) { + e.printStackTrace(); + } + if(paramSignatures != null) for (String paramSignature: paramSignatures) { ParametedType param = getParametedType(context, paramSignature); if(param == null) { param = new ParametedType(); param.setSignature(paramSignature); } result.addParameter(param); - if(newParams.length() > 0) newParams.append(','); newParams.append(param.getSignature()); } if(!context.isBinary()) { - result.setSignature(result.getArrayPrefix() + "Q" + resovedTypeName + '<' + newParams + '>' + ';'); + StringBuffer ns = new StringBuffer(); + ns.append(result.getArrayPrefix()); + if(result.isLower()) ns.append('-'); + if(result.isUpper()) ns.append('+'); + ns.append('Q').append(resovedTypeName).append('<').append(newParams).append(">;"); + result.setSignature(ns.toString()); } cache.put(key, result); return result; @@ -146,6 +178,40 @@ return null; } + public ParametedType getParametedTypeForParameter(IMember context, String typeParameterSignature, ParametedType result) throws JavaModelException { + IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType(); + String key = context == null ? typeParameterSignature : contextType.getFullyQualifiedName() + "+" + typeParameterSignature; + + String t = typeParameterSignature; + int q = t.indexOf(":"); + if(q >= 0) { + t = t.substring(0, q); + } + t = "Q" + t + ";"; + if(result == null || t.equals(result.getSignature())) { + if(q >= 0) { + String sts = typeParameterSignature.substring(q + 1); + if(sts.length() > 0) { + ParametedType st = getParametedType(contextType, sts); + if(st != null) { + result = new TypeDeclaration(st, 0, 0); + } + } else if(result != null) { + result.setSignature(t); + } + } + if(result == null) { + result = new ParametedType(); + result.setFactory(this); + result.setSignature(t); + } + result.setVariable(true); + cache.put(key, result); + return result; + } + return null; + } + public void clean() { cache.clear(); }

15 years, 10 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits June 2010