#1881 - Fix flaky test.

odrotbohm · odrotbohm · commit 2e02d7a35196 · 2022-11-16T18:49:20.000+01:00
diff --git a/src/test/java/org/springframework/hateoas/config/HateoasConfigurationIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/HateoasConfigurationIntegrationTest.java
@@ -33,6 +33,8 @@ class HateoasConfigurationIntegrationTest {
 	@Test // #1075
 	void loadsLanguageSpecificResourceBundle() throws Exception {
 
+		var original = (String) ReflectionTestUtils.getField(HateoasConfiguration.class, "I18N_BASE_NAME");
+
 		ReflectionTestUtils.setField(HateoasConfiguration.class, "I18N_BASE_NAME",
 				"org/springframework/hateoas/config/rest-messages");
 
@@ -45,6 +47,9 @@ void loadsLanguageSpecificResourceBundle() throws Exception {
 			MessageResolver resolver = context.getBean(MessageResolver.class);
 
 			assertThat(resolver.resolve(() -> new String[] { "key" })).isEqualTo("Schlüssel");
+
+		} finally {
+			ReflectionTestUtils.setField(HateoasConfiguration.class, "I18N_BASE_NAME", original);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ class HateoasConfigurationIntegrationTest {`
`33`	`33`	`@Test // #1075`
`34`	`34`	`void loadsLanguageSpecificResourceBundle() throws Exception {`
`35`	`35`
	`36`	`+ var original = (String) ReflectionTestUtils.getField(HateoasConfiguration.class, "I18N_BASE_NAME");`
	`37`	`+`
`36`	`38`	`ReflectionTestUtils.setField(HateoasConfiguration.class, "I18N_BASE_NAME",`
`37`	`39`	`"org/springframework/hateoas/config/rest-messages");`
`38`	`40`
`@@ -45,6 +47,9 @@ void loadsLanguageSpecificResourceBundle() throws Exception {`
`45`	`47`	`MessageResolver resolver = context.getBean(MessageResolver.class);`
`46`	`48`
`47`	`49`	`assertThat(resolver.resolve(() -> new String[] { "key" })).isEqualTo("Schlüssel");`
	`50`	`+`
	`51`	`+ } finally {`
	`52`	`+ ReflectionTestUtils.setField(HateoasConfiguration.class, "I18N_BASE_NAME", original);`
`48`	`53`	`}`
`49`	`54`	`}`
`50`	`55`	`}`