From 84c79313dfad8209b2f3492a017539c8d0c7d5c5 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Mon, 8 Apr 2024 14:40:48 +0200 Subject: [PATCH] Adjust OSGiWeavingAdaptorTest to upstream AspectJ change See eclipse-aspectj/aspectj@8c88314. Relates to #57. --- .../weaving/aspectj/tests/OSGiWeavingAdaptorTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/org.eclipse.equinox.weaving.aspectj.tests/src/org/eclipse/equinox/weaving/aspectj/tests/OSGiWeavingAdaptorTest.java b/org.eclipse.equinox.weaving.aspectj.tests/src/org/eclipse/equinox/weaving/aspectj/tests/OSGiWeavingAdaptorTest.java index 3cbfbad4f..8436b65da 100644 --- a/org.eclipse.equinox.weaving.aspectj.tests/src/org/eclipse/equinox/weaving/aspectj/tests/OSGiWeavingAdaptorTest.java +++ b/org.eclipse.equinox.weaving.aspectj.tests/src/org/eclipse/equinox/weaving/aspectj/tests/OSGiWeavingAdaptorTest.java @@ -100,7 +100,11 @@ public void acceptClass(String name, byte[] originalBytes, byte[] weavedBytes) { actualResult.containsKey("my.foo.MyBaseClass$AjcClosure1")); assertTrue("my.foo.MyBaseClass$AjcClosure3 is not contained in " + actualContents, actualResult.containsKey("my.foo.MyBaseClass$AjcClosure3")); - assertEquals("Expected size 4 of result " + actualContents, - 4, actualResult.size()); + assertTrue("my.foo.MyBaseClass is not contained in " + actualContents, + actualResult.containsKey("my.foo.MyBaseClass")); + assertFalse("my.foo.MyClass is contained in " + actualContents, + actualResult.containsKey("my.foo.MyClass")); + assertEquals("Expected size 5 of result " + actualContents, + 5, actualResult.size()); } }