Restore initial locale at the end of a JUnit test case which modify it.

1 files changed, 13 insertions, 4 deletions

diff --git a/test/java/net/yacy/document/TextParserTest.java b/test/java/net/yacy/document/TextParserTest.java
index 2d874d592..6600216f2 100644
--- a/test/java/net/yacy/document/TextParserTest.java
+++ b/test/java/net/yacy/document/TextParserTest.java
@@ -44,11 +44,20 @@ public class TextParserTest {
 	 */
 	@Test
 	public void testSupportsMimeLocaleConsistency() {
-		for (Locale locale : Locale.getAvailableLocales()) {
-			Locale.setDefault(locale);
-			for (String mimeType : TextParser.supportedMimeTypes()) {
-				assertNull(locale + " " + mimeType, TextParser.supportsMime(mimeType.toUpperCase(Locale.ROOT)));
+		Locale initialDefaultLocale = Locale.getDefault();
+		try {
+			for (Locale locale : Locale.getAvailableLocales()) {
+				Locale.setDefault(locale);
+				for (String mimeType : TextParser.supportedMimeTypes()) {
+					assertNull(locale + " " + mimeType, TextParser.supportsMime(mimeType.toUpperCase(Locale.ROOT)));
+				}
 			}
+		} finally {
+			/*
+			 * Restore the initial default locale to prevent side-effects on other JUnit
+			 * tests run in the same session
+			 */
+			Locale.setDefault(initialDefaultLocale);
 		}
 	}