Update for error/warning messages

--- Signed-off-by: Peter Kriens <[email protected]> Signed-off-by: Peter Kriens <[email protected]>
pkriens · Jan 23, 2024 · 0224ff1 · 0224ff1
1 parent bc9ecf9
commit 0224ff1
Show file tree

Hide file tree

Showing 6 changed files with 403 additions and 257 deletions.
diff --git a/aQute.libg/src/aQute/service/reporter/Report.java b/aQute.libg/src/aQute/service/reporter/Report.java
@@ -35,6 +35,17 @@ public Location dup() {
 			l.length = length;
 			return l;
 		}
+
+		public void to(Location l) {
+			l.message = message;
+			l.line = line;
+			l.file = file;
+			l.context = context;
+			l.reference = reference;
+			l.methodName = methodName;
+			l.details = details;
+			l.length = length;
+		}
 	}
 
 	/**

diff --git a/aQute.libg/src/aQute/service/reporter/packageinfo b/aQute.libg/src/aQute/service/reporter/packageinfo
@@ -1 +1 @@
-version 1.2.0
+version 1.3.0
diff --git a/biz.aQute.bnd/test/aQute/bnd/main/TestBndMainBase.java b/biz.aQute.bnd/test/aQute/bnd/main/TestBndMainBase.java
@@ -1,5 +1,7 @@
 package aQute.bnd.main;
 
+import static aQute.libg.re.Catalog.caseInsenstive;
+import static aQute.libg.re.Catalog.lit;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -8,6 +10,8 @@
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -20,11 +24,11 @@
 import aQute.bnd.main.testrules.WatchedTemporaryFolder;
 import aQute.bnd.osgi.About;
 import aQute.bnd.osgi.Jar;
+import aQute.lib.strings.Strings;
+import aQute.libg.re.RE;
 
 public class TestBndMainBase {
 
-	private static final String						WARNING_LINE			= "(?m)^WARNING: .*$";
-
 	@Rule
 	public WatchedFolder							folder					= new WatchedTemporaryFolder();
 
@@ -130,26 +134,52 @@ protected void expectErrorContainsPattern(String regex) {
 			.containsPattern(regex);
 	}
 
+	final static RE	WARNINGS_P	= caseInsenstive(lit("Warnings"));
+	final static RE	ERRORS_P	= caseInsenstive(lit("Errors"));
+	final static RE	SEPARATOR_P	= caseInsenstive(lit("-------"));
+
 	protected void expectNoError(boolean ignoreWarnings, String... expects) {
 		String errors = capturedStdIO.getSystemErrContent();
+		List<String> lines = Strings.split("\\R", errors);
+		boolean skip = false;
+		line: for (Iterator<String> it = lines.iterator(); it.hasNext();) {
+			String line = it.next();
+			if (Strings.nonNullOrEmpty(Strings.trim(line))) {
+				it.remove();
+				continue;
+			}
 
-		if (ignoreWarnings) {
-			errors = errors.replaceAll(WARNING_LINE, "")
-				.trim();
-		}
-		if (expects != null) {
-			for (String expect : expects) {
-				assertThat(capturedStdIO.getSystemErrContent()).as("missing error")
-					.contains(expect);
-				errors = errors.replaceAll(expect, "")
-					.trim();
+			if (SEPARATOR_P.lookingAt(line)
+				.isPresent()) {
+				it.remove();
+				continue;
+			}
+			if (WARNINGS_P.lookingAt(line)
+				.isPresent()) {
+				skip = ignoreWarnings;
+				it.remove();
+				continue;
+			} else if (ERRORS_P.lookingAt(line)
+				.isPresent()) {
+				skip = false;
+				it.remove();
+				continue;
+			}
+			if (expects != null) {
+				for (String expect : expects) {
+					if (skip)
+						continue line;
+					skip = line.contains(expect);
+				}
 			}
+			if (skip)
+				it.remove();
 		}
-		assertEquals("non-empty error output", "", errors);
+		assertThat(lines).isEmpty();
 	}
 
 	protected void expectNoError() {
-		expectNoError(false);
+		expectNoError(true);
 	}
 
 	protected void expectJarEntry(Jar jar, String path) {

diff --git a/biz.aQute.bndlib.tests/test/test/MacroTest.java b/biz.aQute.bndlib.tests/test/test/MacroTest.java
@@ -1276,7 +1276,7 @@ public void testRandom() {
 	@Test
 	public void testSuper() {
 		try (Processor top = new Processor();
-		Processor middle = new Processor(top);
+			Processor middle = new Processor(top);
 			Processor bottom = new Processor(middle)) {
 
 			top.setProperty("a", "top.a");
@@ -1770,35 +1770,13 @@ public void testWarning() {
 			p.setProperty("real", "true");
 			Macro m = new Macro(p);
 
-			m.process("    ${warning;xw;1;2;3 ${three}}");
-			m.process("    ${error;xe;1;2;3 ${three}}");
+			m.process("    ${warning;xw;w1;w2;w3 w${three}}");
+			m.process("    ${error;xe;e1;e2;e3 e${three}}");
 			m.process("    ${if;1;$<a>}");
 
-			assertTrue(p.getWarnings()
-				.get(0)
-				.endsWith("xw"), "xw");
-			assertTrue(p.getWarnings()
-				.get(1)
-				.endsWith("1"), "1");
-			assertTrue(p.getWarnings()
-				.get(2)
-				.endsWith("2"), "2");
-			assertTrue(p.getWarnings()
-				.get(3)
-				.endsWith("3 333"), "3 333");
-
-			assertTrue(p.getErrors()
-				.get(0)
-				.endsWith("xe"), "xw");
-			assertTrue(p.getErrors()
-				.get(1)
-				.endsWith("1"), "1");
-			assertTrue(p.getErrors()
-				.get(2)
-				.endsWith("2"), "2");
-			assertTrue(p.getErrors()
-				.get(3)
-				.endsWith("3 333"), "3 333");
+			assertThat(p.getWarnings()).containsExactly("xw", "w1", "w2", "w3 w333",
+				"No translation found for macro: a");
+			assertThat(p.getErrors()).containsExactly("xe", "e1", "e2", "e3 e333");
 		} catch (IOException e) {
 			fail(e);
 		}
@@ -1919,7 +1897,7 @@ public void testJoin() {
 			assertEquals("aa\nbb\ncc\ndd\nee\nff", m.process("${unescape;${sjoin;\\n;aa,bb,cc;dd,ee,ff}}"));
 		} catch (IOException e) {
 			fail(e);
-	}
+		}
 	}
 
 	@Test