diff options
author | Andy Clement <aclement@pivotal.io> | 2019-01-23 13:31:20 -0800 |
---|---|---|
committer | Andy Clement <aclement@pivotal.io> | 2019-01-23 13:31:20 -0800 |
commit | 27f3a1ceb20f5515962151e57dca7c3798e71f48 (patch) | |
tree | 5e097f77354e2e774ca9f327cd304f684b5f3604 /testing-util | |
parent | 68e9bc60f98ece8557eb6499326644a956d2dcf9 (diff) | |
download | aspectj-27f3a1ceb20f5515962151e57dca7c3798e71f48.tar.gz aspectj-27f3a1ceb20f5515962151e57dca7c3798e71f48.zip |
mavenized testing-util module - wip
Diffstat (limited to 'testing-util')
-rw-r--r-- | testing-util/.classpath | 11 | ||||
-rw-r--r-- | testing-util/.cvsignore | 2 | ||||
-rw-r--r-- | testing-util/.project | 19 | ||||
-rw-r--r-- | testing-util/build.xml | 6 | ||||
-rw-r--r-- | testing-util/pom.xml | 42 | ||||
-rw-r--r-- | testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java (renamed from testing-util/src/org/aspectj/testing/util/TestUtil.java) | 0 | ||||
-rw-r--r-- | testing-util/src/test/java/org/aspectj/testingutil/TestCompareClassFile.java (renamed from testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java) | 0 | ||||
-rw-r--r-- | testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java (renamed from testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java) | 0 | ||||
-rw-r--r-- | testing-util/src/test/java/org/aspectj/testingutil/UtilTests.java (renamed from testing-util/testsrc/org/aspectj/testingutil/UtilTests.java) | 1 | ||||
-rw-r--r-- | testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java | 31 |
10 files changed, 43 insertions, 69 deletions
diff --git a/testing-util/.classpath b/testing-util/.classpath deleted file mode 100644 index 2261a7cce..000000000 --- a/testing-util/.classpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="testsrc"/> - <classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/> - <classpathentry kind="src" path="/util"/> - <classpathentry kind="lib" path="/lib/jdiff/jdiff.jar"/> - <classpathentry kind="src" path="/bridge"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/testing-util/.cvsignore b/testing-util/.cvsignore deleted file mode 100644 index 38972d828..000000000 --- a/testing-util/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -bin -bintest diff --git a/testing-util/.project b/testing-util/.project deleted file mode 100644 index 917eccbff..000000000 --- a/testing-util/.project +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>testing-util</name> - <comment></comment> - <projects> - <project>bridge</project> - <project>util</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/testing-util/build.xml b/testing-util/build.xml deleted file mode 100644 index 804ea5091..000000000 --- a/testing-util/build.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!-- see ../build/*.html for explanation --> -<project name="testing-util" default="test" basedir="."> - <import file="${basedir}/../build/build.xml"/> -</project> - diff --git a/testing-util/pom.xml b/testing-util/pom.xml new file mode 100644 index 000000000..402266f02 --- /dev/null +++ b/testing-util/pom.xml @@ -0,0 +1,42 @@ +<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> + + <parent> + <groupId>org.aspectj</groupId> + <artifactId>aspectj-parent</artifactId> + <version>1.9.3.BUILD-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + + <artifactId>testing-util</artifactId> + <packaging>jar</packaging> + <name>testing-util</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>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>jdiff</groupId> + <artifactId>jdiff</artifactId> + <version>1.0</version> + <scope>system</scope> + <systemPath>${project.basedir}/../lib/jdiff/jdiff.jar</systemPath> + </dependency> + </dependencies> + +</project> diff --git a/testing-util/src/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index 1dbc0115c..1dbc0115c 100644 --- a/testing-util/src/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java diff --git a/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java b/testing-util/src/test/java/org/aspectj/testingutil/TestCompareClassFile.java index e24ca7be8..e24ca7be8 100644 --- a/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java +++ b/testing-util/src/test/java/org/aspectj/testingutil/TestCompareClassFile.java diff --git a/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java b/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java index e5592b352..e5592b352 100644 --- a/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java +++ b/testing-util/src/test/java/org/aspectj/testingutil/TestUtilTest.java diff --git a/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java b/testing-util/src/test/java/org/aspectj/testingutil/UtilTests.java index 27d8399af..b2bbc27fb 100644 --- a/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java +++ b/testing-util/src/test/java/org/aspectj/testingutil/UtilTests.java @@ -29,3 +29,4 @@ public class UtilTests extends TestCase { public UtilTests(String name) { super(name); } } + diff --git a/testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java b/testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java deleted file mode 100644 index 4c5f62ec0..000000000 --- a/testing-util/testsrc/org/aspectj/testingutil/TestingUtilModuleTests.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.aspectj.testingutil; -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * All rights reserved. - * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -// default package - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class TestingUtilModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(TestingUtilModuleTests.class.getName()); - suite.addTest(UtilTests.suite()); - return suite; - } - - public TestingUtilModuleTests(String name) { super(name); } -} |