Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix whitespaces and indentation

This commit is contained in:
Benedikt Ritter 2015-05-07 20:49:52 +02:00
parent 3dbf1eedd9
commit 18b3437c15
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/test/java/org/apache/commons/lang3/test/SwitchDefaults.java
View File

@ -58,46 +58,44 @@ import org.junit.runners.model.Statement;
* </pre>
*/
public class SwitchDefaults implements TestRule {
@Override
public Statement apply(Statement stmt, Description description) {
SystemDefaults defaults = description.getAnnotation(SystemDefaults.class);
if(defaults == null) {
return stmt;
}
return applyTimeZone(defaults, applyLocale(defaults, stmt));
@Override
public Statement apply(Statement stmt, Description description) {
SystemDefaults defaults = description.getAnnotation(SystemDefaults.class);
if (defaults == null) {
return stmt;
}
return applyTimeZone(defaults, applyLocale(defaults, stmt));
}
private Statement applyTimeZone(SystemDefaults defaults, final Statement stmt) {
if(defaults.timezone().isEmpty()) {
return stmt;
}
final TimeZone newTimeZone = TimeZone.getTimeZone(defaults.timezone());
private Statement applyTimeZone(SystemDefaults defaults, final Statement stmt) {
if (defaults.timezone().isEmpty()) {
return stmt;
}
final TimeZone newTimeZone = TimeZone.getTimeZone(defaults.timezone());
return new Statement() {
@Override
public void evaluate() throws Throwable {
TimeZone save = TimeZone.getDefault();
TimeZone save = TimeZone.getDefault();
try {
TimeZone.setDefault(newTimeZone);
TimeZone.setDefault(newTimeZone);
stmt.evaluate();
} finally {
TimeZone.setDefault(save);
TimeZone.setDefault(save);
}
}
};
}
};
}
private Statement applyLocale(SystemDefaults defaults, final Statement stmt) {
if (defaults.locale().isEmpty()) {
return stmt;
}
final Locale newLocale = LocaleUtils.toLocale(defaults.locale());
private Statement applyLocale(SystemDefaults defaults, final Statement stmt) {
if(defaults.locale().isEmpty()) {
return stmt;
}
final Locale newLocale = LocaleUtils.toLocale(defaults.locale());
return new Statement() {
@Override
public void evaluate() throws Throwable {
@ -109,7 +107,7 @@ public class SwitchDefaults implements TestRule {
Locale.setDefault(save);
}
}
};
}
};
}
}

16
src/test/java/org/apache/commons/lang3/test/SystemDefaults.java
View File

@ -29,12 +29,12 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface SystemDefaults {
/**
* The name of the Locale to be used while running a test method
*/
String locale() default "";
/**
* The name of the TimeZone to be used while running a test method
*/
String timezone() default "";
/**
* The name of the Locale to be used while running a test method
*/
String locale() default "";
/**
* The name of the TimeZone to be used while running a test method
*/
String timezone() default "";
}