Attachment 25037 Details for Bug 104218 – Simple binary-weaving testcase

[patch] Simple binary-weaving testcase

patch-104218-2.txt (text/plain), 8.10 KB, created by Matthew Webster

on 2005-07-20 08:28:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Webster

Created: 2005-07-20 08:28:01 EDT

Size: 8.10 KB

patch

obsolete

>Index: reweavable/Advisable.java
>===================================================================
>RCS file: reweavable/Advisable.java
>diff -N reweavable/Advisable.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ reweavable/Advisable.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+public interface Advisable {
>+
>+	public void addJoinPoint (String name); 
>+}
>Index: reweavable/Aspect1.aj
>===================================================================
>RCS file: reweavable/Aspect1.aj
>diff -N reweavable/Aspect1.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ reweavable/Aspect1.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,7 @@
>+public aspect Aspect1 {
>+
>+	before (Advisable a) : execution(void test1()) && this(a){
>+		System.err.println(thisJoinPoint);
>+		a.addJoinPoint(thisJoinPoint.getSignature().getName());
>+	}
>+}
>Index: reweavable/Aspect2.aj
>===================================================================
>RCS file: reweavable/Aspect2.aj
>diff -N reweavable/Aspect2.aj
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ reweavable/Aspect2.aj	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,7 @@
>+public aspect Aspect2 {
>+
>+	before (Advisable a) : execution(void test2()) && this(a){
>+		System.err.println(thisJoinPoint);
>+		a.addJoinPoint(thisJoinPoint.getSignature().getName());
>+	}
>+}
>Index: reweavable/Main.java
>===================================================================
>RCS file: reweavable/Main.java
>diff -N reweavable/Main.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ reweavable/Main.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+import java.util.*;
>+
>+public class Main implements Advisable {
>+	
>+	private static List joinPoints = new ArrayList();
>+	
>+	public void test1 () {
>+		
>+	}
>+	
>+	public void test2 () {
>+		
>+	}
>+	
>+	public void addJoinPoint (String name) {
>+		joinPoints.add(name);
>+	}
>+	
>+	public static void main (String[] args) {
>+		System.err.println("? Main.main()");
>+		joinPoints = new ArrayList();
>+		new Main().test1();
>+		new Main().test2();
>+		if (joinPoints.size() != 2) {
>+			throw new RuntimeException("size=" + joinPoints.size());
>+		}
>+	}
>+}
>Index: src/org/aspectj/systemtest/reweavable/ReweavableTests.java
>===================================================================
>RCS file: src/org/aspectj/systemtest/reweavable/ReweavableTests.java
>diff -N src/org/aspectj/systemtest/reweavable/ReweavableTests.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/aspectj/systemtest/reweavable/ReweavableTests.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,41 @@
>+/* *******************************************************************
>+ * Copyright (c) 2004 IBM Corporation
>+ * All rights reserved.
>+ * This program and the accompanying materials are made available
>+ * under the terms of the Common Public License v1.0
>+ * which accompanies this distribution and is available at
>+ * http://www.eclipse.org/legal/cpl-v10.html 
>+ * 
>+ * ******************************************************************/
>+package org.aspectj.systemtest.reweavable;
>+
>+import java.io.File;
>+import junit.framework.Test;
>+import org.aspectj.testing.XMLBasedAjcTestCase;
>+
>+public class ReweavableTests extends org.aspectj.testing.XMLBasedAjcTestCase {
>+
>+  public static Test suite() {
>+    return XMLBasedAjcTestCase.loadSuite(ReweavableTests.class);
>+  }
>+
>+  protected File getSpecFile() {
>+    return new File("../tests/src/org/aspectj/systemtest/reweavable/reweavable.xml");
>+  }
>+
>+  public void test001(){
>+    runTest("Ensure 1st aspect is rewoven when weaving 2nd aspect");
>+  }
>+
>+  public void test002(){
>+    runTest("Ensure 1st aspect is rewoven when weaving 2nd aspect - aspectpath");
>+  }
>+
>+  public void test003(){
>+    runTest("Ensure 1st aspect is rewoven when weaving 2nd aspect - classpath");
>+  }
>+
>+}
>+
>Index: src/org/aspectj/systemtest/reweavable/reweavable-tests.xml
>===================================================================
>RCS file: src/org/aspectj/systemtest/reweavable/reweavable-tests.xml
>diff -N src/org/aspectj/systemtest/reweavable/reweavable-tests.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/aspectj/systemtest/reweavable/reweavable-tests.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,91 @@
>+
>+
>+    <ajc-test dir="reweavable"
>+      title="Ensure 1st aspect is rewoven when weaving 2nd aspect"
>+      keywords="reweavable">
>+        <compile
>+        	files="Main.java, Advisable.java, Aspect1.aj"
>+			outjar="main1.jar"
>+            options="-Xreweavable -showWeaveInfo"
>+        >
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        </compile>	
>+        <compile
>+        	classpath="aspect1.jar"
>+        	files="Aspect2.aj"
>+        	inpath="main1.jar"
>+            options="-Xreweavable -showWeaveInfo -verbose"
>+        >
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        	<message kind="weave" text="Type 'Main' (Main.java:11) advised by before advice from 'Aspect2' (Aspect2.aj:3)"/>
>+        </compile>	
>+        <run class="Main"/>
>+    </ajc-test>
>+
>+    <ajc-test dir="reweavable"
>+      title="Ensure 1st aspect is rewoven when weaving 2nd aspect - aspectpath"
>+      keywords="reweavable">
>+        <compile
>+        	files="Main.java, Advisable.java"
>+			outjar="main1.jar"
>+        >
>+        </compile>	
>+        <compile
>+        	classpath="main1.jar"
>+        	files="Aspect1.aj"
>+			outjar="aspect1.jar"
>+        >
>+        </compile>	
>+        <compile
>+        	inpath="main1.jar"
>+        	aspectpath="aspect1.jar"
>+			outjar="main2.jar"
>+            options="-Xreweavable,-1.5,-showWeaveInfo"
>+        >	
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        </compile>	
>+        <compile
>+        	aspectpath="aspect1.jar"
>+        	inpath="main2.jar"
>+        	files="Aspect2.aj"
>+            options="-Xreweavable -showWeaveInfo"
>+        >
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        	<message kind="weave" text="Type 'Main' (Main.java:11) advised by before advice from 'Aspect2' (Aspect2.aj:3)"/>
>+        </compile>	
>+    </ajc-test>
>+
>+
>+    <ajc-test dir="reweavable"
>+      title="Ensure 1st aspect is rewoven when weaving 2nd aspect - classpath"
>+      keywords="reweavable">
>+        <compile
>+        	files="Main.java, Advisable.java"
>+			outjar="main1.jar"
>+        >
>+        </compile>	
>+        <compile
>+        	classpath="main1.jar"
>+        	files="Aspect1.aj"
>+			outjar="aspect1.jar"
>+        >
>+        </compile>	
>+        <compile
>+        	inpath="main1.jar"
>+        	aspectpath="aspect1.jar"
>+			outjar="main2.jar"
>+            options="-Xreweavable,-1.5,-showWeaveInfo"
>+        >	
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        </compile>	
>+        <compile
>+        	classpath="aspect1.jar"
>+        	inpath="main2.jar"
>+        	files="Aspect2.aj"
>+            options="-Xreweavable -showWeaveInfo"
>+        >
>+        	<message kind="weave" text="Type 'Main' (Main.java:7) advised by before advice from 'Aspect1' (Aspect1.aj:3)"/>
>+        	<message kind="weave" text="Type 'Main' (Main.java:11) advised by before advice from 'Aspect2' (Aspect2.aj:3)"/>
>+        </compile>	
>+    </ajc-test>
>+
>Index: src/org/aspectj/systemtest/reweavable/reweavable.xml
>===================================================================
>RCS file: src/org/aspectj/systemtest/reweavable/reweavable.xml
>diff -N src/org/aspectj/systemtest/reweavable/reweavable.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/aspectj/systemtest/reweavable/reweavable.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,9 @@
>+<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[
>+<!ENTITY tests SYSTEM "../tests/src/org/aspectj/systemtest/reweavable/reweavable-tests.xml">
>+]>
>+
>+
>+
>+<suite>
>+&tests;
>+</suite>

Actions: View | Diff

Attachments on bug 104218: 24905 | 25037 | 26902