Browse Source

Progress on: empty catch block warning - updates to test cases with empty catch blocks

tags/POST_MEMORY_CHANGES
acolyer 18 years ago
parent
commit
d07f63a30c

+ 8
- 8
tests/src/org/aspectj/systemtest/ajc10x/ajc10x-tests.xml View File

<ajc-test dir="new" pr="248" <ajc-test dir="new" pr="248"
title=", PR#249, PR#250 advice on constructor sites" title=", PR#249, PR#250 advice on constructor sites"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="NewSiteAdvice.java"/>
<compile files="NewSiteAdvice.java" options="-Xlint:ignore"/>
<run class="NewSiteAdvice"/> <run class="NewSiteAdvice"/>
</ajc-test> </ajc-test>


<ajc-test dir="new/extraThrows" pr="259" <ajc-test dir="new/extraThrows" pr="259"
title="throws Exception clause is unnecessarily added to Driver.main method" title="throws Exception clause is unnecessarily added to Driver.main method"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="Driver.java"/>
<compile files="Driver.java" options="-Xlint:ignore"/>
<run class="Driver"/> <run class="Driver"/>
</ajc-test> </ajc-test>




<ajc-test dir="new" pr="318" title="Handlers problem" <ajc-test dir="new" pr="318" title="Handlers problem"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="PR318.java"/>
<compile files="PR318.java" options="-Xlint:ignore"/>
<run class="PR318"/> <run class="PR318"/>
</ajc-test> </ajc-test>




<ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]" <ajc-test dir="new" title="Basic test for cflow pointcuts [eachcflow]"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="CFlowPoints.java"/>
<compile files="CFlowPoints.java" options="-Xlint:ignore"/>
<run class="CFlowPoints"/> <run class="CFlowPoints"/>
</ajc-test> </ajc-test>


<ajc-test dir="new" pr="114" <ajc-test dir="new" pr="114"
title=", PR#115 checks the ordering of catch clauses" title=", PR#115 checks the ordering of catch clauses"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="OrderOfCatches.java"/>
<compile files="OrderOfCatches.java" options="-Xlint:ignore"/>
<run class="OrderOfCatches"/> <run class="OrderOfCatches"/>
</ajc-test> </ajc-test>


<ajc-test dir="new" <ajc-test dir="new"
title="exceptions thrown and caught in advice, particularly try+proceed" title="exceptions thrown and caught in advice, particularly try+proceed"
keywords="from-resolved_10x"> keywords="from-resolved_10x">
<compile files="TryAndProceed.java"/>
<compile files="TryAndProceed.java" options="-Xlint:ignore"/>
<run class="TryAndProceed"/> <run class="TryAndProceed"/>
</ajc-test> </ajc-test>


<ajc-test dir="new/packageAccessPR556" pr="556" <ajc-test dir="new/packageAccessPR556" pr="556"
title="aspects should get package access outside the file" title="aspects should get package access outside the file"
keywords="from-resolved_10rc3"> keywords="from-resolved_10rc3">
<compile files="base1/p/C1.java,base2/p/C2.java"/>
<compile files="base1/p/C1.java,base2/p/C2.java" options="-Xlint:ignore"/>
<run class="p.C1"/> <run class="p.C1"/>
</ajc-test> </ajc-test>


<ajc-test dir="new" <ajc-test dir="new"
title="changing this in around's proceed reported by Rich Price" title="changing this in around's proceed reported by Rich Price"
keywords="from-resolved_104"> keywords="from-resolved_104">
<compile files="AroundChangeThis.java" options="-1.4"/>
<compile files="AroundChangeThis.java" options="-1.4 -Xlint:ignore"/>
<run class="AroundChangeThis"/> <run class="AroundChangeThis"/>
</ajc-test> </ajc-test>



+ 3
- 3
tests/src/org/aspectj/systemtest/ajc11/ajc11-tests.xml View File



<ajc-test dir="bugs" pr="34925" <ajc-test dir="bugs" pr="34925"
title="declare soft and throw statements"> title="declare soft and throw statements">
<compile files="ConvertToUnchecked.java"/>
<compile files="ConvertToUnchecked.java" options="-Xlint:ignore"/>
<run class="ConvertToUnchecked"/> <run class="ConvertToUnchecked"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs" pr="36564" <ajc-test dir="bugs" pr="36564"
title="Internal compiler error with thisJoinPoint.getStaticPart()"> title="Internal compiler error with thisJoinPoint.getStaticPart()">
<compile files="tjpStaticPart/Test.java,tjpStaticPart/Exceptions.java"/>
<compile files="tjpStaticPart/Test.java,tjpStaticPart/Exceptions.java" options="-Xlint:ignore"/>
<run class="tjpStaticPart.Test"/> <run class="tjpStaticPart.Test"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs" pr="29665" <ajc-test dir="bugs" pr="29665"
title="Inconsistant stack height with around"> title="Inconsistant stack height with around">
<compile files="StackError.java"/>
<compile files="StackError.java" options="-Xlint:ignore"/>
<run class="StackError"/> <run class="StackError"/>
</ajc-test> </ajc-test>

