@@ -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; | |||
} | |||
@@ -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 | |||
*/ |
@@ -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 { |
@@ -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; | |||
} |