Polishing

Author: sbrannen

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,35 +55,33 @@ void tearDown() {
 
 
 	@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();
 		assertThat(collab.beforeFired).as("before advice fired").isTrue();
 	}
 
 	@Test
-	void testAroundAdviceFiringOk() {
+	void aroundAdviceFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.getX();
 		assertThat(collab.aroundFired).as("around advice fired").isTrue();
 	}
 
 	@Test
-	void testAfterReturningFiringOk() {
+	void afterReturningFiringOk() {
 		AspectCollaborator collab = new AspectCollaborator();
 		this.aspect.setCollaborator(collab);
 		this.target.getX();