RunSpec: allow '<stdout ordered="no">'

Previously 'ordered="no"' was only permitted for 'stderr'. We need this for tests with asynchronous log output on standard error. Signed-off-by: Alexander Kriegisch <[email protected]>
eclipse-aspectj · Mar 23, 2022 · af0e70f · af0e70f
1 parent 3c80a36
commit af0e70f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/testing/src/test/java/org/aspectj/testing/RunSpec.java b/testing/src/test/java/org/aspectj/testing/RunSpec.java
@@ -36,6 +36,7 @@ public class RunSpec implements ITestStep {
 	private String options;
 	private String cpath;
 	private String mpath;
+	private String orderedStdout;
 	private String orderedStderr;
 	private AjcTest myTest;
 	private OutputSpec stdErrSpec;
@@ -78,7 +79,7 @@ public void execute(AjcTestCase inTestCase) {
 				stdErrSpec.matchAgainst(rr.getStdErr(), orderedStderr);
 			}
 			if (stdOutSpec != null) {
-				stdOutSpec.matchAgainst(rr.getStdOut());
+				stdOutSpec.matchAgainst(rr.getStdOut(), orderedStdout);
 			}
 		} finally {
 			restoreProperties();
@@ -171,6 +172,10 @@ public void setOrderedStderr(String orderedStderr) {
 		this.orderedStderr = orderedStderr;
 	}
 
+	public void setOrderedStdout(String orderedStdout) {
+		this.orderedStdout = orderedStdout;
+	}
+
 	public String getClassToRun() {
 		return classToRun;
 	}

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java
@@ -251,6 +251,7 @@ protected Digester getDigester() {
 		digester.addSetProperties("suite/ajc-test/run", "module", "moduleToRun");
 		digester.addSetProperties("suite/ajc-test/run", "ltw", "ltwFile");
 		digester.addSetProperties("suite/ajc-test/run", "xlintfile", "xlintFile");
+		digester.addSetProperties("suite/ajc-test/run/stdout", "ordered", "orderedStdout");
 		digester.addSetProperties("suite/ajc-test/run/stderr", "ordered", "orderedStderr");
 		digester.addSetNext("suite/ajc-test/run", "addTestStep", "org.aspectj.testing.ITestStep");
 		digester.addObjectCreate("*/message", ExpectedMessageSpec.class);