Some of the fix for Bugzilla Bug 57432

   NPE when creating declare messages
[Moved the testcase across and added a second one for the variant with debug info]

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 3a86750e5e6907f3b443309e0b4648fddcc1ffa3..3831a626e2d237f5e6f640ca217dc87f200c8eb5 100644 (file)
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7533,5 +7533,39 @@
         </compile>
     </ajc-test>
        
+    <ajc-test dir="bugs/systemouts"
+       pr="57432"
+               title="declare error binary-weaving NPE">
+        <compile files="injar-debug.jar,A.java">
+                       <message kind="error" line="12" file="X.java"/>
+                       <message kind="error" line="13" file="X.java"/>
+                       <message kind="error" line="20" file="X.java"/>
+                       <message kind="error" line="22" file="X.java"/>
+                       <message kind="error" line="23" file="X.java"/>
+                       <message kind="error" line="27" file="X.java"/>
+                       <message kind="error" line="28" file="X.java"/>
+                       <message kind="error" line="29" file="X.java"/>
+                       <message kind="error" line="30" file="X.java"/>
+                       <message kind="error" line="31" file="X.java"/>
+                       <message kind="error" line="32" file="X.java"/>
+                       <message kind="error" line="33" file="X.java"/>
+                       <message kind="error" line="34" file="X.java"/>
+                       <message kind="error" line="35" file="X.java"/>
+                       <message kind="error" line="36" file="X.java"/>
+                       <message kind="error" line="37" file="X.java"/>
+                       <message kind="error" line="38" file="X.java"/>
+                       <message kind="error" line="39" file="X.java"/>
+                       <message kind="error" line="40" file="X.java"/>
+                       <message kind="error" line="41" file="X.java"/>
+        </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs/systemouts"
+       pr="57432"
+               title="declare error binary-weaving NPE">
+        <compile files="injar-nodebug.jar,A.java">
+                       <message kind="error" line="0"/>
+        </compile>
+    </ajc-test>
        
 </suite>

diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index ca3981932a7e4ed4519e44fd0761b25bd8ec3378..c2fb46b054957ea5becf0e41505d18a491820f82 100644 (file)
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -133,31 +133,4 @@
         <run class="InterfaceInitializerOrder"/>
     </ajc-test>
 
-    <ajc-test dir="bugs/systemouts"
-       pr="57432"
-               title="declare error binary-weaving NPE">
-        <compile files="injar.jar,A.java">
-                       <message kind="error" line="12" file="X.java"/>
-                       <message kind="error" line="13" file="X.java"/>
-                       <message kind="error" line="20" file="X.java"/>
-                       <message kind="error" line="22" file="X.java"/>
-                       <message kind="error" line="23" file="X.java"/>
-                       <message kind="error" line="27" file="X.java"/>
-                       <message kind="error" line="28" file="X.java"/>
-                       <message kind="error" line="29" file="X.java"/>
-                       <message kind="error" line="30" file="X.java"/>
-                       <message kind="error" line="31" file="X.java"/>
-                       <message kind="error" line="32" file="X.java"/>
-                       <message kind="error" line="33" file="X.java"/>
-                       <message kind="error" line="34" file="X.java"/>
-                       <message kind="error" line="35" file="X.java"/>
-                       <message kind="error" line="36" file="X.java"/>
-                       <message kind="error" line="37" file="X.java"/>
-                       <message kind="error" line="38" file="X.java"/>
-                       <message kind="error" line="39" file="X.java"/>
-                       <message kind="error" line="40" file="X.java"/>
-                       <message kind="error" line="41" file="X.java"/>
-        </compile>
-    </ajc-test>
-
 </suite>