From 37f3f6c11135d0d6cac6ec2511f8d2baefdc8457 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Tue, 21 Nov 2023 07:51:58 +0700 Subject: [PATCH] AjcTaskTest: Be more lenient with aspectjrt version warning Filter out a warning which occurs, if the current release does not match the stored binary in lib/test: bad version number found in aspectjrt.jar expected 1.9.21.M1 found 1.9.20.1 If e.g. we run tests for a milestone release a.b.5.M1 and afterwards switch back to a.b.5-SNAPSHOT, we do not want to update lib/test for a single commit, just to make this test pass. Hence, we ignore this warning here. Signed-off-by: Alexander Kriegisch --- .../org/aspectj/tools/ant/taskdefs/AjcTaskTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java index eefb37ad6..ae67012b9 100644 --- a/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java +++ b/taskdefs/src/test/java/org/aspectj/tools/ant/taskdefs/AjcTaskTest.java @@ -1021,6 +1021,18 @@ private void check( IMessage.Kind kind) { if (num != IGNORE) { int actual = holder.numMessages(kind, false); + + // Filter out a warning which occurs, if the current release does not match the stored binary in lib/test. + // If e.g. we run tests for a milestone release a.b.5.M1 and afterwards switch back to a.b.5-SNAPSHOT, we do not + // want to update lib/test for a single commit, just to make this test pass. Hence, we ignore this warning here. + if (kind.equals(IMessage.WARNING)) { + for (IMessage message : holder.getMessages(kind, false)) { + String warningMessage = message.getMessage(); + if (warningMessage.matches("bad version number found in .*aspectjrt.jar expected .* found .*")) + actual--; + } + } + if (num != actual) { if (actual > 0) { MessageUtil.print(