Merge branch '7.0.x'

This commit is contained in:
Sam Brannen
2026-09-20 16:34:37 +02:00
2 changed files with 4 additions and 2 deletions
@@ -102,7 +102,7 @@ class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests {
@Test
void thisAsInterfaceAndTargetAsClassCounterMatch() {
testBean.doIt();
assertThat(counter.thisAsInterfaceAndTargetAsInterfaceCounter).isEqualTo(1);
assertThat(counter.thisAsInterfaceAndTargetAsClassCounter).isEqualTo(1);
}
@@ -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);
}
}