From c7584070e1ca1e4f1899f4b62e2c193d4d43c206 Mon Sep 17 00:00:00 2001
From: wisberg <wisberg>
Date: Wed, 6 Aug 2003 01:53:16 +0000
Subject: [PATCH] passing tests for interface libraries.  The behavior might be
 wrong (i.e., some should fail) -- confirming on the list.

---
 tests/ajcTests.xml                            |  84 ++++++++++++++++++
 tests/new/interfaceLibrary/Client.java        |   9 ++
 tests/new/interfaceLibrary/LibraryAspect.java |   6 ++
 tests/new/interfaceLibrary/aspectOnly.jar     | Bin 0 -> 1027 bytes
 .../aspectedInterfaceOnly.jar                 | Bin 0 -> 312 bytes
 .../aspectedInterfaceOnlyBinary.jar           | Bin 0 -> 312 bytes
 tests/new/interfaceLibrary/build.xml          |  83 +++++++++++++++++
 tests/new/interfaceLibrary/interfaceOnly.jar  | Bin 0 -> 263 bytes
 .../lib/LibraryInterface.java                 |   6 ++
 9 files changed, 188 insertions(+)
 create mode 100644 tests/new/interfaceLibrary/Client.java
 create mode 100644 tests/new/interfaceLibrary/LibraryAspect.java
 create mode 100644 tests/new/interfaceLibrary/aspectOnly.jar
 create mode 100644 tests/new/interfaceLibrary/aspectedInterfaceOnly.jar
 create mode 100644 tests/new/interfaceLibrary/aspectedInterfaceOnlyBinary.jar
 create mode 100644 tests/new/interfaceLibrary/build.xml
 create mode 100644 tests/new/interfaceLibrary/interfaceOnly.jar
 create mode 100644 tests/new/interfaceLibrary/lib/LibraryInterface.java

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 22f1019ee..82d4e6ed4 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -6515,4 +6515,88 @@
 		</compile>
 	</ajc-test>
 
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - baseline">
+		<compile files="lib/LibraryInterface.java,
+						Client.java,
+						LibraryAspect.java"/>
+		<run class="Client"/>
+		</ajc-test>
+		
+	<ajc-test dir="new/interfaceLibrary"
+		comment="prove that LibraryAspect is required"
+		title="aspect-declared interface members in libraries - interfaceOnly.jar">
+		<compile 
+			files="Client.java" 
+			aspectpath="interfaceOnly.jar">
+			<message kind="error" line="5"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectOnly.jar">
+		<compile 
+			files="lib/LibraryInterface.java,
+					Client.java" 
+			aspectpath="aspectOnly.jar"/>
+		<run class="Client"/>
+		</ajc-test>
+		
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar"
+		comment="prove aspect is required even if interface is woven"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar">
+			<message kind="error" line="9" text="LibraryInterface"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectOnly.jar"
+		comment="weaving required for implementations of interface? 
+		         XXX Would prefer to support javac compiles of Client here, mimicked with classpath only"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar,aspectOnly.jar">
+			<message kind="error" line="9"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnlyBinary.jar,aspectOnly.jar"
+		comment="works if aspect is only on the classpath?, i.e., no weaving XXX need javac run"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnlyBinary.jar,aspectOnly.jar">
+			<message kind="error" line="9"/>
+			</compile>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
+		comment="can weave to create library, and then weave clients"
+		>
+		<compile 
+			files="Client.java" 
+			classpath="aspectedInterfaceOnly.jar"
+			aspectpath="aspectOnly.jar"/>
+		<run class="Client"/>
+		</ajc-test>
+
+	<ajc-test dir="new/interfaceLibrary"
+		title="aspect-declared interface members in libraries - aspectedInterfaceOnly.jar,aspectpath=aspectOnly.jar"
+		comment="works if source aspect and binary classpath woven with aspect? 
+		         should NOT warn about affected type not since affected type is already woven?"
+		>
+		<compile 
+			files="Client.java,LibraryAspect.java" 
+			classpath="aspectedInterfaceOnly.jar"/>
+			
+		<run class="Client"/>
+		</ajc-test>
+		
 </suite>
