moved to avoid duplicate classes

testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java → 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;
 

testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java → 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;
 
 /**
  * 

testing-util/testsrc/org/aspectj/testing/util/UtilTests.java → testing-util/testsrc/org/aspectj/testingutil/UtilTests.java

@@ -1,33 +1,33 @@
 /* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
+ * 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 Common Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/cpl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Common Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ *     Xerox/PARC     initial implementation
  * ******************************************************************/
 
 
-package org.aspectj.testing.util;
+package org.aspectj.testingutil;
 
 import junit.framework.*;
 
 public class UtilTests extends TestCase {
 
     public static final String TESTING_UTIL_PATH = "../testing-util";
-    public static Test suite() { 
+    public static Test suite() {
         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;
     }
 
     public UtilTests(String name) { super(name); }
 
-}  
+}