diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bugs153/pr145442/helloworld.jar | bin | 0 -> 1089 bytes | |||
| -rw-r--r-- | tests/features152/synchronization/transformed/expected/C.ma.txt | 4 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java | 7 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/ajc153.xml | 19 |
4 files changed, 20 insertions, 10 deletions
diff --git a/tests/bugs153/pr145442/helloworld.jar b/tests/bugs153/pr145442/helloworld.jar Binary files differnew file mode 100644 index 000000000..17666f197 --- /dev/null +++ b/tests/bugs153/pr145442/helloworld.jar diff --git a/tests/features152/synchronization/transformed/expected/C.ma.txt b/tests/features152/synchronization/transformed/expected/C.ma.txt index 0a6b97849..4d76af4e4 100644 --- a/tests/features152/synchronization/transformed/expected/C.ma.txt +++ b/tests/features152/synchronization/transformed/expected/C.ma.txt @@ -1,13 +1,13 @@ public void ma() org.aspectj.weaver.MethodDeclarationLineNumber: 14:307 : - INVOKESTATIC Two.aspectOf ()LTwo; + INVOKESTATIC Two.aspectOf ()LTwo; (line 15) INVOKEVIRTUAL Two.ajc$before$Two$1$8d8821ee ()V ALOAD_0 DUP ASTORE_1 MONITORENTER finally -> E1 - | GETSTATIC java.lang.System.err Ljava/io/PrintStream; (line 15) + | GETSTATIC java.lang.System.err Ljava/io/PrintStream; | LDC "hello" | INVOKEVIRTUAL java.io.PrintStream.println (Ljava/lang/String;)V | ALOAD_1 diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java index bbe34a79f..9e3da6829 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -24,14 +24,15 @@ import org.aspectj.weaver.bcel.Utility; public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { //public void testGenericsProblem_pr151978() { runTest("generics problem");} - //public void testMissingLineNumbersInStacktraceBefore_pr145442() { runTest("missing line numbers in stacktrace before");} - //public void testMissingLineNumbersInStacktraceAfter_pr145442() { runTest("missing line numbers in stacktrace after");} - //public void testMissingLineNumbersInStacktraceAround_pr145442() { runTest("missing line numbers in stacktrace around");} +// public void testMissingLineNumbersInStacktraceAfter_pr145442() { runTest("missing line numbers in stacktrace after");} +// public void testMissingLineNumbersInStacktraceAround_pr145442() { runTest("missing line numbers in stacktrace around");} // public void testArgnamesAndJavac_pr148381() { runTest("argNames and javac");} // public void testCFlowXMLAspectLTW_pr149096() { runTest("cflow xml concrete aspect"); } // public void testAmbiguousBinding_pr121805() { runTest("ambiguous binding");} // public void testNoIllegalStateExceptionWithGenericInnerAspect_pr156058() { runTest("no IllegalStateException with generic inner aspect"); } // public void testNegatedAnnotationMatchingProblem_pr153464() { runTest("negated annotation matching problem");} + public void testMissingLineNumbersInStacktraceBefore_pr145442() { runTest("missing line numbers in stacktrace before");} + public void testMissingLineNumbersInStacktraceBefore_pr145442_Binary() { runTest("missing line numbers in stacktrace before - binary");} public void testAnnotationStylePointcutNPE_pr158412() { runTest("annotation style pointcut npe"); } public void testAnnotationStylePointcutNPE_pr158412_2() { runTest("annotation style pointcut npe - 2"); } public void testAnnotationsCallConstructors_pr158126() { runTest("annotations, call and constructors problem");} diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml index 38654042b..f65a256a3 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml +++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml @@ -222,8 +222,18 @@ <compile files="hello/HelloWorld.java hello/ThrowExceptionBefore.aj"/> <run class="hello.HelloWorld"> <stderr> - <line text="hello.HelloWorld.println(HelloWorld.java:13)"/> - <!--line text="hello.HelloWorld.println(HelloWorld.java)"/--> + <line text="hello.HelloWorld.println(HelloWorld.java:14)"/> + <line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/> + <line text="hello.HelloWorld.main(HelloWorld.java:41)"/> + </stderr> + </run> + </ajc-test> + + <ajc-test dir="bugs153/pr145442" title="missing line numbers in stacktrace before - binary"> + <compile inpath="helloworld.jar" files="hello/ThrowExceptionBefore.aj"/> + <run class="hello.HelloWorld"> + <stderr> + <line text="hello.HelloWorld.println(HelloWorld.java:14)"/> <line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/> <line text="hello.HelloWorld.main(HelloWorld.java:41)"/> </stderr> @@ -234,7 +244,7 @@ <compile files="hello/HelloWorld.java hello/ThrowExceptionAfter.aj"/> <run class="hello.HelloWorld"> <stderr> - <line text="hello.HelloWorld.println(HelloWorld.java:15)"/> + <line text="hello.HelloWorld.println(HelloWorld.java:14)"/> <line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/> <line text="hello.HelloWorld.main(HelloWorld.java:41)"/> </stderr> @@ -245,8 +255,7 @@ <compile files="hello/HelloWorld.java hello/ThrowExceptionAround.aj" options="-XnoInline"/> <run class="hello.HelloWorld"> <stderr> - <line text="hello.HelloWorld.println(HelloWorld.java:13)"/> - <!--line text="hello.HelloWorld.println(HelloWorld.java:1)"/--> + <line text="hello.HelloWorld.println(HelloWorld.java:14)"/> <line text="hello.HelloWorld.testStackTrace(HelloWorld.java:19)"/> <line text="hello.HelloWorld.main(HelloWorld.java:41)"/> </stderr> |