From 5101e1eddc1f8c570c705c621c0e716992670640 Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 5 Aug 2011 16:07:05 +0000 Subject: [PATCH] 353936: refactoring --- .../aspectj/systemtest/ajc150/Ajc150Tests.java | 18 ++---------------- .../aspectj/systemtest/ajc150/Annotations.java | 13 +------------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java index 85b86a303..8bd11e75b 100644 --- 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 551819a07..f6cea64cb 100644 --- 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 -- 2.39.5