+ 2
- 2
tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml View File



<ajc-test dir="bugs" pr="44586" <ajc-test dir="bugs" pr="44586"
title="After throwing advice on ctors doesn't execute for inter-type decl field inits"> title="After throwing advice on ctors doesn't execute for inter-type decl field inits">
<compile files="AfterThrowingCtor.java">
<compile files="AfterThrowingCtor.java" options="-Xlint:ignore">
</compile> </compile>
<run class="AfterThrowingCtor"/> <run class="AfterThrowingCtor"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs" pr="34206" <ajc-test dir="bugs" pr="34206"
title="before():execution(new(..)) does not throw NoAspectBoundException"> title="before():execution(new(..)) does not throw NoAspectBoundException">
<compile files="ErroneousExceptionConversion1.java">
<compile files="ErroneousExceptionConversion1.java" options="-Xlint:ignore">
</compile> </compile>
<run class="ErroneousExceptionConversion1"/> <run class="ErroneousExceptionConversion1"/>
</ajc-test> </ajc-test>

+ 2
- 0
tests/src/org/aspectj/systemtest/ajc121/ajc121-tests.xml View File

<message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/> <message kind="error" line="10" text="The method ancientJ() from the type AncientFoo is not visible"/>
<message kind="error" line="11" text="The method clone() from the type Object is not visible"/> <message kind="error" line="11" text="The method clone() from the type Object is not visible"/>
<message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/> <message kind="error" line="12" text="Cannot make a static reference to the non-static method clone() from the type Object"/>
<message kind="warning" line="14" text="Exception swallowed in catch block"/>
<message kind="warning" line="29" text="Exception swallowed in catch block"/>
</compile> </compile>
</ajc-test> </ajc-test>

+ 13
- 11
tests/src/org/aspectj/systemtest/ajc150/ajc150.xml View File

<message kind="warning" line="17" text="aa * *(..) throws Exception"/> <message kind="warning" line="17" text="aa * *(..) throws Exception"/>
<message kind="warning" line="37" text="aa call void m() throws Exception"/> <message kind="warning" line="37" text="aa call void m() throws Exception"/>
<message kind="warning" line="38" text="aa call void m() throws Exception"/> <message kind="warning" line="38" text="aa call void m() throws Exception"/>
</compile>
<message kind="warning" line="37" text="Exception swallowed in catch block"/>
<message kind="warning" line="38" text="Exception swallowed in catch block"/>
</compile>
<run class="pr119749"> <run class="pr119749">
<stdout> <stdout>
<line text="execution(void pr119749.C.m()): execMe[Me]"/> <line text="execution(void pr119749.C.m()): execMe[Me]"/>
</ajc-test> </ajc-test>
<ajc-test dir="java5/reflection" title="reflection on itds"> <ajc-test dir="java5/reflection" title="reflection on itds">
<compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.5"></compile>
<compile files="InterTypeDeclarations.aj,ReflectOnCodeStyleITDs.java" options="-1.5 -Xlint:ignore"></compile>
<run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar"> <run class="ReflectOnCodeStyleITDs" classpath="../lib/bcel/bcel.jar">
<stdout> <stdout>
<line text="public C.new(int, int, int)"/> <line text="public C.new(int, int, int)"/>
</ajc-test> </ajc-test>


<ajc-test dir="java5/reflection" title="reflection on @DeclareParents"> <ajc-test dir="java5/reflection" title="reflection on @DeclareParents">
<compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.5"></compile>
<compile files="AtAspectJDeclareParents.aj,ReflectOnAtAspectJDeclareParents.java" options="-1.5 -Xlint:ignore"></compile>
<run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar"> <run class="ReflectOnAtAspectJDeclareParents" classpath="../lib/bcel/bcel.jar">
<stdout> <stdout>
<line text="declare parents : C implements I"/> <line text="declare parents : C implements I"/>
</ajc-test> </ajc-test>
<ajc-test dir="compatibility/case2" title="generating code for a 1.2.1 runtime - 2"> <ajc-test dir="compatibility/case2" title="generating code for a 1.2.1 runtime - 2">
<compile files="TrackingErrors.aj,A.java" options="-Xajruntimetarget:1.2"/>
<compile files="TrackingErrors.aj,A.java" options="-Xajruntimetarget:1.2 -Xlint:ignore"/>
<run class="A" classpath="../lib/aspectj/lib/aspectjrt121.jar"/> <run class="A" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
</ajc-test> </ajc-test>
</ajc-test> </ajc-test>


