no change, just nicer feedback

diff --git a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
index ce3361cca693b3fb90468f3b9a3fd752de89799a..92174397a6e85168b3cb96886c0f8029d6f4c3af 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/CompilerMessagesTest.java
@@ -12,6 +12,8 @@
 
 package org.aspectj.ajde;
 
+import org.aspectj.bridge.MessageUtil;
+
 import java.io.IOException;
 import java.util.List;
 
@@ -38,6 +40,9 @@ public class CompilerMessagesTest extends AjdeTestCase {
                // The build has happened, what messages did the compiler give, and do they
                // contain the information we expect?
                List msgs = NullIdeManager.getIdeManager().getCompilationSourceLineTasks();
+        if (1 != msgs.size()) {
+            assertTrue("not one message: " + msgs, false);
+        }
                assertEquals("One warning message should be produced",1,msgs.size());
                NullIdeTaskListManager.SourceLineTask task = 
                        (NullIdeTaskListManager.SourceLineTask) msgs.get(0);

diff --git a/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java b/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
index 1c5fb1e61bf3d658a7798561ca6fcffc2342703c..625990e3ab4696a3f63975e490b3993570b5ec34 100644 (file)
--- a/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/StructureModelTest.java
@@ -84,7 +84,8 @@ public class StructureModelTest extends AjdeTestCase {
                        testFile.getCanonicalPath());
                assertTrue("find result", node != null) ;       
                ProgramElementNode pNode = (ProgramElementNode)node;
-               assertTrue("found child", ((StructureNode)pNode.getChildren().get(0)).getName().equals("Figure"));
+               String child = ((StructureNode)pNode.getChildren().get(0)).getName();
+        assertTrue("expected Figure got child " + child, child.equals("Figure"));
        }
 
        public void testPointcutName() throws IOException {
@@ -120,7 +121,9 @@ public class StructureModelTest extends AjdeTestCase {
                assertTrue("find result", node != null);        
                        
                ProgramElementNode pNode = (ProgramElementNode)((ProgramElementNode)node).getParent();
-        assertTrue("null parent", pNode != null);    
+        if (null == pNode) {
+            assertTrue("null parent of " + node, false);
+        }
                assertTrue("found node: " + pNode.getName(), pNode.isRunnable());
        }