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

yacy · Nov 20, 2017 · d41ad7a · d41ad7a
1 parent 7206f1e
commit d41ad7a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git 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 initialDefaultLocale = Locale.getDefault();
-			Locale.setDefault(locale);
+		try {
-			for (String mimeType : TextParser.supportedMimeTypes()) {
+			for (Locale locale : Locale.getAvailableLocales()) {
-				assertNull(locale + " " + mimeType, TextParser.supportsMime(mimeType.toUpperCase(Locale.ROOT)));
+				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);
 		}
 	}