blob: 044223d88af4fcbce8f4e6869cb559beade3b83e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
<suite>
<ajc-test dir="features167/overweaving/getset" title="getset - 1">
<compile files="A.aj B.aj Class1.java Class2.java" options="-1.5"/>
<run class="Class1">
<stdout>
<line text="B:set(String Class1.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class1.message)"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2">
<stdout>
<line text="B:set(String Class2.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class2.message)"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/getset" title="getset - 2">
<compile files="A.aj Class1.java" options="-1.5"/>
<compile files="B.aj" options="-1.5 -Xlint:ignore"/>
<compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
<run class="Class1" ltw="aop.xml">
<stdout>
<!-- should be advised by both, but was *already* advised by A during first weave -->
<line text="B:set(String Class1.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class1.message)"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2" ltw="aop.xml">
<stdout>
<line text="B:set(String Class2.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class2.message)"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/getsetTJP" title="getset - tjp - 1">
<compile files="A.aj Class1.java" options="-1.5"/>
<compile files="B.aj" options="-1.5 -Xlint:ignore"/>
<compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
<run class="Class1" ltw="aop.xml">
<stdout>
<!-- should be advised by both, but was *already* advised by A during first weave -->
<line text="B:set(String Class1.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class1.message)"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2" ltw="aop.xml">
<stdout>
<line text="B:set(String Class2.message)"/>
<line text="A:get(PrintStream java.lang.System.out)"/>
<line text="A:get(String Class2.message)"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/calls" title="calls - 1">
<compile files="A.aj B.aj Class1.java Class2.java" options="-1.5"/>
<run class="Class1">
<stdout>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2">
<stdout>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/calls" title="calls - 2">
<compile files="A.aj Class1.java" options="-1.5"/>
<compile files="B.aj" options="-1.5 -Xlint:ignore"/>
<compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
<run class="Class1" ltw="aop.xml">
<stdout>
<!-- should be advised by both, but was *already* advised by A during first weave -->
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2" ltw="aop.xml">
<stdout>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/callsTJP" title="calls - tjp - 1">
<compile files="A.aj Class1.java" options="-1.5"/>
<compile files="B.aj" options="-1.5 -Xlint:ignore"/>
<compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
<run class="Class1" ltw="aop.xml">
<stdout>
<!-- should be advised by both, but was *already* advised by A during first weave -->
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2" ltw="aop.xml">
<stdout>
<line text="B:call(void java.io.PrintStream.println(String))"/>
<line text="A:call(void java.io.PrintStream.println(String))"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/messy2" title="really messy">
<compile files="A.aj Class1.java" options="-1.5"/>
<compile files="B.aj" options="-1.5 -Xlint:ignore"/>
<compile files="Class2.java" options="-1.5 -Xlint:ignore"/>
<run class="Class1" ltw="aop.xml">
<stdout>
<!-- should be advised by both, but was *already* advised by A during first weave -->
<line text="B:execution(void Class1.main(String[]))"/>
<line text="A:execution(void Class1.main(String[]))"/>
<line text="Class1.main"/>
</stdout>
</run>
<run class="Class2" ltw="aop.xml">
<stdout>
<line text="B:execution(void Class2.main(String[]))"/>
<line text="A:execution(void Class2.main(String[]))"/>
<line text="Class2.main"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving" title="simple">
<compile files="A.aj C.java" options="-1.5"/>
<compile files="X.aj" options="-1.5 -Xlint:ignore"/>
<run class="com.andy.C" ltw="aop.xml">
<stdout>
<line text="AspectX>>execution(void com.andy.C.main(String[]))"/>
<line text="AspectA>>execution(void com.andy.C.main(String[]))"/>
<line text="AspectX>>execution(void com.andy.C.run())"/>
<line text="hello andy"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/messy" title="messy">
<compile files="A.aj C.java" options="-1.5"/>
<compile files="X.aj" options="-1.5 -Xlint:ignore"/>
<run class="com.andy.C" ltw="aop.xml">
<stdout>
<line text="X:execution(void com.andy.C.main(String[]))"/>
<line text="A:execution(void com.andy.C.main(String[]))"/>
<line text="X:execution(void com.andy.C.run())"/>
<line text="hello andy"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features167/overweaving/cflow" title="cflow">
<compile files="A.aj C.java" options="-1.5"/>
<compile files="X.aj" options="-1.5 -Xlint:ignore"/>
<run class="com.andy.C" ltw="aop.xml">
<stdout>
<line text="X:execution(void com.andy.C.main(String[]))"/>
<line text="A:execution(void com.andy.C.main(String[]))"/>
<line text="X:execution(void com.andy.C.run())"/>
<line text="hello andy"/>
</stdout>
</run>
</ajc-test>
</suite>
|
