Lines 332-338
Link Here
|
332 |
if (result.getErrorMessages().size()!=0) System.err.println("Expecting no errors from jar building but got\n"+result.getErrorMessages()); |
332 |
if (result.getErrorMessages().size()!=0) System.err.println("Expecting no errors from jar building but got\n"+result.getErrorMessages()); |
333 |
assertTrue("Should get no errors for this compile, but got: "+result.getErrorMessages().size(),result.getErrorMessages().size()==0); |
333 |
assertTrue("Should get no errors for this compile, but got: "+result.getErrorMessages().size(),result.getErrorMessages().size()==0); |
334 |
// Execute: "ajc -inpath classes -showWeaveInfo -d classes2 -aspectpath aspects.jar" |
334 |
// Execute: "ajc -inpath classes -showWeaveInfo -d classes2 -aspectpath aspects.jar" |
335 |
result = ajc(testBase,new String[]{"-inpath","classes","-showWeaveInfo","-d","classes2","-aspectpath","aspects.jar"}); |
335 |
result = weave(testBase,new String[]{"-inpath","classes","-showWeaveInfo","-d","classes2","-aspectpath","aspects.jar"}); |
336 |
|
336 |
|
337 |
if (!expectErrors) assertTrue("unexpected errors? \n"+result.getErrorMessages(),!result.hasErrorMessages()); |
337 |
if (!expectErrors) assertTrue("unexpected errors? \n"+result.getErrorMessages(),!result.hasErrorMessages()); |
338 |
|
338 |
|
Lines 415-421
Link Here
|
415 |
// } |
415 |
// } |
416 |
} |
416 |
} |
417 |
|
417 |
|
418 |
public String[] mergeOptions(String[] input,String[] extras) { |
418 |
// default to testing with ajc |
|
|
419 |
protected CompilationResult weave(File testBase, String[] strings) { |
420 |
return ajc(testBase, strings); |
421 |
} |
422 |
|
423 |
|
424 |
public String[] mergeOptions(String[] input,String[] extras) { |
419 |
String[] ret = new String[input.length+extras.length]; |
425 |
String[] ret = new String[input.length+extras.length]; |
420 |
System.arraycopy(input,0,ret,0,input.length); |
426 |
System.arraycopy(input,0,ret,0,input.length); |
421 |
System.arraycopy(extras,0,ret,input.length,extras.length); |
427 |
System.arraycopy(extras,0,ret,input.length,extras.length); |
Lines 425-431
Link Here
|
425 |
|
431 |
|
426 |
|
432 |
|
427 |
|
433 |
|
428 |
private List getWeaveMessages(CompilationResult result) { |
434 |
protected List getWeaveMessages(CompilationResult result) { |
429 |
List infoMessages = result.getInfoMessages(); |
435 |
List infoMessages = result.getInfoMessages(); |
430 |
List weaveMessages = new ArrayList(); |
436 |
List weaveMessages = new ArrayList(); |
431 |
for (Iterator iter = infoMessages.iterator(); iter.hasNext();) { |
437 |
for (Iterator iter = infoMessages.iterator(); iter.hasNext();) { |