From 2d48dabcd089bb3f44a513ed3fd26763806440ae Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 13 Oct 2022 17:24:12 +0200 Subject: [PATCH] Remove LocaleRule / DefaultLocale --- .../net/sourceforge/pmd/junit/LocaleRule.java | 49 ---------------- .../lang/ecmascript/ast/DefaultLocale.java | 56 ------------------- 2 files changed, 105 deletions(-) delete mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/junit/LocaleRule.java delete mode 100644 pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/DefaultLocale.java diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/junit/LocaleRule.java b/pmd-core/src/test/java/net/sourceforge/pmd/junit/LocaleRule.java deleted file mode 100644 index adefc78fb0..0000000000 --- a/pmd-core/src/test/java/net/sourceforge/pmd/junit/LocaleRule.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.junit; - -import java.util.Locale; -import java.util.Objects; - -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; - -/** - * - * Based on digulla/DefaultLocaleRule.java. - * - */ -public class LocaleRule extends TestWatcher { - - private Locale localeForTest; - private Locale originalDefault; - - private LocaleRule(Locale localeForTest) { - this.localeForTest = Objects.requireNonNull(localeForTest); - } - - @Override - protected void starting(Description description) { - originalDefault = Locale.getDefault(); - Locale.setDefault(localeForTest); - } - - @Override - protected void finished(Description description) { - Locale.setDefault(originalDefault); - } - - public void setDefault(Locale newLocale) { - Locale.setDefault(Objects.requireNonNull(newLocale)); - } - - public static LocaleRule en() { - return new LocaleRule(Locale.ENGLISH); - } - - public static LocaleRule de() { - return new LocaleRule(Locale.GERMAN); - } -} diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/DefaultLocale.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/DefaultLocale.java deleted file mode 100644 index e0cb18f4a5..0000000000 --- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/DefaultLocale.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * BSD-style license; for more info see http://pmd.sourceforge.net/license.html - */ - -package net.sourceforge.pmd.lang.ecmascript.ast; - -import java.util.Locale; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -/** - * A JUnit rule to change the system locale during a test. - */ -public class DefaultLocale implements TestRule { - - private boolean statementIsExecuting = false; - private Locale loc = Locale.getDefault(); - - /** Set the locale value (overwrites previously set value). */ - public void set(Locale locale) { - if (statementIsExecuting) { - Locale.setDefault(locale); - } else { - this.loc = locale; - } - } - - @Override - public Statement apply(Statement base, Description description) { - return new EnvironmentVariablesStatement(base); - } - - private class EnvironmentVariablesStatement extends Statement { - - final Statement baseStatement; - - EnvironmentVariablesStatement(Statement baseStatement) { - this.baseStatement = baseStatement; - } - - @Override - public void evaluate() throws Throwable { - Locale prev = Locale.getDefault(); - statementIsExecuting = true; - try { - Locale.setDefault(loc); - baseStatement.evaluate(); - } finally { - statementIsExecuting = false; - Locale.setDefault(prev); - } - } - } -}