From 300281359851c864b5e677dd35e60f3ee3fb3874 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Fri, 26 Apr 2024 15:49:09 +0300
Subject: [PATCH] Clean up warnings in spring-test

---
 .../groovy/GroovyControlGroupTests.java       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/context/groovy/GroovyControlGroupTests.java b/spring-test/src/test/java/org/springframework/test/context/groovy/GroovyControlGroupTests.java
index 02997ff5bb..75bdc0c37a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/groovy/GroovyControlGroupTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/groovy/GroovyControlGroupTests.java
@@ -20,7 +20,7 @@ import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.testfixture.beans.Employee;
 import org.springframework.beans.testfixture.beans.Pet;
-import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericGroovyApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -42,22 +42,23 @@ class GroovyControlGroupTests {
 
 	@Test
 	void verifyScriptUsingGenericGroovyApplicationContext() {
-		ApplicationContext ctx = new GenericGroovyApplicationContext(getClass(), "context.groovy");
+		try (ConfigurableApplicationContext ctx = new GenericGroovyApplicationContext(getClass(), "context.groovy")) {
+			String foo = ctx.getBean("foo", String.class);
+			assertThat(foo).isEqualTo("Foo");
 
-		String foo = ctx.getBean("foo", String.class);
-		assertThat(foo).isEqualTo("Foo");
+			String bar = ctx.getBean("bar", String.class);
+			assertThat(bar).isEqualTo("Bar");
 
-		String bar = ctx.getBean("bar", String.class);
-		assertThat(bar).isEqualTo("Bar");
+			Pet pet = ctx.getBean(Pet.class);
+			assertThat(pet).as("pet").isNotNull();
+			assertThat(pet.getName()).isEqualTo("Dogbert");
 
-		Pet pet = ctx.getBean(Pet.class);
-		assertThat(pet).as("pet").isNotNull();
-		assertThat(pet.getName()).isEqualTo("Dogbert");
+			Employee employee = ctx.getBean(Employee.class);
+			assertThat(employee).as("employee").isNotNull();
+			assertThat(employee.getName()).isEqualTo("Dilbert");
+			assertThat(employee.getCompany()).isEqualTo("???");
+		}
 
-		Employee employee = ctx.getBean(Employee.class);
-		assertThat(employee).as("employee").isNotNull();
-		assertThat(employee.getName()).isEqualTo("Dilbert");
-		assertThat(employee.getCompany()).isEqualTo("???");
 	}
 
 }