353936: refactoring

diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
index dc54af7aca6cbf821e1d1289572a1de537419433..6c9be21ff12189d5320c507f1a5f9b559820820c 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
@@ -21,8 +21,6 @@ import org.aspectj.apache.bcel.classfile.LineNumber;
 import org.aspectj.apache.bcel.classfile.LineNumberTable;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.generic.MethodGen;
-import org.aspectj.apache.bcel.util.ClassPath;
-import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.weaver.tools.ContextBasedMatcher;
 import org.aspectj.weaver.tools.FuzzyBoolean;
@@ -359,16 +357,6 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                return new File("../tests/src/org/aspectj/systemtest/ajc154/ajc154.xml");
        }
 
-       public SyntheticRepository createRepos(File cpentry) {
-               ClassPath cp = new ClassPath(cpentry + File.pathSeparator + System.getProperty("java.class.path"));
-               return SyntheticRepository.getInstance(cp);
-       }
-
-       protected JavaClass getClassFrom(File where, String clazzname) throws ClassNotFoundException {
-               SyntheticRepository repos = createRepos(where);
-               return repos.loadClass(clazzname);
-       }
-
        // ---
        private class BeanDesignatorHandler implements PointcutDesignatorHandler {
 

diff --git a/tests/src/org/aspectj/systemtest/ajc160/SanityTests.java b/tests/src/org/aspectj/systemtest/ajc160/SanityTests.java
index 6bcc9625c92d5f5b4d583ca0d97502be76c652fb..07cdbc83b6ac50f6daedcd86934a94aa329c5a8e 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/SanityTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc160/SanityTests.java
@@ -18,8 +18,6 @@ import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.Code;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
-import org.aspectj.apache.bcel.util.ClassPath;
-import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 /*
@@ -152,17 +150,6 @@ public class SanityTests extends org.aspectj.testing.XMLBasedAjcTestCase {
        // fail("Not implemented");
        // }
 
-       // ///////////////////////////////////////
-       public SyntheticRepository createRepos(File cpentry) {
-               ClassPath cp = new ClassPath(cpentry + File.pathSeparator + System.getProperty("java.class.path"));
-               return SyntheticRepository.getInstance(cp);
-       }
-
-       protected JavaClass getClassFrom(File where, String clazzname) throws ClassNotFoundException {
-               SyntheticRepository repos = createRepos(where);
-               return repos.loadClass(clazzname);
-       }
-
        // ///////////////////////////////////////
        public static Test suite() {
                return XMLBasedAjcTestCase.loadSuite(SanityTests.class);

diff --git a/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java b/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
index 5bb559f80c8ee4d11a01c9ca552351284236e202..68f1384ad86b929ffa14597b5add386f721478dd 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
+++ b/tests/src/org/aspectj/systemtest/ajc1610/NewFeatures.java
@@ -16,8 +16,6 @@ import junit.framework.Test;
 
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
-import org.aspectj.apache.bcel.util.ClassPath;
-import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
@@ -146,16 +144,6 @@ public class NewFeatures extends org.aspectj.testing.XMLBasedAjcTestCase {
                return getClassFrom(ajc.getSandboxDirectory(), className);
        }
 
-       public SyntheticRepository createRepos(File cpentry) {
-               ClassPath cp = new ClassPath(cpentry + File.pathSeparator + System.getProperty("java.class.path"));
-               return SyntheticRepository.getInstance(cp);
-       }
-
-       protected JavaClass getClassFrom(File where, String clazzname) throws ClassNotFoundException {
-               SyntheticRepository repos = createRepos(where);
-               return repos.loadClass(clazzname);
-       }
-
        protected File getSpecFile() {
                return new File("../tests/src/org/aspectj/systemtest/ajc1610/newfeatures-tests.xml");
        }