/**
* Testing fast excludes of the pattern "com.foo..*". World should not have any new types in it after rejection.
*/
-// public void testFastExclusionOne() throws Exception {
-// TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "testdata..*");
-//
-// String orangesSub = "testdata.sub.Oranges";
-// JavaClass orangesClass = getClassFrom(orangesSub);
-// byte[] orangesBytes = orangesClass.getBytes();
-//
-// boolean accepted = adaptor.accept(orangesSub, orangesBytes);
-// assertFalse("Should not be accepted", accepted);
-// TypeMap map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-//
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// // Important thing here is that the rejection of testdata.sub.Oranges did not require it to be loaded into the world at all
-// }
-//
-// /**
-// * Testing fast includes of the pattern "*". World should not have any new types in it after inclusion.
-// */
-// public void testFastInclusionOne() throws Exception {
-// TestClassLoaderWeavingAdaptor adaptor = getAdaptor("*", null);
-//
-// String orangesSub = "testdata.sub.Oranges";
-// JavaClass orangesClass = getClassFrom(orangesSub);
-// byte[] orangesBytes = orangesClass.getBytes();
-//
-// boolean accepted = adaptor.accept(orangesSub, orangesBytes);
-// assertTrue("Should be accepted", accepted);
-// TypeMap map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-//
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// // Important thing here is that the rejection of testdata.sub.Oranges did not require it to be loaded into the world at all
-// }
-//
-// /**
-// * Testing fast excludes of the pattern "*Oranges". World should not have any new types in it after rejection.
-// */
-// public void testFastExclusionTwo() throws Exception {
-// TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "*Oranges");
-//
-// String oranges = "testdata.Oranges";
-// JavaClass orangesClass = getClassFrom(oranges);
-// byte[] orangesBytes = orangesClass.getBytes();
-//
-// boolean accepted = adaptor.accept(oranges, orangesBytes);
-// assertFalse("Should not be accepted", accepted);
-// TypeMap map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// String orangesSub = "testdata.sub.Oranges";
-//
-// JavaClass orangesSubClass = getClassFrom(orangesSub);
-// byte[] orangesSubBytes = orangesSubClass.getBytes();
-//
-// accepted = adaptor.accept(orangesSub, orangesSubBytes);
-// assertFalse("Should not be accepted", accepted);
-// map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-// }
-//
-// /**
-// * Testing fast excludes of the pattern "*..*Oranges*". World should not have any new types in it after rejection.
-// */
-// public void testFastExclusionThree() throws Exception {
-// TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "*..*ran*");
-//
-// String oranges = "testdata.Oranges";
-// JavaClass orangesClass = getClassFrom(oranges);
-// byte[] orangesBytes = orangesClass.getBytes();
-//
-// boolean accepted = adaptor.accept(oranges, orangesBytes);
-// assertFalse("Should not be accepted", accepted);
-// TypeMap map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-//
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// String orangesSub = "testdata.sub.Oranges";
-// JavaClass orangesSubClass = getClassFrom(orangesSub);
-// byte[] orangesSubBytes = orangesSubClass.getBytes();
-//
-// accepted = adaptor.accept(orangesSub, orangesSubBytes);
-// assertFalse("Should not be accepted", accepted);
-// map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// String apples = "testdata.Apples";
-// JavaClass applesClass = getClassFrom(apples);
-// byte[] applesBytes = applesClass.getBytes();
-//
-// accepted = adaptor.accept(apples, applesBytes);
-// assertTrue("Should be accepted", accepted);
-// map = accessTypeMap(adaptor);
-//
-// // The aspect and the Apples type
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-// }
-//
-// /**
-// * Testing fast inclusion checking of exact include names eg. "testdata.sub.Oranges"
-// */
-// public void testFastInclusionTwo() throws Exception {
-// TestClassLoaderWeavingAdaptor adaptor = getAdaptor("testdata.sub.Oranges", null);
-//
-// String oranges = "testdata.Oranges";
-// JavaClass orangesClass = getClassFrom(oranges);
-// byte[] orangesBytes = orangesClass.getBytes();
-//
-// boolean accepted = adaptor.accept(oranges, orangesBytes);
-// assertFalse("Should not be accepted", accepted);
-// TypeMap map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-//
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// String orangesSub = "testdata.sub.Oranges";
-// JavaClass orangesSubClass = getClassFrom(orangesSub);
-// byte[] orangesSubBytes = orangesSubClass.getBytes();
-//
-// accepted = adaptor.accept(orangesSub, orangesSubBytes);
-// assertTrue("Should be accepted", accepted);
-// map = accessTypeMap(adaptor);
-//
-// // The aspect
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-//
-// String apples = "testdata.Apples";
-// JavaClass applesClass = getClassFrom(apples);
-// byte[] applesBytes = applesClass.getBytes();
-//
-// accepted = adaptor.accept(apples, applesBytes);
-// assertFalse("Should not be accepted", accepted);
-// map = accessTypeMap(adaptor);
-//
-// // The aspect and the Apples type
-// assertEquals(1, map.getExpendableMap().size());
-// // primitives, void and jlObject
-// assertEquals(10, map.getMainMap().size());
-// }
-//
-// /**
-// * Testing fast excludes of the pattern groovy related pattern -
-// */
-// // public void testFastExclusionFour() throws Exception {
-// // TestClassLoaderWeavingAdaptor adaptor = getAdaptor("*", "testdata..* && !testdata.sub.Oran*");
-// //
-// // String oranges = "testdata.Oranges";
-// // JavaClass orangesClass = getClassFrom(oranges);
-// // byte[] orangesBytes = orangesClass.getBytes();
-// //
-// // boolean accepted = adaptor.accept(oranges, orangesBytes);
-// // assertFalse("Should not be accepted", accepted);
-// // TypeMap map = accessTypeMap(adaptor);
-// //
-// // // The aspect
-// // assertEquals(1, map.getExpendableMap().size());
-// //
-// // // primitives, void and jlObject
-// // assertEquals(10, map.getMainMap().size());
-// //
-// // String orangesSub = "testdata.sub.Oranges";
-// // JavaClass orangesSubClass = getClassFrom(orangesSub);
-// // byte[] orangesSubBytes = orangesSubClass.getBytes();
-// //
-// // accepted = adaptor.accept(orangesSub, orangesSubBytes);
-// // assertTrue("Should be accepted", accepted);
-// // map = accessTypeMap(adaptor);
-// //
-// // // The aspect
-// // assertEquals(1, map.getExpendableMap().size());
-// // // primitives, void and jlObject
-// // assertEquals(10, map.getMainMap().size());
-// // }
-//
-// public void testAcceptanceSpeedStarDotDotStar() throws Exception {
-// URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
-//
-// JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
-// byte[] bs = jc.getBytes();
-// jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB");
-// byte[] bs2 = jc.getBytes();
-// // InputStream is = loader.getResourceAsStream("org.aspectj.weaver.loadtime.ClassLoaderWeaverAdaptorTests$TestOne");
-// assertNotNull(bs);
-// TestWeavingContext wc = new TestWeavingContext(loader);
-// Definition d = new Definition();
-// d.getExcludePatterns().add("*..*CGLIB*");
-// d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
-// wc.addDefinition(d);
-// ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
-// adaptor.initialize(loader, wc);
-// boolean exist = adaptor.generatedClassesExistFor("Junk");
-// assertFalse("There should be no generated classes", exist);
-//
-// // before:
-// // Acceptance 331ms
-// // Rejection 3368ms
-//
-// // after:
-// // Acceptance 343ms
-// // Rejection 80ms
-//
-// long stime = System.currentTimeMillis();
-// for (int i = 0; i < 100000; i++) {
-// boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne", bs);
-// assertTrue("Should be accepted", b);
-// }
-// long etime = System.currentTimeMillis();
-// System.out.println("Acceptance " + (etime - stime) + "ms");
-// stime = System.currentTimeMillis();
-// for (int i = 0; i < 100000; i++) {
-// adaptor.delegateForCurrentClass = null;
-// boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB", bs2);
-// assertFalse("Should not be accepting CGLIB", b);
-// }
-// etime = System.currentTimeMillis();
-// System.out.println("Rejection " + (etime - stime) + "ms");
-//
-// }
-//
-// // TODO
-// // shouldn't add it to the type patterns if we are going to fast handle it
-// // include for exact name, what does it mean?
-// // excludes="!xxxx" should also be fast matched...
-//
-// public void testAcceptanceSpeedExactName() throws Exception {
-// URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
-//
-// JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
-// byte[] bs = jc.getBytes();
-// jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB");
-// byte[] bs2 = jc.getBytes();
-// // InputStream is = loader.getResourceAsStream("org.aspectj.weaver.loadtime.ClassLoaderWeaverAdaptorTests$TestOne");
-// assertNotNull(bs);
-// TestWeavingContext wc = new TestWeavingContext(loader);
-// Definition d = new Definition();
-// d.getExcludePatterns().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest.TestOneCGLIB");
-// d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
-// wc.addDefinition(d);
-// TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
-// adaptor.initialize(loader, wc);
-// boolean exist = adaptor.generatedClassesExistFor("Junk");
-// assertFalse("There should be no generated classes", exist);
-//
-// // before:
-// // Acceptance 331ms
-// // Rejection 3160ms
-//
-// // after:
-// // Acceptance 379ms
-// // Rejection 103ms
-//
-// long stime = System.currentTimeMillis();
-// for (int i = 0; i < 100000; i++) {
-// boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne", bs);
-// assertTrue("Should be accepted", b);
-// }
-// long etime = System.currentTimeMillis();
-// System.out.println("Acceptance " + (etime - stime) + "ms");
-// stime = System.currentTimeMillis();
-// for (int i = 0; i < 100000; i++) {
-// adaptor.delegateForCurrentClass = null;
-// boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB", bs2);
-// assertFalse("Should not be accepting CGLIB", b);
-// }
-// etime = System.currentTimeMillis();
-// System.out.println("Rejection " + (etime - stime) + "ms");
-// BcelWorld world = adaptor.getWorld();
-// Field f = World.class.getDeclaredField("typeMap");
-// f.setAccessible(true);
-// TypeMap typeMap = (TypeMap) f.get(world);
-// System.out.println(typeMap.getExpendableMap().size());
-// System.out.println(typeMap.getMainMap().size());
-// printExpendableMap(typeMap.getExpendableMap());
-// printMainMap(typeMap.getMainMap());
-// }
+ public void testFastExclusionOne() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "testdata..*");
+
+ String orangesSub = "testdata.sub.Oranges";
+ JavaClass orangesClass = getClassFrom(orangesSub);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = adaptor.accept(orangesSub, orangesBytes);
+ assertFalse("Should not be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ // Important thing here is that the rejection of testdata.sub.Oranges did not require it to be loaded into the world at all
+ }
+
+ /**
+ * Testing fast includes of the pattern "*". World should not have any new types in it after inclusion.
+ */
+ public void testFastInclusionOne() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor("*", null);
+
+ String orangesSub = "testdata.sub.Oranges";
+ JavaClass orangesClass = getClassFrom(orangesSub);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = adaptor.accept(orangesSub, orangesBytes);
+ assertTrue("Should be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ // Important thing here is that the rejection of testdata.sub.Oranges did not require it to be loaded into the world at all
+ }
+
+ /**
+ * Testing fast excludes of the pattern "*Oranges". World should not have any new types in it after rejection.
+ */
+ public void testFastExclusionTwo() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "*Oranges");
+
+ String oranges = "testdata.Oranges";
+ JavaClass orangesClass = getClassFrom(oranges);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = adaptor.accept(oranges, orangesBytes);
+ assertFalse("Should not be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String orangesSub = "testdata.sub.Oranges";
+
+ JavaClass orangesSubClass = getClassFrom(orangesSub);
+ byte[] orangesSubBytes = orangesSubClass.getBytes();
+
+ accepted = adaptor.accept(orangesSub, orangesSubBytes);
+ assertFalse("Should not be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+ }
+
+ /**
+ * Testing fast excludes of the pattern "*..*Oranges*". World should not have any new types in it after rejection.
+ */
+ public void testFastExclusionThree() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(null, "*..*ran*");
+
+ String oranges = "testdata.Oranges";
+ JavaClass orangesClass = getClassFrom(oranges);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = adaptor.accept(oranges, orangesBytes);
+ assertFalse("Should not be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String orangesSub = "testdata.sub.Oranges";
+ JavaClass orangesSubClass = getClassFrom(orangesSub);
+ byte[] orangesSubBytes = orangesSubClass.getBytes();
+
+ accepted = adaptor.accept(orangesSub, orangesSubBytes);
+ assertFalse("Should not be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String apples = "testdata.Apples";
+ JavaClass applesClass = getClassFrom(apples);
+ byte[] applesBytes = applesClass.getBytes();
+
+ accepted = adaptor.accept(apples, applesBytes);
+ assertTrue("Should be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // The aspect and the Apples type
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+ }
+
+ public void testIncludedWhenNonOptimalExclusion() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(new String[] { "*", "FooBar" }, new String[] { "*..*ran*es*" });
+
+ String oranges = "testdata.Oranges";
+ JavaClass orangesClass = getClassFrom(oranges);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = false;
+ // adaptor.accept(oranges, orangesBytes);
+ // assertFalse("Should not be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // // The aspect
+ // assertEquals(1, map.getExpendableMap().size());
+
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String apples = "testdata.Apples";
+ JavaClass applesClass = getClassFrom(apples);
+ byte[] applesBytes = applesClass.getBytes();
+
+ accepted = adaptor.accept(apples, applesBytes);
+ assertTrue("Should be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // // The aspect
+ // assertEquals(1, map.getExpendableMap().size());
+ // // primitives, void and jlObject
+ // assertEquals(10, map.getMainMap().size());
+ //
+ // String apples = "testdata.Apples";
+ // JavaClass applesClass = getClassFrom(apples);
+ // byte[] applesBytes = applesClass.getBytes();
+ //
+ // accepted = adaptor.accept(apples, applesBytes);
+ // assertTrue("Should be accepted", accepted);
+ // map = accessTypeMap(adaptor);
+ //
+ // // The aspect and the Apples type
+ // assertEquals(1, map.getExpendableMap().size());
+ // // primitives, void and jlObject
+ // assertEquals(10, map.getMainMap().size());
+ }
+
+ private void checkAccept(ClassLoaderWeavingAdaptor adaptor, String name) throws Exception {
+ JavaClass clazz = getClassFrom(name);
+ byte[] bytes = clazz.getBytes();
+
+ boolean accepted = adaptor.accept(name, bytes);
+ assertTrue("Should be accepted", accepted);
+ }
+
+ private void checkNotAccept(ClassLoaderWeavingAdaptor adaptor, String name) throws Exception {
+ JavaClass clazz = getClassFrom(name);
+ byte[] bytes = clazz.getBytes();
+
+ boolean accepted = adaptor.accept(name, bytes);
+ assertFalse("Should not be accepted", accepted);
+ }
+
+ /**
+ * Test how multiple definitions are merged. Each Definition represents a different aop.xml file.
+ */
+ public void testIncludedWhenNonOptimalExclusion2() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("*");
+
+ Definition aopTwo = new Definition();
+ aopTwo.getIncludePatterns().add("testdata.Apples+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne, aopTwo);
+
+ checkAccept(adaptor, "testdata.Oranges");
+ checkAccept(adaptor, "testdata.Apples");
+
+ adaptor = getAdaptor(aopTwo, aopOne);
+
+ checkAccept(adaptor, "testdata.Oranges");
+ checkAccept(adaptor, "testdata.Apples");
+ }
+
+ public void testIncludedWhenNonOptimalExclusion3() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("*");
+
+ Definition aopTwo = new Definition();
+ aopTwo.getIncludePatterns().add("java.sql.Connection+");
+ aopTwo.getIncludePatterns().add("java.sql.Statement+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne, aopTwo);
+
+ checkAccept(adaptor, "testdata.Apples");
+ checkAccept(adaptor, "testdata.MySqlStatement");
+
+ adaptor = getAdaptor(aopTwo, aopOne);
+
+ checkAccept(adaptor, "testdata.Apples");
+ checkAccept(adaptor, "testdata.MySqlStatement");
+ }
+
+ // Some excludes defined and some includes but importantly a star include
+ public void testIncludedWhenNonOptimalExclusion4() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("*");
+
+ Definition aopTwo = new Definition();
+ aopTwo.getIncludePatterns().add("java.sql.Connection+");
+ aopTwo.getIncludePatterns().add("java.sql.Statement+");
+
+ Definition aopThree = new Definition();
+ aopThree.getExcludePatterns().add("com.jinspired..*");
+ aopThree.getExcludePatterns().add("$com.jinspired..*");
+ aopThree.getExcludePatterns().add("com.jinspired.jxinsight.server..*+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne, aopTwo, aopThree);
+
+ checkAccept(adaptor, "testdata.Apples");
+ checkAccept(adaptor, "testdata.MySqlStatement");
+
+ adaptor = getAdaptor(aopThree, aopTwo, aopOne);
+
+ checkAccept(adaptor, "testdata.Apples");
+ checkAccept(adaptor, "testdata.MySqlStatement");
+ }
+
+ // Some excludes defined and some includes but importantly an exact includename
+ public void testIncludedWhenNonOptimalExclusion5() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("testdata.Apples");
+
+ Definition aopTwo = new Definition();
+ aopTwo.getIncludePatterns().add("java.sql.Connection+");
+ aopTwo.getIncludePatterns().add("java.sql.Statement+");
+
+ Definition aopThree = new Definition();
+ aopThree.getExcludePatterns().add("com.jinspired..*");
+ aopThree.getExcludePatterns().add("$com.jinspired..*");
+ aopThree.getExcludePatterns().add("com.jinspired.jxinsight.server..*+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne, aopTwo, aopThree);
+
+ checkAccept(adaptor, "testdata.Apples");
+
+ adaptor = getAdaptor(aopThree, aopTwo, aopOne);
+
+ checkAccept(adaptor, "testdata.Apples");
+ }
+
+ public void testIncludedWhenNonOptimalExclusion7() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("*");
+ aopOne.getExcludePatterns().add("*Fun*ky*");
+
+ // Definition aopTwo = new Definition();
+ // aopTwo.getIncludePatterns().add("java.sql.Connection+");
+ // aopTwo.getIncludePatterns().add("java.sql.Statement+");
+ //
+ // Definition aopThree = new Definition();
+ // aopThree.getExcludePatterns().add("com.jinspired..*");
+ // aopThree.getExcludePatterns().add("$com.jinspired..*");
+ // aopThree.getExcludePatterns().add("com.jinspired.jxinsight.server..*+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne);
+
+ checkAccept(adaptor, "testdata.Apples");
+
+ // adaptor = getAdaptor(aopThree, aopTwo, aopOne);
+ //
+ // checkAccept(adaptor, "testdata.Apples");
+ }
+
+ public void testIncludedWhenNonOptimalExclusion6() throws Exception {
+ Definition aopOne = new Definition();
+ aopOne.getIncludePatterns().add("testdata..*");
+
+ Definition aopTwo = new Definition();
+ aopTwo.getIncludePatterns().add("java.sql.Connection+");
+ aopTwo.getIncludePatterns().add("java.sql.Statement+");
+
+ Definition aopThree = new Definition();
+ aopThree.getExcludePatterns().add("com.jinspired..*");
+ aopThree.getExcludePatterns().add("$com.jinspired..*");
+ aopThree.getExcludePatterns().add("com.jinspired.jxinsight.server..*+");
+
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor(aopOne, aopTwo, aopThree);
+
+ checkAccept(adaptor, "testdata.Apples");
+
+ adaptor = getAdaptor(aopThree, aopTwo, aopOne);
+
+ checkAccept(adaptor, "testdata.Apples");
+ }
+
+ /**
+ * Testing fast inclusion checking of exact include names eg. "testdata.sub.Oranges"
+ */
+ public void testFastInclusionTwo() throws Exception {
+ TestClassLoaderWeavingAdaptor adaptor = getAdaptor("testdata.sub.Oranges", null);
+
+ String oranges = "testdata.Oranges";
+ JavaClass orangesClass = getClassFrom(oranges);
+ byte[] orangesBytes = orangesClass.getBytes();
+
+ boolean accepted = adaptor.accept(oranges, orangesBytes);
+ assertFalse("Should not be accepted", accepted);
+ TypeMap map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String orangesSub = "testdata.sub.Oranges";
+ JavaClass orangesSubClass = getClassFrom(orangesSub);
+ byte[] orangesSubBytes = orangesSubClass.getBytes();
+
+ accepted = adaptor.accept(orangesSub, orangesSubBytes);
+ assertTrue("Should be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // The aspect
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+
+ String apples = "testdata.Apples";
+ JavaClass applesClass = getClassFrom(apples);
+ byte[] applesBytes = applesClass.getBytes();
+
+ accepted = adaptor.accept(apples, applesBytes);
+ assertFalse("Should not be accepted", accepted);
+ map = accessTypeMap(adaptor);
+
+ // The aspect and the Apples type
+ assertEquals(1, map.getExpendableMap().size());
+ // primitives, void and jlObject
+ assertEquals(10, map.getMainMap().size());
+ }
+
+ /**
+ * Testing fast excludes of the pattern groovy related pattern -
+ */
+ // public void testFastExclusionFour() throws Exception {
+ // TestClassLoaderWeavingAdaptor adaptor = getAdaptor("*", "testdata..* && !testdata.sub.Oran*");
+ //
+ // String oranges = "testdata.Oranges";
+ // JavaClass orangesClass = getClassFrom(oranges);
+ // byte[] orangesBytes = orangesClass.getBytes();
+ //
+ // boolean accepted = adaptor.accept(oranges, orangesBytes);
+ // assertFalse("Should not be accepted", accepted);
+ // TypeMap map = accessTypeMap(adaptor);
+ //
+ // // The aspect
+ // assertEquals(1, map.getExpendableMap().size());
+ //
+ // // primitives, void and jlObject
+ // assertEquals(10, map.getMainMap().size());
+ //
+ // String orangesSub = "testdata.sub.Oranges";
+ // JavaClass orangesSubClass = getClassFrom(orangesSub);
+ // byte[] orangesSubBytes = orangesSubClass.getBytes();
+ //
+ // accepted = adaptor.accept(orangesSub, orangesSubBytes);
+ // assertTrue("Should be accepted", accepted);
+ // map = accessTypeMap(adaptor);
+ //
+ // // The aspect
+ // assertEquals(1, map.getExpendableMap().size());
+ // // primitives, void and jlObject
+ // assertEquals(10, map.getMainMap().size());
+ // }
+
+ public void testAcceptanceSpeedStarDotDotStar() throws Exception {
+ URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+
+ JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
+ byte[] bs = jc.getBytes();
+ jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB");
+ byte[] bs2 = jc.getBytes();
+ // InputStream is = loader.getResourceAsStream("org.aspectj.weaver.loadtime.ClassLoaderWeaverAdaptorTests$TestOne");
+ assertNotNull(bs);
+ TestWeavingContext wc = new TestWeavingContext(loader);
+ Definition d = new Definition();
+ d.getExcludePatterns().add("*..*CGLIB*");
+ d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+ wc.addDefinition(d);
+ ClassLoaderWeavingAdaptor adaptor = new ClassLoaderWeavingAdaptor();
+ adaptor.initialize(loader, wc);
+ boolean exist = adaptor.generatedClassesExistFor("Junk");
+ assertFalse("There should be no generated classes", exist);
+
+ // before:
+ // Acceptance 331ms
+ // Rejection 3368ms
+
+ // after:
+ // Acceptance 343ms
+ // Rejection 80ms
+
+ long stime = System.currentTimeMillis();
+ for (int i = 0; i < 100000; i++) {
+ boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne", bs);
+ assertTrue("Should be accepted", b);
+ }
+ long etime = System.currentTimeMillis();
+ System.out.println("Acceptance " + (etime - stime) + "ms");
+ stime = System.currentTimeMillis();
+ for (int i = 0; i < 100000; i++) {
+ adaptor.delegateForCurrentClass = null;
+ boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB", bs2);
+ assertFalse("Should not be accepting CGLIB", b);
+ }
+ etime = System.currentTimeMillis();
+ System.out.println("Rejection " + (etime - stime) + "ms");
+
+ }
+
+ // TODO
+ // shouldn't add it to the type patterns if we are going to fast handle it
+ // include for exact name, what does it mean?
+ // excludes="!xxxx" should also be fast matched...
+
+ public void testAcceptanceSpeedExactName() throws Exception {
+ URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+
+ JavaClass jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne");
+ byte[] bs = jc.getBytes();
+ jc = getClassFrom("../loadtime/bin", "org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB");
+ byte[] bs2 = jc.getBytes();
+ // InputStream is = loader.getResourceAsStream("org.aspectj.weaver.loadtime.ClassLoaderWeaverAdaptorTests$TestOne");
+ assertNotNull(bs);
+ TestWeavingContext wc = new TestWeavingContext(loader);
+ Definition d = new Definition();
+ d.getExcludePatterns().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest.TestOneCGLIB");
+ d.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+ wc.addDefinition(d);
+ TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
+ adaptor.initialize(loader, wc);
+ boolean exist = adaptor.generatedClassesExistFor("Junk");
+ assertFalse("There should be no generated classes", exist);
+
+ // before:
+ // Acceptance 331ms
+ // Rejection 3160ms
+
+ // after:
+ // Acceptance 379ms
+ // Rejection 103ms
+
+ long stime = System.currentTimeMillis();
+ for (int i = 0; i < 100000; i++) {
+ boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOne", bs);
+ assertTrue("Should be accepted", b);
+ }
+ long etime = System.currentTimeMillis();
+ System.out.println("Acceptance " + (etime - stime) + "ms");
+ stime = System.currentTimeMillis();
+ for (int i = 0; i < 100000; i++) {
+ adaptor.delegateForCurrentClass = null;
+ boolean b = adaptor.accept("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$TestOneCGLIB", bs2);
+ assertFalse("Should not be accepting CGLIB", b);
+ }
+ etime = System.currentTimeMillis();
+ System.out.println("Rejection " + (etime - stime) + "ms");
+ BcelWorld world = adaptor.getWorld();
+ Field f = World.class.getDeclaredField("typeMap");
+ f.setAccessible(true);
+ TypeMap typeMap = (TypeMap) f.get(world);
+ System.out.println(typeMap.getExpendableMap().size());
+ System.out.println(typeMap.getMainMap().size());
+ printExpendableMap(typeMap.getExpendableMap());
+ printMainMap(typeMap.getMainMap());
+ }
// --- infrastructure ---
: new String[] { excludePattern });
}
+ public TestClassLoaderWeavingAdaptor getAdaptor(Definition... definitions) {
+ try {
+ URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
+ TestWeavingContext wc = new TestWeavingContext(loader);
+ for (Definition definition : definitions) {
+ // need some random aspect or the weaver will shut down!
+ definition.getAspectClassNames().add("org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest$AnAspect");
+ wc.addDefinition(definition);
+ }
+ TestClassLoaderWeavingAdaptor adaptor = new TestClassLoaderWeavingAdaptor();
+ adaptor.initialize(loader, wc);
+ return adaptor;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public TestClassLoaderWeavingAdaptor getAdaptor(String[] includePatterns, String[] excludePatterns) {
try {
URLClassLoader loader = new URLClassLoader(new URL[] { new File("../loadtime/bin").toURI().toURL() }, null);
projects / aspectj.git / commitdiff