<ajc-test dir="bugs150" title="declare soft and exclusions" pr="103097"> <ajc-test dir="bugs150" title="declare soft and exclusions" pr="103097">
<compile files="Pr103097.aj"/>
<compile files="Pr103097.aj" options="-Xlint:ignore"/>
<run class="Pr103097"/> <run class="Pr103097"/>
</ajc-test> </ajc-test>
</ajc-test> </ajc-test>


<ajc-test dir="decs" pr="42743" title="declare soft w. catch block"> <ajc-test dir="decs" pr="42743" title="declare soft w. catch block">
<compile files="VerifyError.aj">
<compile files="VerifyError.aj" options="-Xlint:ignore">
</compile> </compile>
<run class="VerifyError"/> <run class="VerifyError"/>
</ajc-test> </ajc-test>
</ajc-test> </ajc-test>


<ajc-test dir="bugs150" pr="83645" title="pertypewithin({interface}) illegal field modifier"> <ajc-test dir="bugs150" pr="83645" title="pertypewithin({interface}) illegal field modifier">
<compile files="PR83645.java"/>
<compile files="PR83645.java" options="-Xlint:ignore"/>
<run class="PR83645"/> <run class="PR83645"/>
</ajc-test> </ajc-test>
<!-- end of atOverride tests with ITDs --> <!-- end of atOverride tests with ITDs -->


<ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5"> <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
<compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5"/>
<compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5 -Xlint:ignore"/>
</ajc-test> </ajc-test>


<ajc-test dir="java5/varargs" title="varargs in constructor sig" vm="1.5"> <ajc-test dir="java5/varargs" title="varargs in constructor sig" vm="1.5">
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<ajc-test dir="java5/pertypewithin" title="basic ptw test"> <ajc-test dir="java5/pertypewithin" title="basic ptw test">
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java"/>
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
<run class="p.A"> <run class="p.A">
<stderr> <stderr>
<line text="hi from A"/> <line text="hi from A"/>
</ajc-test> </ajc-test>


<ajc-test dir="java5/pertypewithin" title="ptw hasAspect"> <ajc-test dir="java5/pertypewithin" title="ptw hasAspect">
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java"/>
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
<run class="p.B"> <run class="p.B">
<stderr> <stderr>
<line text="hi from B"/> <line text="hi from B"/>
</ajc-test> </ajc-test>
<ajc-test dir="java5/pertypewithin" title="ptw aspectOf"> <ajc-test dir="java5/pertypewithin" title="ptw aspectOf">
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java"/>
<compile files="A.java,B.java,C.java,D.java,Main.java,X.java" options="-Xlint:ignore"/>
<run class="p.C"/> <run class="p.C"/>
</ajc-test> </ajc-test>



+ 1
- 1
tests/src/org/aspectj/systemtest/ajc150/ataspectj/annotationgen.xml View File

</ajc-test> </ajc-test>
<ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for itds"> <ajc-test dir="java5/ataspectj/annotationGen" title="ann gen for itds">
<compile files="ITDTest.aj" options="-1.5, -outxml">
<compile files="ITDTest.aj" options="-1.5, -outxml -Xlint:ignore">
</compile> </compile>
<run class="a.b.c.ITDTest" ltw=""/> <run class="a.b.c.ITDTest" ltw=""/>
</ajc-test> </ajc-test>

+ 7
- 0
tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java View File

runTest("E extends Enum(E) again"); runTest("E extends Enum(E) again");
} }
public void testSwallowedException() {
runTest("swallowed exceptions");
}
public void testSwallowedExceptionIgnored() {
runTest("swallowed exceptions with xlint");
}
/* /*
* @AspectJ bugs and enhancements * @AspectJ bugs and enhancements
*/ */

+ 10
- 0
tests/src/org/aspectj/systemtest/ajc151/ajc151.xml View File

</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions">
<compile files="SwallowedException.java">
<message kind="warning" line="11" text="Exception swallowed in catch block"/>
</compile>
</ajc-test>


