harness tests upgraded for support for message details, extra source locations

testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java

@@ -30,7 +30,7 @@ public class AbstractRunSpecTest extends TestCase {
 		super(name);
 	}
 
-    public void skiptestXmlWrite() {
+    public void testXmlWrite() {
         AbstractRunSpec spec = new TestSpec();
         spec.setOptions("-option1,-option2");
         spec.setKeywords("keyword1, keyword2");

testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java

@@ -136,7 +136,7 @@ public class AjcSpecTest extends TestCase {
     }
         
     /** @return true if both are empty (null or no entries) or if all match after trimming */
-    public static void sameListSize(List lhs, List rhs, Assert a) {
+    public static void sameListSize(List lhs, List rhs) {
         if (null == lhs) {
             assertTrue((null == rhs) || (0 == rhs.size()));
         } else if (null == rhs) {
@@ -148,7 +148,7 @@ public class AjcSpecTest extends TestCase {
 
     /** @return true if both are empty (null or no entries) or if all match after trimming */
     public static void sameList(List lhs, List rhs, Assert a) {
-        sameListSize(lhs, rhs, a);
+        sameListSize(lhs, rhs);
         String l = normal(lhs);
         String r = normal(rhs);
         String label = l + NOTSAME + r;
@@ -257,7 +257,7 @@ public class AjcSpecTest extends TestCase {
         }
         assertTrue(rhs != null);
         assertTrue(lhs != null);
-        sameListSize(lhs, rhs, a);
+        sameListSize(lhs, rhs);
         Iterator lhsIter = lhs.iterator();
         Iterator rhsIter = rhs.iterator();
         while (lhsIter.hasNext() && rhsIter.hasNext()) {
@@ -302,11 +302,30 @@ public class AjcSpecTest extends TestCase {
         assertTrue(rhs != null);
         assertTrue(lhs.getKind() == rhs.getKind());
         same(lhs.getMessage(), rhs.getMessage(), a);
+        same(lhs.getDetails(), rhs.getDetails(), a);
         assertEquals(lhs.getThrown(), rhs.getThrown());
-        sameSourceLocation(lhs.getSourceLocation(), rhs.getSourceLocation(), a);        
+        sameSourceLocation(lhs.getSourceLocation(), rhs.getSourceLocation());
+        sameSourceLocations(lhs.getExtraSourceLocations(), rhs.getExtraSourceLocations());        
 	}
+    public static void sameSourceLocations(List lhs, List rhs) {
+        sameListSize(lhs, rhs);
+        if ((null == lhs) || (0 == lhs.size())) {
+            return;
+        }
+        // ok, do order-dependent check..
+        ListIterator iterLeft = lhs.listIterator(); 
+        ListIterator iterRight = rhs.listIterator(); 
+        while (iterLeft.hasNext() && iterRight.hasNext()) {
+            ISourceLocation left = (ISourceLocation) iterLeft.next();
+            ISourceLocation right = (ISourceLocation) iterRight.next();
+            sameSourceLocation(left, right);
+        }
+        assertTrue(!iterLeft.hasNext());
+        assertTrue(!iterRight.hasNext());
+        
+    }
 
-	public static void sameSourceLocation(ISourceLocation lhs, ISourceLocation rhs, Assert a) {
+	public static void sameSourceLocation(ISourceLocation lhs, ISourceLocation rhs) {
         if ((null == lhs) && (null == rhs)) {
             return;
         }

testing/testsrc/org/aspectj/testing/xml/MessageListXmlReaderTest.java

@@ -46,9 +46,11 @@ public class MessageListXmlReaderTest extends TestCase {
 			}
 		}
     }
-    /** XXX not in suite until this is fixed */
-    public void testMessageReading() throws Exception { 
-        assertTrue("XXX need better XML wrapping - has < character", false);
+    public void testNothingOthersSkipped() {}
+     
+    public void skiptestMessageReading() throws Exception { 
+        
+        //assertTrue("XXX need better XML wrapping - has < character", false);
         //checkXmlRoundTrip("testdata/dirChangesTestDir/diff/expectedMessages");
         //checkXmlRoundTrip("testdata/dirChangesTestDir/same/expectedMessages");
     }

testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java

@@ -24,6 +24,8 @@ public class TestingXmlTests extends TestCase {
         TestSuite suite = new TestSuite(TestingXmlTests.class.getName());
         //$JUnit-BEGIN$
         suite.addTestSuite(AjcSpecXmlReaderTest.class); 
+        suite.addTestSuite(MessageListXmlReaderTest.class); 
+        suite.addTestSuite(XMLWriterTest.class); 
         //$JUnit-END$
         return suite;
     }