diff --git a/tests/new/interfaceLibrary/Client.java b/tests/new/interfaceLibrary/Client.java
new file mode 100644
index 000000000..e53bfff21
--- /dev/null
+++ b/tests/new/interfaceLibrary/Client.java
@@ -0,0 +1,9 @@
+
+
+public class Client {
+    public static void main(String[] a) {
+        new C().run();
+    }
+}
+
+class C implements lib.LibraryInterface {}
\ No newline at end of file
diff --git a/tests/new/interfaceLibrary/LibraryAspect.java b/tests/new/interfaceLibrary/LibraryAspect.java
new file mode 100644
index 000000000..34a6a36b9
--- /dev/null
+++ b/tests/new/interfaceLibrary/LibraryAspect.java
@@ -0,0 +1,6 @@
+
+aspect LibraryAspect {
+    public void lib.LibraryInterface.run() {
+        System.err.println("LibraryAspect-defined run() for " + this);
+    }
+}
\ No newline at end of file
diff --git a/tests/new/interfaceLibrary/aspectOnly.jar b/tests/new/interfaceLibrary/aspectOnly.jar
new file mode 100644
index 0000000000000000000000000000000000000000..4aaffb64563fc62d26bef09ab3f7e98f59976eb9
GIT binary patch
literal 1027
zcmWIWW@Zs#-~hs-Q&{yGkbp3d?UR{Qlvq^hSX_{rT%wnplUQ85G$b)!*j=Dj`nKh5
zONEvR6Pz*@_!S0aO~14(S7wr$+J!A_S~G)|ZfdzUy?5`l;`Fy`g%|x(wVM#4q&x9e
ze$4~-i|5|Os#+Tgh5FyReS7Bi{Cj8K+?&09{XZ9``HKz}EK_>jwfgVX4azoe8w`84
z{m|3jw)4J*-Ky<tOb-@xZr>B*zGBrE>D-0P^@sUQzuO)xSa-=iD9J;=GWVtT-ZK+U
zoVQK%nAWW8G;gbl<BHSQ-YRvMh&f9bs$3H1-)&vGQ0{Zp>;uVD4?KRW9^<*WulKO`
zwChJLHyd{bKDy>BX`~~O_cD8-9LHUrZAG<<igF|CrJ~JvGG<pRE#GB#IAovGxksMq
zCtu9t4Ox6Z*Ln2@^&jg3TED){jXD(@IF)z)>vcl4rmNqzN4>F_vEWW?5RbU_HO=Nn
z{as%|w+huPfAUCZnbC|R>^#D@yG;|NvSYgz%ETmkOgwgUrpY>?z<otR9!kENX`5yo
zGhM~^zNBUU(Spt5Ql%SB%CpKv+LqL`%t@TF^xR8@Pli3u{ogCR;eEne*7xvG!ycKM
zLk~)N7QWqGa?InFuZV=vGTUXr{+jm>vZhB^UOc?p=uN>})BL^V#>d$Wt#|mIRoLIH
zKT+<Wc*Fvq#oO#|rCIpToM&?=oV}!OYv|qYrNJ35cX}jRIJ-|@V9pWMvoLU@9Gl?z
zs0&}WUz=aKXmRQT>m8GiZnE4oQ;lD_Wv{~i2&G~{x8zefrZ2So?@Yev`r>MsL1_96
zxdrb(*16lf_{HnEJTGg)KZ_@47~(}X$ON37_wwM&|2fN7J)7mCx-+Y$EnCH$v*FRq
zrVG=Xx5!RWS-Vc5YSRA0wi|XBf00`zxkdPy*zpreXOGRAWq;@=^J_cr{OeMUhTivf
zTQ+k`EdQyrHgErDpPMt5ef{R1vN9}Vig4hS(xChoYW#&iB`(iSmX~|@>yLNMAE7UL
z-(DAF{$t#pBpW%~K}dK?1>5}p{JJU!GG_K_KRENhalOQ%qOaE!y5=6d{-Z5PH!3>h
zNy}e3+as5rWvj%?Bv*ds(5^q)k-za)`}~fdo7y9)dqX}|KC0Yew*Rr+lO<;bB`l8#
z7*4A{e3v=fBk-wD=DUY>XStpKTc-d1I+yeCzdre#3!l`dtm@vncZ1mcy|cs?@@4P4
zvHE1a=VOJfm#-hvYWB_VYP+~B^H10N-qIKH0p9E!^KGUxWHU1`{A6Qb2=HcP5@A5(
gR%AI)Zbb!H@@{}PE6^AQ21X!s1k!7O1~V`K0C;WG2><{9

literal 0
HcmV?d00001

diff --git a/tests/new/interfaceLibrary/aspectedInterfaceOnly.jar b/tests/new/interfaceLibrary/aspectedInterfaceOnly.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9cb969b9d12def7ce24052733e4e9edbf36242ae
GIT binary patch
literal 312
zcmWIWW@Zs#-~hs7Q&{yGkbo4Bos*fQ?~|ESlvq^hnOBlpl$MyBs+XLTSX><2eUPgu
zK*Z(ws?42PfwvdL>Q?=86=2bAiHd)!)|GK*p4<Lwi}+tGUbOslT49=m#r*fLdF8E-
zw7ABmo!oe4%Gb(_H7}+XcRI9G9<^0BHFqsKrFAlwWxl}j+~qspoQ~o+U4M~>FY#(t
z;*YxGpj5d-dspo2nHsgt@5|O~8S~r4JKEYAoHZ1D42w@6PD$y=__0?$z?+?eYswDp
pNkDgR1mXa1MkWykgx`?mKz>67xP2Pn&B_K+%Ls%XK>8L~BLK{EXWak*

literal 0
HcmV?d00001

diff --git a/tests/new/interfaceLibrary/aspectedInterfaceOnlyBinary.jar b/tests/new/interfaceLibrary/aspectedInterfaceOnlyBinary.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9cb969b9d12def7ce24052733e4e9edbf36242ae
GIT binary patch
literal 312
zcmWIWW@Zs#-~hs7Q&{yGkbo4Bos*fQ?~|ESlvq^hnOBlpl$MyBs+XLTSX><2eUPgu
zK*Z(ws?42PfwvdL>Q?=86=2bAiHd)!)|GK*p4<Lwi}+tGUbOslT49=m#r*fLdF8E-
zw7ABmo!oe4%Gb(_H7}+XcRI9G9<^0BHFqsKrFAlwWxl}j+~qspoQ~o+U4M~>FY#(t
z;*YxGpj5d-dspo2nHsgt@5|O~8S~r4JKEYAoHZ1D42w@6PD$y=__0?$z?+?eYswDp
pNkDgR1mXa1MkWykgx`?mKz>67xP2Pn&B_K+%Ls%XK>8L~BLK{EXWak*

literal 0
HcmV?d00001

diff --git a/tests/new/interfaceLibrary/build.xml b/tests/new/interfaceLibrary/build.xml
new file mode 100644
index 000000000..d23e49e38
--- /dev/null
+++ b/tests/new/interfaceLibrary/build.xml
@@ -0,0 +1,83 @@
+
+<project name="interfaceLibrary" default="build" basedir=".">
+
+
+    <target name="build" depends="init">
+       <iajc 
+       	classpath="${aspectjrt.jar}"
+       	outjar="interfaceOnly.jar"
+       	srcdir="."
+       	includes="lib/LibraryInterface.java"/>
+
+       <iajc 
+       	classpath="${aspectjrt.jar}${path.separator}interfaceOnly.jar"
+       	outjar="aspectOnly.jar"
+       	srcdir="."
+       	includes="LibraryAspect.java"/>
+
+       <iajc 
+       	classpath="${aspectjrt.jar}"
+       	aspectpath="aspectOnly.jar"
+       	outjar="aspectedInterfaceOnly.jar"
+       	srcdir="."
+       	includes="lib/LibraryInterface.java"/>
+
+       <iajc 
+       	classpath="${aspectjrt.jar}"
+       	aspectpath="aspectOnly.jar"
+       	injars="interfaceOnly.jar"
+       	outjar="aspectedInterfaceOnlyBinary.jar"/>
+
+    </target>
+    
+    <target name="init"  depends="init.variables,init.taskdefs"/>
+
+    <target name="init.variables" 
+     description="init variables">
+     
+      <!-- required directories - run from examples or predefine -->
+      <property name="interfaceLibrary.dir"
+            location="${basedir}"/> 
+      <property name="aspectj.lib.dir"
+            location="${interfaceLibrary.dir}/../../../aj-build/dist/tools/lib"/> 
+
+      <!-- required libraries - install or predefine -->
+      <property name="aspectjrt.jar"
+            location="${aspectj.lib.dir}/aspectjrt.jar"/> 
+      <property name="aspectjtools.jar"
+            location="${aspectj.lib.dir}/aspectjtools.jar"/> 
+
+      <!-- checking required libraries -->
+      <available file="${aspectjtools.jar}"
+             property="aspectjtools.jar.available"/>
+      <available file="${aspectjrt.jar}"
+             property="aspectjrt.jar.available"/>
+
+    </target>
+
+    <target name="init.taskdefs" depends="init.variables, 
+         aspectjtools.jar.available,
+         aspectjrt.jar.available"
+         unless="taskdefs.init">
+      <!-- sets name of new task to iajc, old task to ajc -->
+      <taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
+          <classpath> 
+            <pathelement path="${aspectjtools.jar}"/> 
+          </classpath>
+      </taskdef>
+	  <property name="taskdefs.init" value="true"/>
+    </target>
+
+    <!-- targets to fail unless required libraries available -->
+
+    <target name="aspectjrt.jar.available" depends="init.variables" 
+          unless="aspectjrt.jar.available" >
+      <fail message="expecting aspectjrt.jar at ${aspectjrt.jar}"/>
+    </target>
+
+    <target name="aspectjtools.jar.available" depends="init.variables" 
+          unless="aspectjtools.jar.available" >
+      <fail message="expecting aspectjtools.jar at ${aspectjtools.jar}"/>
+    </target>
+
+</project>
diff --git a/tests/new/interfaceLibrary/interfaceOnly.jar b/tests/new/interfaceLibrary/interfaceOnly.jar
new file mode 100644
index 0000000000000000000000000000000000000000..ede6fc868f7ffd886fbaa2fdaa68ea49069690ba
GIT binary patch
literal 263
zcmWIWW@Zs#-~htIQ&{yGkbo4Bos*fQ?~|ESlvq^hnOBlpl$MyBs+XLTSX^xVHUGLD
zTN+y|TbUc%#5reFYUiI>vgpVnuk(8*U0Jl{$diyVHa9o6#x+Max%{1TWKT)$|0Qd#
zJP|5mOLJpe_u$W^MNdMupP3Wl#uix8Tcu!|)5YV%qr)R`;KTtgm6;MZ7y`W6IhG};
qMkE5AQ3}KX-i%Bl3<#$p%YmGV3UE6-z?+o~q?Qo~J%IE|utorrrA~?f

literal 0
HcmV?d00001

diff --git a/tests/new/interfaceLibrary/lib/LibraryInterface.java b/tests/new/interfaceLibrary/lib/LibraryInterface.java
new file mode 100644
index 000000000..a712c5a08
--- /dev/null
+++ b/tests/new/interfaceLibrary/lib/LibraryInterface.java
@@ -0,0 +1,6 @@
+
+package lib;
+
+public interface LibraryInterface {
+//    void run();
+}
\ No newline at end of file
-- 
2.39.5