<ajc-test dir="features151/swallowedExceptions" title="swallowed exceptions with xlint">
<compile files="SwallowedException.java" options="-Xlint:ignore">
</compile>
</ajc-test>
</suite> </suite>

+ 4
- 4
tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml View File

<ajc-test <ajc-test
dir="bugs/interfaceLibrary" dir="bugs/interfaceLibrary"
title="exception clause for aspect-declared interface methods - positive"> title="exception clause for aspect-declared interface methods - positive">
<compile files="Client.java,LibraryAspect.java,lib/LibraryInterface.java"/>
<compile files="Client.java,LibraryAspect.java,lib/LibraryInterface.java" options="-Xlint:ignore"/>
<run class="Client"/> <run class="Client"/>
</ajc-test> </ajc-test>


<ajc-test <ajc-test
dir="bugs/interfaceLibrary" dir="bugs/interfaceLibrary"
title="exception clause for aspect-declared class methods - positive"> title="exception clause for aspect-declared class methods - positive">
<compile files="ClassClient.java,LibraryClassAspect.java,lib/LibraryClass.java"/>
<compile files="ClassClient.java,LibraryClassAspect.java,lib/LibraryClass.java" options="-Xlint:ignore"/>
<run class="ClassClient"/> <run class="ClassClient"/>
</ajc-test> </ajc-test>


<ajc-test dir="bugs/interfaceLibrary" <ajc-test dir="bugs/interfaceLibrary"
pr="41175" pr="41175"
title="exception clause for aspect-declared interface methods - positive binary"> title="exception clause for aspect-declared interface methods - positive binary">
<compile files="Client.java" aspectpath="lib.jar"/>
<compile files="Client.java" aspectpath="lib.jar" options="-Xlint:ignore"/>
<run class="Client"/> <run class="Client"/>
</ajc-test> </ajc-test>


<ajc-test dir="bugs/interfaceLibrary" <ajc-test dir="bugs/interfaceLibrary"
pr="41175" pr="41175"
title="exception clause for aspect-declared class methods - positive binary"> title="exception clause for aspect-declared class methods - positive binary">
<compile files="ClassClient.java" aspectpath="libClass.jar"/>
<compile files="ClassClient.java" aspectpath="libClass.jar" options="-Xlint:ignore"/>
<run class="ClassClient"/> <run class="ClassClient"/>
</ajc-test> </ajc-test>



+ 4
- 2
tests/src/org/aspectj/systemtest/design/designtest.xml View File



<ajc-test dir="design/intro" <ajc-test dir="design/intro"
title="declared exceptions are checked correctly on intros"> title="declared exceptions are checked correctly on intros">
<compile files="ExceptionsCP.java"/>
<compile files="ExceptionsCP.java">
<message kind="warning" line="10" text="Exception swallowed in catch block"/>
</compile>
<run class="ExceptionsCP"/> <run class="ExceptionsCP"/>
</ajc-test> </ajc-test>




<ajc-test dir="design/reflect" title="Checking new joinpoints" <ajc-test dir="design/reflect" title="Checking new joinpoints"
keywords="from-design"> keywords="from-design">
<compile files="Coverage.java"/>
<compile files="Coverage.java" options="-Xlint:ignore"/>
<run class="Coverage"/> <run class="Coverage"/>
</ajc-test> </ajc-test>



+ 1
- 1
tests/src/org/aspectj/systemtest/incremental/model/incremental-model-tests.xml View File

<ajc-test dir="incremental/model/introduction" <ajc-test dir="incremental/model/introduction"
title="Testing incremental structure model: Intertype declarations (and a declare parents)" title="Testing incremental structure model: Intertype declarations (and a declare parents)"
keywords="incremental-test,model-test" > keywords="incremental-test,model-test" >
<compile staging="true" options="-incremental,-emacssym" sourceroots="src"/>
<compile staging="true" options="-incremental,-emacssym -Xlint:ignore" sourceroots="src"/>
<inc-compile tag="20"/> <!-- Just 'touched' one file --> <inc-compile tag="20"/> <!-- Just 'touched' one file -->
<inc-compile tag="30"/> <!-- Just 'touched another aspect --> <inc-compile tag="30"/> <!-- Just 'touched another aspect -->
</ajc-test> </ajc-test>

+ 16
- 13
tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java View File

