refactored to avoid clash and duplicate class with modules/testing. Package for modules/testing-util is now org.aspectj.testingutil

8 files changed, 9 insertions, 12 deletions

diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class
deleted file mode 100644
index c5db4e907..000000000
--- a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class
+++ /dev/null
diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class
deleted file mode 100644
index 52c60e6ee..000000000
--- a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class
+++ /dev/null
diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile$1.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile$1.class
new file mode 100644
index 000000000..e123a9f9d
--- /dev/null
+++ b/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile$1.class
diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile.class
new file mode 100644
index 000000000..249ca5851
--- /dev/null
+++ b/testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile.class
diff --git a/testing-util/testsrc/TestingUtilModuleTests.java b/testing-util/testsrc/TestingUtilModuleTests.java
index 32084c1a2..a81847cb2 100644
--- a/testing-util/testsrc/TestingUtilModuleTests.java
+++ b/testing-util/testsrc/TestingUtilModuleTests.java
@@ -14,17 +14,16 @@
 
 // default package
 
-import org.aspectj.testing.util.UtilTests;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.aspectj.testingutil.UtilTests;
 
 public class TestingUtilModuleTests extends TestCase {
 
     public static Test suite() { 
         TestSuite suite = new TestSuite(TestingUtilModuleTests.class.getName());
-        suite.addTest(UtilTests.suite()); 
+        suite.addTest(UtilTests.suite());
         return suite;
     }
 
diff --git a/testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java b/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java
index e4dcf8050..61e88e97a 100644
--- a/testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java
+++ b/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java
@@ -11,7 +11,7 @@
  *     Xerox/PARC     initial implementation 
  * ******************************************************************/
 
-package org.aspectj.testing.util;
+package org.aspectj.testingutil;
 
 import org.aspectj.util.LangUtil;
 
@@ -103,7 +103,6 @@ public class TestCompareClassFile implements Runnable {
      * Trim ending lines from a StringBuffer,
      * clipping to maxLines and further removing any number of
      * trailing lines accepted by checker.
-     * @param checker returns true if trailing line should be elided.
      * @param stack StringBuffer with lines to elide
      * @param maxLines int for maximum number of resulting lines
      */
diff --git a/testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java b/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java
index 41abff3c9..00fb0f385 100644
--- a/testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java
+++ b/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java
@@ -11,7 +11,7 @@
  *     Xerox/PARC     initial implementation 
  * ******************************************************************/
 
-package org.aspectj.testing.util;
+package org.aspectj.testingutil;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,6 +21,7 @@ import junit.framework.TestCase;
 import org.aspectj.bridge.MessageHandler;
 import org.aspectj.bridge.MessageUtil;
 import org.aspectj.util.FileUtil;
+import org.aspectj.testing.util.TestUtil;
 
 /**
  * 
@@ -33,7 +34,7 @@ public class TestUtilTest extends TestCase {
     
     public void testFileCompareNonClass() throws IOException {
         MessageHandler holder = new MessageHandler();
-        File thisFile = new File(UtilTests.TESTING_UTIL_PATH + "/testsrc/org/aspectj/testing/util/TestUtilTest.java");
+        File thisFile = new File(UtilTests.TESTING_UTIL_PATH + "/testsrc/org/aspectj/testingutil/TestUtilTest.java");
         //File thisFile = new File("src/testing-util.lst");
         assertTrue(TestUtil.sameFiles(holder, thisFile, thisFile));
         
@@ -99,7 +100,7 @@ public class TestUtilTest extends TestCase {
         }
         MessageHandler holder = new MessageHandler();
         File classBase = new File(UtilTests.TESTING_UTIL_PATH + "/testdata/testCompareClassFiles");
-        String path = "org/aspectj/testing/util/TestCompareClassFile.class";
+        String path = "org/aspectj/testingutil/TestCompareClassFile.class";
         File classFile = new File(classBase, path);
         
         try {
diff --git a/testing-util/testsrc/org/aspectj/testing/util/UtilTests.java b/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java
index cd36e8b60..f23834fa7 100644
--- a/testing-util/testsrc/org/aspectj/testing/util/UtilTests.java
+++ b/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java
@@ -10,9 +10,7 @@
  * Contributors: 
  *     Xerox/PARC     initial implementation 
  * ******************************************************************/
-
-
-package org.aspectj.testing.util;
+package org.aspectj.testingutil;
 
 import junit.framework.*;
 
@@ -23,7 +21,7 @@ public class UtilTests extends TestCase {
         TestSuite suite = new TestSuite(UtilTests.class.getName());
         // for now, do not include SuiteTest because it would take 15 minutes
         //$JUnit-BEGIN$
-        suite.addTestSuite(TestUtilTest.class); 
+        suite.addTestSuite(TestUtilTest.class);
         //$JUnit-END$
         return suite;
     }