From f9f8f2d89e260e53911a6681ecb94f193c69b314 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Tue, 22 Nov 2022 16:27:45 +0100
Subject: [PATCH] Polishing

---
 .../DeclarationOrderIndependenceTests.java    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
index 757434be476..1083de70fd0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java
@@ -44,8 +44,8 @@ class DeclarationOrderIndependenceTests {
 	@BeforeEach
 	void setup() {
 		this.ctx = new ClassPathXmlApplicationContext(getClass().getSimpleName() + ".xml", getClass());
-		aspect = (TopsyTurvyAspect) ctx.getBean("topsyTurvyAspect");
-		target = (TopsyTurvyTarget) ctx.getBean("topsyTurvyTarget");
+		aspect = ctx.getBean(TopsyTurvyAspect.class);
+		target = ctx.getBean(TopsyTurvyTarget.class);
 	}
 
 	@AfterEach
@@ -55,19 +55,17 @@ class DeclarationOrderIndependenceTests {
 
 
 	@Test
-	void testTargetIsSerializable() {
-		boolean condition = this.target instanceof Serializable;
-		assertThat(condition).as("target bean is serializable").isTrue();
+	void targetIsSerializable() {
+		assertThat(this.target).isInstanceOf(Serializable.class);
 	}
 
 	@Test
-	void testTargetIsBeanNameAware() {
-		boolean condition = this.target instanceof BeanNameAware;
-		assertThat(condition).as("target bean is bean name aware").isTrue();
+	void targetIsBeanNameAware() {
+		assertThat(this.target).isInstanceOf(BeanNameAware.class);
 	}
 
 	@Test
-	void testBeforeAdviceFiringOk() {
+	void beforeAdviceFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.doSomething();
@@ -75,7 +73,7 @@ class DeclarationOrderIndependenceTests {
 	}
 
 	@Test
-	void testAroundAdviceFiringOk() {
+	void aroundAdviceFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.getX();
@@ -83,7 +81,7 @@ class DeclarationOrderIndependenceTests {
 	}
 
 	@Test
-	void testAfterReturningFiringOk() {
+	void afterReturningFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.getX();