Andy Clement's patch for enh 46347: "-inpath"

2 files changed, 9 insertions, 3 deletions

diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
index 024756804..b670ae485 100644
--- a/testing/src/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
@@ -352,6 +352,7 @@ class ProjectProperties implements ProjectPropertiesAdapter {
         = ProjectProperties.class.getName() + ": ";
     final private String outputDir;
     private Set inJars;
+    private Set inpath;
     private Set sourceRoots;
     private Set aspectPath;
     private String outJar;
@@ -363,7 +364,9 @@ class ProjectProperties implements ProjectPropertiesAdapter {
     // known used, per logging proxy
     public String getDefaultBuildConfigFile() { return null; }
     public void setInJars(Set input) { inJars = input; }
+    public void setInpath(Set input) { inpath = input; }
     public Set getInJars( ) { return inJars; }
+    public Set getInpath() { return inpath; }
     public void setSourceRoots(Set input) { sourceRoots = input; }
     public Set getSourceRoots() { return sourceRoots; }
     public void setAspectPath(Set path) { aspectPath = path; }        
diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
index 071193a83..d01f26ddc 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java
@@ -225,19 +225,22 @@ public class AjcMessageHandler extends MessageHandler {
      * @return true if we expect a message of this kind with this line number 
      */
     private boolean expecting(IMessage message) {
+    	boolean match = false;
         if (null != message) {
             for (Iterator iter = expectedMessagesAsList.iterator(); 
                 iter.hasNext();
                 ) {
+            	// amc - we have to compare against all messages to consume multiple
+            	// text matches on same line. Return true if any matches.
                 if (0 == COMP_IMessage.compare(message, iter.next())) {
-                    return true;
+                    match = true;
                 }
             }
         }
-        if (null != diffs) {
+        if (!match) {
             diffs = null;
         }
-        return false;
+        return match;
     }
 
     private IMessage[] getMessagesWithoutExpectedFails() {