353936: refactoring

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 85b86a3037ea947a9508241cc61e4978995ecbf9..8bd11e75bcfe8d18017539f74af713c8dc633dee 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -20,8 +20,6 @@ import junit.framework.Test;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.Method;
 import org.aspectj.apache.bcel.classfile.Signature;
-import org.aspectj.apache.bcel.util.ClassPath;
-import org.aspectj.apache.bcel.util.SyntheticRepository;
 import org.aspectj.asm.AsmManager;
 import org.aspectj.testing.XMLBasedAjcTestCase;
 import org.aspectj.util.LangUtil;
@@ -366,8 +364,8 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                        if (f)
                                System.err.println("Line number table for " + method.getName() + method.getSignature() + " = "
                                                + method.getLineNumberTable());
-                       assertTrue("Didn't find a line number table for method " + method.getName() + method.getSignature(), method
-                                       .getLineNumberTable() != null);
+                       assertTrue("Didn't find a line number table for method " + method.getName() + method.getSignature(),
+                                       method.getLineNumberTable() != null);
                }
 
                // This test would determine the info isn't there if you pass -g:none ...
@@ -1029,16 +1027,4 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
                runTest("override protected pointcut in aop.xml concrete aspect");
        }
 
-       // helper methods.....
-
-       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);
-       }
-
 }
\ No newline at end of file

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java
index 551819a075e8c805f36b3eaea41bf8f854248a59..f6cea64cb93b75f3228d022de8af7bc47a535466 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Annotations.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 Annotations extends XMLBasedAjcTestCase {
@@ -169,14 +167,5 @@ public class Annotations extends XMLBasedAjcTestCase {
   }
   
   // helper methods.....
-  
-  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);
-  }
+
 }
\ No newline at end of file