aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/test/java/org/aspectj/systemtest/incremental/incremental-junit-tests.xml
blob: 659abff47aaea74ca671eae196c139aec11cad7c (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
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
<!-- Incremental compilation Tests -->

     <ajc-test dir="incrementalju/initialTests/classAdded" 
    	title="expect class added in initial incremental tests" 
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
        	sourceroots="src"/>
        <run class="main.Main"/>
        <!--
        <inc-compile tag="20" >
            <dir-changes added="main.Target"/>
        </inc-compile>
        <run class="main.Main"  skipTester="true"/>
        -->
    </ajc-test>

    <ajc-test dir="incrementalju/initialTests/classRemoved" 
    	title="expect class removed in initial incremental tests" 
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental" 
        	sourceroots="src"/>
        <run class="main.Main"/>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="main.Target"/>
        </inc-compile>
        <run class="main.Main"/>
        -->
    </ajc-test>

    <ajc-test dir="incrementalju/initialTests/classUpdated" 
    	title="expect class updated in initial incremental tests" 
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
        	sourceroots="src"/>
        <run class="main.Main"/>
        <!--
        <inc-compile tag="20">
            <dir-changes updated="main.Main"/>
        </inc-compile>
        <run class="main.Main"/>
        -->
    </ajc-test>

     <ajc-test dir="incrementalju/initialTests/sourceAdded" 
    	title="add file with class"
    	comment="only expecting pickup if sourceroots"    
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
        	sourceroots="src"/>
        <run class="main.Main"/>
        <!--
        <inc-compile tag="20">
            <dir-changes added="main.Target"/>
        </inc-compile>
        <inc-compile tag="30">
            <dir-changes updated="main.Main"/>
        </inc-compile>
        <run class="main.Main"/>
        -->
    </ajc-test>

    <ajc-test dir="incrementalju/initialTests/sourceDeleted" 
        title="delete source file before incremental compile"
        comment="build config should permit file deletions for incremental (sourceroots)"
        keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
    		sourceroots="src"/>
        <run class="delete.Main"/>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="delete.DeleteMe"/>
        	<message kind="error" line="6" file="delete/Target.java"/>
        </inc-compile>
        <inc-compile tag="30"/> 
        <run class="delete.Main"/>
        -->
    </ajc-test>
    
    <ajc-test dir="incrementalju/initialTests/defaultPackage" 
    	title="do everything in default package (sourceroots)" 
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
    		sourceroots="src"/>
        <run class="Main"/>
        <!--
        <inc-compile tag="20">
            <dir-changes added="Target"/>
        </inc-compile>
        <run class="Target" skipTester="true"/>
        <inc-compile tag="30">
            <dir-changes updated="Main"/>
        </inc-compile>
        <run class="Main" skipTester="true"/>
        <inc-compile tag="40"> 
			<message kind="error" line="6" file="Main.java"/>
        </inc-compile>
        <inc-compile tag="50"/>
        <run class="Main"/>
        -->
    </ajc-test>

  <ajc-test dir="incrementalju/defaultPackage"
    keywords="incremental-test"
   	title="change sources in default package">
        <compile 
        	staging="true"
        	options="-incremental" 
        	sourceroots="src"/>
        <run class="Main"/>
        <!--
        <inc-compile tag="20"/>
        <run class="Main"/>
        -->
    </ajc-test>

   <ajc-test dir="incrementalju/interPackage"
    keywords="incremental-test"
   	title="change source">
        <compile 
        	staging="true"
        	options="-incremental" 
        	sourceroots="src"/>
        <run class="app.Main"/>
        <!--
        <inc-compile tag="20"/>
        <run class="app.Main"/>
        -->
    </ajc-test>

     <ajc-test dir="incrementalju/stringliteral"
    	keywords="incremental-test"
		title="incrementally change only string literal, still expect advice">
        <compile staging="true" options="-incremental" 
        	sourceroots="src"/>
		<run class="packageOne.Main"
			options="in packageOne.Main.main(..),before main packageOne.Main"/>
        <!--
        <inc-compile tag="20">
        	<dir-changes updated="packageOne.Main"/>
        </inc-compile>
		<run class="packageOne.Main"
			options="in longer packageOne.Main.main(..),
					 before main packageOne.Main"/>
        -->
    </ajc-test>

	<ajc-test dir="incrementalju/initialTests/aspectSourceAdded" 
    	title="add aspect source file and check world is rewoven"
    	keywords="incremental-test" >
        <compile staging="true" 
        	options="-incremental"
        	sourceroots="src"/>
        <!--
        <inc-compile tag="20">
            <dir-changes added="Detour"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>
    
    <ajc-test dir="incrementalju/initialTests/classWAroundClosureRemoved"
      title="make sure additional classes generated during weave are deleted with src class file"
      keywords="incremental-test">
      <compile staging="true" 
        	options="-incremental"
        	sourceroots="src"/>
        <!--
        <inc-compile tag="20" >
            <dir-changes removed="AdviceOnIntroduced$AjcClosure1"/>
        </inc-compile>
        -->
    </ajc-test>

  <ajc-test dir="incrementalju/full-rebuild"
    	pr="59895"
		title="incremental with aspect-driven full rebuild">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental">
        	<message kind="error" line="3" file="Aspect.java"/>
        	</compile>
        <!--
        <inc-compile tag="20">
        	<message kind="warning" line="3" file="Main.java"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>
	
	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
    	pr="54622"
		title="incremental with addition of resource to inpath directory">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="indir">
       	</compile>
        <!--
        <inc-compile tag="20">
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	 <ajc-test dir="incrementalju/resourceTests/resourceAdded"
    	pr="54622"
		title="incremental with addition of resource to inpath jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes added="AResourceFile.txt"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	<ajc-test dir="incrementalju/resourceTests/resourceRemoved"
    	pr="54622"
		title="incremental with removal of resource from inpath jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="AResourceFile.txt"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	 <ajc-test dir="incrementalju/injarTests/classAdded"
    	pr="54621"
		title="incremental with addition of class to inpath jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes added="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	<ajc-test dir="incrementalju/injarTests/classRemoved"
    	pr="54621"
		title="incremental with removal of class from inpath jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>

   <ajc-test dir="incrementalju/injarTests/classAdded"
    	pr="54621"
		title="incremental with addition of class to injar jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental,-injars,MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes added="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	<ajc-test dir="incrementalju/injarTests/classRemoved"
    	pr="54621"
		title="incremental with removal of class from injar jar">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental,-injars,MyJar.jar"
			inpath="MyJar.jar">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>



	 <ajc-test dir="incrementalju/inpathDirTests/classAdded"
    	pr="54621"
		title="incremental with addition of class to inpath dir">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="indir">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes added="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>


	<ajc-test dir="incrementalju/inpathDirTests/classRemoved"
    	pr="54621"
		title="incremental with removal of class from inpath dir">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="indir">
       	</compile>
        <!--
        <inc-compile tag="20">
            <dir-changes removed="Hello2"/>
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>

	 <ajc-test dir="incrementalju/inpathDirTests/classUpdated"
    	pr="54621"
		title="incremental with update of class in inpath dir">
        <compile 
			staging="true" 
			sourceroots="src"
			options="-incremental"
			inpath="indir">
       	</compile>
        <!--
        <inc-compile tag="20">
        </inc-compile>
        <run class="Main"/>
        -->
    </ajc-test>
    
    <ajc-test dir="incremental/structureModel"
      pr="90806"
      keywords="incremental-test"
   	  title="NPE in genHandleIdentifier">
        <compile staging="true"	options="-incremental,-verbose,-emacssym,-1.4" sourceroots="src"/>
        <!--inc-compile tag="20"/-->
    </ajc-test>
    	 
   <ajc-test dir="bugs/incremental-declare-error" pr="84033"
   	 title="incremental declare error persists after fix">
        <compile staging="true" 
        	options="-incremental,-verbose"
        	sourceroots="src">
			<message kind="error" line="6" text="main"/>
		</compile>
        <!--inc-compile tag="20"/-->
        <!--run class="pack.Main"/-->
    </ajc-test>

   <ajc-test dir="bugs153/pr154054" pr="154054"
   	 title="incremental update of body in around advice">
        <compile staging="true" 
        	options="-incremental,-verbose"
        	sourceroots="src"/>
        <!--inc-compile tag="20"/-->
        <!--run class="MyClass"/-->
    </ajc-test>

   <ajc-test dir="bugs153/pr154054_2" pr="154054"
   	 title="incremental update of body in around advice with string">
        <compile staging="true" 
        	options="-incremental,-verbose"
        	sourceroots="src"/>
        <!--inc-compile tag="30"/-->
        <!--run class="MyClass"/-->
    </ajc-test>