diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ajcTests.xml | 30 | ||||
-rw-r--r-- | tests/pom.xml | 246 | ||||
-rw-r--r-- | tests/test.ser | bin | 33 -> 0 bytes |
3 files changed, 160 insertions, 116 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml index 11d052ad1..a898def3e 100644 --- a/tests/ajcTests.xml +++ b/tests/ajcTests.xml @@ -1,20 +1,20 @@ <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd" [ -<!ENTITY ajc10xTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml"> -<!ENTITY ajc11Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11-tests.xml"> -<!ENTITY ajc120Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120-tests.xml"> -<!ENTITY ajc121Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121-tests.xml"> -<!ENTITY aspectpathTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml"> -<!ENTITY baseTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/base/baseTests-tests.xml"> +<!ENTITY ajc10xTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc10x/ajc10x.xml"> +<!ENTITY ajc11Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc11/ajc11.xml"> +<!ENTITY ajc120Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc120/ajc120.xml"> +<!ENTITY ajc121Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/ajc121/ajc121.xml"> +<!ENTITY aspectpathTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/aspectpath/aspectpath.xml"> +<!ENTITY baseTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/base/baseTests.xml"> <!ENTITY designTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/design/designtest.xml"> -<!ENTITY incrementalTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/incremental/incremental-tests.xml"> -<!ENTITY inpathTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/inpath/inpath-tests.xml"> -<!ENTITY java14Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/java14/java14-tests.xml"> -<!ENTITY knownlimitationsTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml"> -<!ENTITY optionsTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/options/options-tests.xml"> -<!ENTITY pre10xTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x-tests.xml"> -<!ENTITY purejavaTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava-tests.xml"> -<!ENTITY serialVerUIDTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID-tests.xml"> -<!ENTITY xlintTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/xlint/xlint-tests.xml"> +<!ENTITY incrementalTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/incremental/incremental.xml"> +<!ENTITY inpathTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/inpath/inpath.xml"> +<!ENTITY java14Tests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/java14/java14.xml"> +<!ENTITY knownlimitationsTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations.xml"> +<!ENTITY optionsTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/options/options.xml"> +<!ENTITY pre10xTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/pre10x/pre10x.xml"> +<!ENTITY purejavaTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava.xml"> +<!ENTITY serialVerUIDTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/serialVerUID/serialVerUID.xml"> +<!ENTITY xlintTests SYSTEM "../tests/src/test/resources/org/aspectj/systemtest/xlint/xlint.xml"> ]> <!-- diff --git a/tests/pom.xml b/tests/pom.xml index 51273cdfd..78b34bd6a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,107 +1,151 @@ <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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.aspectj</groupId> - <artifactId>aspectj-parent</artifactId> - <version>1.9.3.BUILD-SNAPSHOT</version> - <relativePath>..</relativePath> - </parent> + <parent> + <groupId>org.aspectj</groupId> + <artifactId>aspectj-parent</artifactId> + <version>1.9.3.BUILD-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> - <artifactId>tests</artifactId> - <packaging>jar</packaging> - <name>tests</name> + <artifactId>tests</artifactId> + <packaging>jar</packaging> + <name>tests</name> - <dependencies> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>bridge</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>ajde.core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>asm</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>weaver</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>org.aspectj.matcher</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>org.aspectj.ajdt.core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>org.aspectj.ajdt.core</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>ajde.core</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>bcel-builder</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>testing</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>testing-drivers</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>testing-util</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/ant/lib/ant-launcher.jar</systemPath> - </dependency> - <dependency> - <groupId>org.aspectj</groupId> - <artifactId>testing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - </dependency> - <dependency> - <groupId>commons</groupId> - <artifactId>commons</artifactId> - <version>1.0</version> - <scope>system</scope> - <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>bridge</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>ajde.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>asm</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>runtime</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>weaver</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>org.aspectj.matcher</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../lib/asm/asm-7.0-beta.renamed.jar</systemPath> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>org.aspectj.ajdt.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>org.eclipse.jdt.core</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../org.eclipse.jdt.core/jdtcore-for-aspectj.jar</systemPath> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>org.aspectj.ajdt.core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../lib/ant/lib/ant.jar</systemPath> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>ajde.core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>bcel-builder</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>testing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>testing</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>testing-drivers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>testing-util</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-launcher</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../lib/ant/lib/ant-launcher.jar</systemPath> + </dependency> + <dependency> + <groupId>commons</groupId> + <artifactId>commons</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath> + </dependency> + </dependencies> + + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration combine.self="override"> + <testFailureIgnore>true</testFailureIgnore> + <includes> + <include>**/TestsModuleTests*</include> + </includes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/tests/test.ser b/tests/test.ser Binary files differdeleted file mode 100644 index ad188ec55..000000000 --- a/tests/test.ser +++ /dev/null |