From 9637d12785a386352b9c6c8e50974762c7041415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EA=B2=BD?= <161710171+xoruddl@users.noreply.github.com> Date: Sun, 20 Sep 2026 23:34:09 +0900 Subject: [PATCH] Fix target-class counter assertions in AOP tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both target-class tests asserted the target-interface counter, leaving the intended pointcut unchecked. Assert the target-class counter in both the XML and @⁠AspectJ variants. Closes gh-37310 Signed-off-by: itaekyung --- .../ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java | 2 +- .../aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index ddc85cf20d9..909b9ba317e 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -102,7 +102,7 @@ class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { @Test void thisAsInterfaceAndTargetAsClassCounterMatch() { testBean.doIt(); - assertThat(counter.thisAsInterfaceAndTargetAsInterfaceCounter).isEqualTo(1); + assertThat(counter.thisAsInterfaceAndTargetAsClassCounter).isEqualTo(1); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index 68cc41bc29b..be46f083a47 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -41,6 +41,7 @@ class ThisAndTargetSelectionOnlyPointcutsTests { private Counter targetAsInterfaceCounter; private Counter thisAsClassAndTargetAsClassCounter; private Counter thisAsInterfaceAndTargetAsInterfaceCounter; + private Counter thisAsInterfaceAndTargetAsClassCounter; @BeforeEach @@ -53,6 +54,7 @@ class ThisAndTargetSelectionOnlyPointcutsTests { targetAsInterfaceCounter = ctx.getBean("targetAsInterfaceCounter", Counter.class); thisAsClassAndTargetAsClassCounter = ctx.getBean("thisAsClassAndTargetAsClassCounter", Counter.class); thisAsInterfaceAndTargetAsInterfaceCounter = ctx.getBean("thisAsInterfaceAndTargetAsInterfaceCounter", Counter.class); + thisAsInterfaceAndTargetAsClassCounter = ctx.getBean("thisAsInterfaceAndTargetAsClassCounter", Counter.class); } @AfterEach @@ -100,7 +102,7 @@ class ThisAndTargetSelectionOnlyPointcutsTests { @Test void thisAsInterfaceAndTargetAsClassCounterMatch() { testBean.doIt(); - assertThat(thisAsInterfaceAndTargetAsInterfaceCounter.getCount()).isEqualTo(1); + assertThat(thisAsInterfaceAndTargetAsClassCounter.getCount()).isEqualTo(1); } }