// Make simple changes to a project, adding a class and an aspect // Make simple changes to a project, adding a class and an aspect
public void testAddingAnAspect() { public void testAddingAnAspect() {
initialiseProject("P1"); initialiseProject("P1");
build("P1");
build("P1"); // build 1, weave 1
alter("P1","inc1"); // adds a class alter("P1","inc1"); // adds a class
alter("P1","inc2"); // adds an aspect alter("P1","inc2"); // adds an aspect
build("P1");
build("P1"); // build 1,
long timeTakenForFullBuildAndWeave = getTimeTakenForBuild(); long timeTakenForFullBuildAndWeave = getTimeTakenForBuild();
checkWasntFullBuild();
checkCompileWeaveCount(2,3);
checkWasFullBuild(); // it *will* be a full build under the new
// "back-to-the-source strategy
checkCompileWeaveCount(5,3); // we compile X and A (the delta) find out that
// an aspect has changed, go back to the source
// and compile X,A,C, then weave them all.
build("P1"); build("P1");
long timeTakenForSimpleIncBuild = getTimeTakenForBuild(); long timeTakenForSimpleIncBuild = getTimeTakenForBuild();
// I don't think this test will have timing issues as the times should be *RADICALLY* different // I don't think this test will have timing issues as the times should be *RADICALLY* different
alter("P1","inc1"); // adds a class alter("P1","inc1"); // adds a class
alter("P1","inc2"); // adds an aspect alter("P1","inc2"); // adds an aspect
build("P1"); build("P1");
checkWasntFullBuild();
checkWasFullBuild(); // adding an aspect makes us go back to the source
} }
checkForError("only abstract aspects can have type parameters"); checkForError("only abstract aspects can have type parameters");
alter("PR125405","inc2"); alter("PR125405","inc2");
build("PR125405"); build("PR125405");
checkCompileWeaveCount(1,1);
checkCompileWeaveCount(2,1);
assertTrue("Should be no errors, but got "+MyTaskListManager.getErrorMessages(),MyTaskListManager.getErrorMessages().size()==0); assertTrue("Should be no errors, but got "+MyTaskListManager.getErrorMessages(),MyTaskListManager.getErrorMessages().size()==0);
} }
build("pr114875"); build("pr114875");
alter("pr114875","inc1"); alter("pr114875","inc1");
build("pr114875"); build("pr114875");
checkWasntFullBuild();
checkWasFullBuild();
alter("pr114875","inc2"); alter("pr114875","inc2");
build("pr114875"); build("pr114875");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source for an aspect change
} }
public void testPr117882() { public void testPr117882() {
checkWasFullBuild(); checkWasFullBuild();
alter("PR117882","inc1"); alter("PR117882","inc1");
build("PR117882"); build("PR117882");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source for an aspect
// AjdeInteractionTestbed.VERBOSE=false; // AjdeInteractionTestbed.VERBOSE=false;
// AjdeInteractionTestbed.configureBuildStructureModel(false); // AjdeInteractionTestbed.configureBuildStructureModel(false);
} }
checkWasFullBuild(); checkWasFullBuild();
alter("PR117882_2","inc1"); alter("PR117882_2","inc1");
build("PR117882_2"); build("PR117882_2");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source...
//checkCompileWeaveCount(1,4); //checkCompileWeaveCount(1,4);
//fullBuild("PR117882_2"); //fullBuild("PR117882_2");
//checkWasFullBuild(); //checkWasFullBuild();
checkWasFullBuild(); checkWasFullBuild();
alter("PR115251","inc1"); alter("PR115251","inc1");
build("PR115251"); build("PR115251");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source
} }


build("PR113257"); build("PR113257");
alter("PR113257","inc1"); alter("PR113257","inc1");
build("PR113257"); build("PR113257");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source
alter("PR113257","inc1"); alter("PR113257","inc1");
build("PR113257"); build("PR113257");
} }
build("PR123612"); build("PR123612");
alter("PR123612","inc1"); alter("PR123612","inc1");
build("PR123612"); build("PR123612");
checkWasntFullBuild();
checkWasFullBuild(); // back to the source
} }
// other possible tests: // other possible tests:

+ 1
- 0
tests/src/org/aspectj/systemtest/pre10x/pre10x-tests.xml View File

<compile files="UndeclaredThrows.java"> <compile files="UndeclaredThrows.java">
<message kind="error" line="12"/> <message kind="error" line="12"/>
<message kind="error" line="18"/> <message kind="error" line="18"/>
<message kind="warning" line="18" text="Exception swallowed in catch block"/>
</compile> </compile>
</ajc-test> </ajc-test>



Loading…
Cancel
Save