Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
104: removed test inclusion specifications
Task-Url: #104
- Loading branch information
1 parent
1e322ab
commit e2d92bc
Showing
5 changed files
with
97 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,57 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <relativePath>../jbase.parent/pom.xml</relativePath> | ||
| <groupId>net.sf.xtext-jbase</groupId> | ||
| <artifactId>jbase.parent</artifactId> | ||
| <version>0.9.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <relativePath>../jbase.parent/pom.xml</relativePath> | ||
| <groupId>net.sf.xtext-jbase</groupId> | ||
| <artifactId>jbase.parent</artifactId> | ||
| <version>0.9.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>jbase.example.purejbase.tests</artifactId> | ||
| <packaging>eclipse-test-plugin</packaging> | ||
|
|
||
| <properties> | ||
| <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 --> | ||
| <sonar.sources></sonar.sources> | ||
| <sonar.tests>src,xtend-gen</sonar.tests> | ||
| </properties> | ||
| <artifactId>jbase.example.purejbase.tests</artifactId> | ||
| <packaging>eclipse-test-plugin</packaging> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
| <properties> | ||
| <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 --> | ||
| <sonar.sources></sonar.sources> | ||
| <sonar.tests>src,xtend-gen</sonar.tests> | ||
| </properties> | ||
|
|
||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-surefire-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <!-- compiler tests need an OSGI environment, but no UI --> | ||
| <id>default-test</id> | ||
| <phase>integration-test</phase> | ||
| <configuration> | ||
| <skip>${swtbot.tests.only}</skip> | ||
| <useUIHarness>false</useUIHarness> | ||
| <useUIThread>false</useUIThread> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration for argLine | ||
| for jacoco agent --> | ||
| <argLine>${memoryArgs} ${moduleProperties}</argLine> | ||
| <includes> | ||
| <include>**/purejbase/tests/*Test.java</include> | ||
| </includes> | ||
| </configuration> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| <!-- <execution> --> | ||
| <!-- <id>TychoSurefirePluginUiTest</id> --> | ||
| <!-- <phase>integration-test</phase> --> | ||
| <!-- <configuration> --> | ||
| <!-- <skip>${swtbot.tests.only}</skip> --> | ||
| <!-- <useUIHarness>true</useUIHarness> --> | ||
| <!-- <useUIThread>true</useUIThread> --> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration for argLine for jacoco agent --> | ||
| <!-- <argLine>${tycho.testArgLine} ${memoryArgs} -DbuildingWithTycho=true</argLine> --> | ||
| <!-- <includes> --> | ||
| <!-- <include>**/jbase/ui/tests/*Test.java</include> --> | ||
| <!-- </includes> --> | ||
| <!-- </configuration> --> | ||
| <!-- <goals> --> | ||
| <!-- <goal>test</goal> --> | ||
| <!-- </goals> --> | ||
| <!-- </execution> --> | ||
| </executions> | ||
| </plugin> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-surefire-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <!-- compiler tests need an OSGI environment, but no UI --> | ||
| <id>default-test</id> | ||
| <phase>integration-test</phase> | ||
| <configuration> | ||
| <skip>${swtbot.tests.only}</skip> | ||
| <useUIHarness>false</useUIHarness> | ||
| <useUIThread>false</useUIThread> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration | ||
| for argLine for jacoco agent --> | ||
| <argLine>${memoryArgs} ${moduleProperties}</argLine> | ||
| </configuration> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,56 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
|
|
||
| <modelVersion>4.0.0</modelVersion> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <relativePath>../jbase.parent/pom.xml</relativePath> | ||
| <groupId>net.sf.xtext-jbase</groupId> | ||
| <artifactId>jbase.parent</artifactId> | ||
| <version>0.9.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <relativePath>../jbase.parent/pom.xml</relativePath> | ||
| <groupId>net.sf.xtext-jbase</groupId> | ||
| <artifactId>jbase.parent</artifactId> | ||
| <version>0.9.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>jbase.testlanguage.tests</artifactId> | ||
| <packaging>eclipse-test-plugin</packaging> | ||
|
|
||
| <properties> | ||
| <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 --> | ||
| <sonar.sources></sonar.sources> | ||
| <sonar.tests>src,xtend-gen</sonar.tests> | ||
| </properties> | ||
| <artifactId>jbase.testlanguage.tests</artifactId> | ||
| <packaging>eclipse-test-plugin</packaging> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
| <properties> | ||
| <!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 --> | ||
| <sonar.sources></sonar.sources> | ||
| <sonar.tests>src,xtend-gen</sonar.tests> | ||
| </properties> | ||
|
|
||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-surefire-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <!-- compiler tests need an OSGI environment, but no UI --> | ||
| <id>default-test</id> | ||
| <phase>integration-test</phase> | ||
| <configuration> | ||
| <skip>${swtbot.tests.only}</skip> | ||
| <useUIHarness>false</useUIHarness> | ||
| <useUIThread>false</useUIThread> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration for argLine | ||
| for jacoco agent --> | ||
| <argLine>${memoryArgs} ${moduleProperties}</argLine> | ||
| <includes> | ||
| <include>**/jbase/testlanguage/tests/*Test.java</include> | ||
| </includes> | ||
| </configuration> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| <!-- <execution> --> | ||
| <!-- <id>TychoSurefirePluginUiTest</id> --> | ||
| <!-- <phase>integration-test</phase> --> | ||
| <!-- <configuration> --> | ||
| <!-- <skip>${swtbot.tests.only}</skip> --> | ||
| <!-- <useUIHarness>true</useUIHarness> --> | ||
| <!-- <useUIThread>true</useUIThread> --> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration for argLine for jacoco agent --> | ||
| <!-- <argLine>${tycho.testArgLine} ${memoryArgs} -DbuildingWithTycho=true</argLine> --> | ||
| <!-- <includes> --> | ||
| <!-- <include>**/jbase/ui/tests/*Test.java</include> --> | ||
| <!-- </includes> --> | ||
| <!-- </configuration> --> | ||
| <!-- <goals> --> | ||
| <!-- <goal>test</goal> --> | ||
| <!-- </goals> --> | ||
| <!-- </execution> --> | ||
| </executions> | ||
| </plugin> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.eclipse.xtend</groupId> | ||
| <artifactId>xtend-maven-plugin</artifactId> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| <plugin> | ||
| <groupId>org.eclipse.tycho</groupId> | ||
| <artifactId>tycho-surefire-plugin</artifactId> | ||
| <version>${tycho-version}</version> | ||
| <executions> | ||
| <execution> | ||
| <id>default-test</id> | ||
| <phase>integration-test</phase> | ||
| <configuration> | ||
| <skip>${swtbot.tests.only}</skip> | ||
| <useUIHarness>false</useUIHarness> | ||
| <useUIThread>false</useUIThread> | ||
| <!-- tycho.testArgLine repeated to re-use the configuration | ||
| for argLine for jacoco agent --> | ||
| <argLine>${memoryArgs} ${moduleProperties}</argLine> | ||
| </configuration> | ||
| <goals> | ||
| <goal>test</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| </plugins> | ||
| </build> | ||
| </project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters