freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/3] incubator-freemarker git commit: Set up Eclipse and IntelliJ IDEA to organize imports on the same way (so that they don't fight each other, generating unnecessary diffs on commit)
Date Sun, 26 Feb 2017 21:40:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/InvalidFormatStringException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/InvalidFormatStringException.java b/src/main/java/org/apache/freemarker/core/valueformat/InvalidFormatStringException.java
index 091d55c..38ec934 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/InvalidFormatStringException.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/InvalidFormatStringException.java
@@ -18,10 +18,6 @@
  */
 package org.apache.freemarker.core.valueformat;
 
-import org.apache.freemarker.core.valueformat.TemplateDateFormat;
-import org.apache.freemarker.core.valueformat.TemplateNumberFormat;
-import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
-
 /**
  * Used when creating {@link TemplateDateFormat}-s and {@link TemplateNumberFormat}-s to indicate that the format
  * string (like the value of the {@code dateFormat} setting) is malformed.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/ParsingNotSupportedException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/ParsingNotSupportedException.java b/src/main/java/org/apache/freemarker/core/valueformat/ParsingNotSupportedException.java
index 8700c88..91dbb03 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/ParsingNotSupportedException.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/ParsingNotSupportedException.java
@@ -19,9 +19,6 @@
 
 package org.apache.freemarker.core.valueformat;
 
-import org.apache.freemarker.core.valueformat.TemplateValueFormat;
-import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
-
 /**
  * Thrown when the {@link TemplateValueFormat} doesn't support parsing, and parsing was invoked.
  * 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
index 2abbaa9..bb30c71 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateDateFormatFactory.java
@@ -23,7 +23,9 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import org.apache.freemarker.core.*;
+import org.apache.freemarker.core.Configurable;
+import org.apache.freemarker.core.Configuration;
+import org.apache.freemarker.core.Environment;
 import org.apache.freemarker.core.model.TemplateDateModel;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/TemplateFormatUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateFormatUtil.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateFormatUtil.java
index 0cff2fe..f5e17cf 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateFormatUtil.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateFormatUtil.java
@@ -18,14 +18,14 @@
  */
 package org.apache.freemarker.core.valueformat;
 
+import java.util.Date;
+
 import org.apache.freemarker.core._EvalUtil;
 import org.apache.freemarker.core.model.ObjectWrapper;
 import org.apache.freemarker.core.model.TemplateDateModel;
 import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.model.TemplateNumberModel;
 
-import java.util.Date;
-
 /**
  * Utility classes for implementing {@link TemplateValueFormat}-s.
  * 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormat.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormat.java
index de454c9..c8dc272 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormat.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormat.java
@@ -20,8 +20,8 @@ package org.apache.freemarker.core.valueformat;
 
 import java.text.NumberFormat;
 
-import org.apache.freemarker.core.arithmetic.ArithmeticEngine;
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.arithmetic.ArithmeticEngine;
 import org.apache.freemarker.core.model.TemplateDateModel;
 import org.apache.freemarker.core.model.TemplateMarkupOutputModel;
 import org.apache.freemarker.core.model.TemplateModelException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
index e2ae8c2..7a1657f 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/TemplateNumberFormatFactory.java
@@ -18,12 +18,12 @@
  */
 package org.apache.freemarker.core.valueformat;
 
+import java.util.Locale;
+
 import org.apache.freemarker.core.Configurable;
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Environment;
 
-import java.util.Locale;
-
 /**
  * Factory for a certain kind of number formatting ({@link TemplateNumberFormat}). Usually a singleton (one-per-VM or
  * one-per-{@link Configuration}), and so must be thread-safe.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/UnparsableValueException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/UnparsableValueException.java b/src/main/java/org/apache/freemarker/core/valueformat/UnparsableValueException.java
index 8dc6ab1..11374e9 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/UnparsableValueException.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/UnparsableValueException.java
@@ -19,9 +19,6 @@
 
 package org.apache.freemarker.core.valueformat;
 
-import org.apache.freemarker.core.valueformat.TemplateValueFormat;
-import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
-
 /**
  * Thrown when the content of the string that should be parsed by the {@link TemplateValueFormat} doesn't match what the
  * format expects.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateDateFormatFactory.java
index aefb252..c968e6b 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateDateFormatFactory.java
@@ -23,11 +23,11 @@ import java.util.Map;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
-import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.util._LocaleUtil;
 import org.apache.freemarker.core.util._StringUtil;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
+import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateNumberFormatFactory.java
index 6e72a61..bfe2d75 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateNumberFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/AliasTemplateNumberFormatFactory.java
@@ -22,9 +22,9 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.apache.freemarker.core.Environment;
-import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.util._LocaleUtil;
 import org.apache.freemarker.core.util._StringUtil;
+import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormat;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.valueformat.TemplateValueFormatException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOLikeTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOLikeTemplateDateFormat.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOLikeTemplateDateFormat.java
index 05a4d91..86c94ff 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOLikeTemplateDateFormat.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOLikeTemplateDateFormat.java
@@ -23,7 +23,6 @@ import java.util.Date;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
-import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.model.TemplateDateModel;
 import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.util.BugException;
@@ -32,13 +31,14 @@ import org.apache.freemarker.core.util._DateUtil.CalendarFieldsToDateConverter;
 import org.apache.freemarker.core.util._DateUtil.DateParseException;
 import org.apache.freemarker.core.util._DateUtil.DateToISO8601CalendarFactory;
 import org.apache.freemarker.core.util._StringUtil;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
+import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 abstract class ISOLikeTemplateDateFormat  extends TemplateDateFormat {
     
     private static final String XS_LESS_THAN_SECONDS_ACCURACY_ERROR_MESSAGE

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOTemplateDateFormatFactory.java
index d25e754..bf8551f 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOTemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/ISOTemplateDateFormatFactory.java
@@ -19,14 +19,14 @@
 
 package org.apache.freemarker.core.valueformat.impl;
 
+import java.util.Locale;
+import java.util.TimeZone;
+
 import org.apache.freemarker.core.Environment;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 
-import java.util.Locale;
-import java.util.TimeZone;
-
 /**
  * Creates {@link TemplateDateFormat}-s that follows ISO 8601 extended format that is also compatible with the XML
  * Schema format (as far as you don't have dates in the BC era). Examples of possible outputs: {@code

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateDateFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateDateFormat.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateDateFormat.java
index 99ad68c..3ab9685 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateDateFormat.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateDateFormat.java
@@ -24,10 +24,10 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.model.TemplateDateModel;
 import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
+import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateNumberFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateNumberFormat.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateNumberFormat.java
index 26ee41c..e34c47b 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateNumberFormat.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/JavaTemplateNumberFormat.java
@@ -20,9 +20,9 @@ package org.apache.freemarker.core.valueformat.impl;
 
 import java.text.NumberFormat;
 
-import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.model.TemplateNumberModel;
+import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormat;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/core/valueformat/impl/XSTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/XSTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/valueformat/impl/XSTemplateDateFormatFactory.java
index e9caa40..5dd0cac 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/XSTemplateDateFormatFactory.java
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/XSTemplateDateFormatFactory.java
@@ -19,14 +19,14 @@
 
 package org.apache.freemarker.core.valueformat.impl;
 
+import java.util.Locale;
+import java.util.TimeZone;
+
 import org.apache.freemarker.core.Environment;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 
-import java.util.Locale;
-import java.util.TimeZone;
-
 /**
  * Creates {@link TemplateDateFormat}-s that follows the W3C XML Schema date, time and dateTime syntax.
  */

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/dom/DomStringUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/dom/DomStringUtil.java b/src/main/java/org/apache/freemarker/dom/DomStringUtil.java
index 58d9d32..fd2e6b7 100644
--- a/src/main/java/org/apache/freemarker/dom/DomStringUtil.java
+++ b/src/main/java/org/apache/freemarker/dom/DomStringUtil.java
@@ -19,9 +19,6 @@
 
 package org.apache.freemarker.dom;
 
-import org.apache.freemarker.core.Environment;
-import org.apache.freemarker.core.Template;
-
 /**
  * For internal use only; don't depend on this, there's no backward compatibility guarantee at all!
  * This class is to work around the lack of module system in Java, i.e., so that other FreeMarker packages can

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/java/org/apache/freemarker/dom/NodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/dom/NodeModel.java b/src/main/java/org/apache/freemarker/dom/NodeModel.java
index 5077285..78457a1 100644
--- a/src/main/java/org/apache/freemarker/dom/NodeModel.java
+++ b/src/main/java/org/apache/freemarker/dom/NodeModel.java
@@ -27,7 +27,6 @@ import java.util.Map;
 import java.util.WeakHashMap;
 
 import org.apache.freemarker.core.Configuration;
-import org.apache.freemarker.core._CoreLogs;
 import org.apache.freemarker.core._UnexpectedTypeErrorExplainerTemplateModel;
 import org.apache.freemarker.core.model.AdapterTemplateModel;
 import org.apache.freemarker.core.model.TemplateBooleanModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java b/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
index 3c4a726..f8e2a32 100644
--- a/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
+++ b/src/main/misc/identifierChars/src/main/freemarker/adhoc/IdentifierCharGenerator.java
@@ -21,7 +21,6 @@ package freemarker.adhoc;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.function.Predicate;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java b/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java
index efaa828..4782823 100644
--- a/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java
+++ b/src/test/java/org/apache/freemarker/core/ActualNamingConvetionTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java b/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java
index a3dfa35..88a4995 100644
--- a/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java
+++ b/src/test/java/org/apache/freemarker/core/ActualTagSyntaxTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/CamelCaseTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/CamelCaseTest.java b/src/test/java/org/apache/freemarker/core/CamelCaseTest.java
index bf52222..1545dc5 100644
--- a/src/test/java/org/apache/freemarker/core/CamelCaseTest.java
+++ b/src/test/java/org/apache/freemarker/core/CamelCaseTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ConfigurableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ConfigurableTest.java b/src/test/java/org/apache/freemarker/core/ConfigurableTest.java
index 1af878d..055de21 100644
--- a/src/test/java/org/apache/freemarker/core/ConfigurableTest.java
+++ b/src/test/java/org/apache/freemarker/core/ConfigurableTest.java
@@ -19,12 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.lang.reflect.Field;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ConfigurationTest.java b/src/test/java/org/apache/freemarker/core/ConfigurationTest.java
index 89fd456..8413770 100644
--- a/src/test/java/org/apache/freemarker/core/ConfigurationTest.java
+++ b/src/test/java/org/apache/freemarker/core/ConfigurationTest.java
@@ -19,17 +19,9 @@
 
 package org.apache.freemarker.core;
 
-import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.isIn;
-import static org.hamcrest.Matchers.lessThan;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.apache.freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java b/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java
index d8ae7ae..3993c1e 100644
--- a/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java
+++ b/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 import java.util.Locale;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java b/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java
index 90cef85..d42c404 100644
--- a/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java
+++ b/src/test/java/org/apache/freemarker/core/CustomAttributeTest.java
@@ -19,11 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.math.BigDecimal;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/DateFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/DateFormatTest.java b/src/test/java/org/apache/freemarker/core/DateFormatTest.java
index 8bcca28..ffa7c84 100644
--- a/src/test/java/org/apache/freemarker/core/DateFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/DateFormatTest.java
@@ -18,10 +18,8 @@
  */
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.sql.Time;
@@ -41,10 +39,10 @@ import org.apache.freemarker.core.userpkg.EpochMillisDivTemplateDateFormatFactor
 import org.apache.freemarker.core.userpkg.EpochMillisTemplateDateFormatFactory;
 import org.apache.freemarker.core.userpkg.HTMLISOTemplateDateFormatFactory;
 import org.apache.freemarker.core.userpkg.LocAndTZSensitiveTemplateDateFormatFactory;
-import org.apache.freemarker.core.valueformat.impl.AliasTemplateDateFormatFactory;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
 import org.apache.freemarker.core.valueformat.UndefinedCustomFormatException;
+import org.apache.freemarker.core.valueformat.impl.AliasTemplateDateFormatFactory;
 import org.apache.freemarker.test.TemplateTest;
 import org.junit.Before;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java b/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java
index efb64ec..050ec80 100644
--- a/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java
+++ b/src/test/java/org/apache/freemarker/core/EncodingOverrideTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java b/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java
index d4ed869..d642baa 100644
--- a/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java
+++ b/src/test/java/org/apache/freemarker/core/EnvironmentCustomStateTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java b/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java
index 30a49ed..3e720c1 100644
--- a/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java
+++ b/src/test/java/org/apache/freemarker/core/EnvironmentGetTemplateVariantsTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.Writer;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ExceptionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ExceptionTest.java b/src/test/java/org/apache/freemarker/core/ExceptionTest.java
index c9e66e8..2e8bdd1 100644
--- a/src/test/java/org/apache/freemarker/core/ExceptionTest.java
+++ b/src/test/java/org/apache/freemarker/core/ExceptionTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/GetSourceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/GetSourceTest.java b/src/test/java/org/apache/freemarker/core/GetSourceTest.java
index ef2783b..5039fc1 100644
--- a/src/test/java/org/apache/freemarker/core/GetSourceTest.java
+++ b/src/test/java/org/apache/freemarker/core/GetSourceTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java b/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java
index 49e8577..2d69fd7 100644
--- a/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java
+++ b/src/test/java/org/apache/freemarker/core/IncludeAndImportConfigurableLayersTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.StringWriter;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java b/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java
index 1faa16f..f619316 100644
--- a/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java
+++ b/src/test/java/org/apache/freemarker/core/IncludeAndImportTest.java
@@ -18,11 +18,8 @@
  */
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java b/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java
index 5b518a1..5cf6057 100644
--- a/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java
+++ b/src/test/java/org/apache/freemarker/core/JavaCCExceptionAsEOFFixTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.Reader;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/MistakenlyPublicImportAPIsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/MistakenlyPublicImportAPIsTest.java b/src/test/java/org/apache/freemarker/core/MistakenlyPublicImportAPIsTest.java
index 0b9e0b6..813ae0e 100644
--- a/src/test/java/org/apache/freemarker/core/MistakenlyPublicImportAPIsTest.java
+++ b/src/test/java/org/apache/freemarker/core/MistakenlyPublicImportAPIsTest.java
@@ -19,10 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/MistakenlyPublicMacroAPIsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/MistakenlyPublicMacroAPIsTest.java b/src/test/java/org/apache/freemarker/core/MistakenlyPublicMacroAPIsTest.java
index 0445789..7e1482a 100644
--- a/src/test/java/org/apache/freemarker/core/MistakenlyPublicMacroAPIsTest.java
+++ b/src/test/java/org/apache/freemarker/core/MistakenlyPublicMacroAPIsTest.java
@@ -19,9 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java b/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java
index 7b21b54..5a702d4 100644
--- a/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java
+++ b/src/test/java/org/apache/freemarker/core/ObjectBuilderSettingsTest.java
@@ -19,17 +19,9 @@
 
 package org.apache.freemarker.core;
 
-import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.apache.freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java b/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java
index eb515e6..1bec5d1 100644
--- a/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/OptInTemplateClassResolverTest.java
@@ -24,9 +24,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.freemarker.core.util.OptInTemplateClassResolver;
+
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
-import org.apache.freemarker.core.util.OptInTemplateClassResolver;
 
 public class OptInTemplateClassResolverTest extends TestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/OutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/OutputFormatTest.java b/src/test/java/org/apache/freemarker/core/OutputFormatTest.java
index 6856c3c..d5f32f1 100644
--- a/src/test/java/org/apache/freemarker/core/OutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/OutputFormatTest.java
@@ -18,10 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java
index 6044a7a..891a046 100644
--- a/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java
+++ b/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java b/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java
index ef558c5..7adff82 100644
--- a/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java
+++ b/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java
@@ -19,8 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 import java.sql.Time;
 import java.sql.Timestamp;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java b/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java
index f21adf6..6aec8c9 100644
--- a/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java
+++ b/src/test/java/org/apache/freemarker/core/SettingDirectiveTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/SimpleObjectWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/SimpleObjectWrapperTest.java b/src/test/java/org/apache/freemarker/core/SimpleObjectWrapperTest.java
index 1a84982..a5f5a04 100644
--- a/src/test/java/org/apache/freemarker/core/SimpleObjectWrapperTest.java
+++ b/src/test/java/org/apache/freemarker/core/SimpleObjectWrapperTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.*;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
+
 import javax.annotation.PostConstruct;
 
 import org.apache.freemarker.core.model.TemplateBooleanModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/SimpleObjetWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/SimpleObjetWrapperTest.java b/src/test/java/org/apache/freemarker/core/SimpleObjetWrapperTest.java
index b746cfa..b13c53c 100644
--- a/src/test/java/org/apache/freemarker/core/SimpleObjetWrapperTest.java
+++ b/src/test/java/org/apache/freemarker/core/SimpleObjetWrapperTest.java
@@ -19,11 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -37,7 +34,16 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.freemarker.core.model.*;
+import org.apache.freemarker.core.model.TemplateBooleanModel;
+import org.apache.freemarker.core.model.TemplateCollectionModel;
+import org.apache.freemarker.core.model.TemplateCollectionModelEx;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateHashModelEx2;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.model.TemplateModelWithAPISupport;
+import org.apache.freemarker.core.model.TemplateNumberModel;
+import org.apache.freemarker.core.model.TemplateScalarModel;
+import org.apache.freemarker.core.model.TemplateSequenceModel;
 import org.apache.freemarker.core.model.impl.SimpleObjectWrapper;
 import org.junit.Test;
 import org.w3c.dom.Document;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java b/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java
index 7fcc8ae..2d2b1ba 100644
--- a/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java
+++ b/src/test/java/org/apache/freemarker/core/SpecialVariableTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat;
 import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TabSizeTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TabSizeTest.java b/src/test/java/org/apache/freemarker/core/TabSizeTest.java
index e2fc6de..3e486ca 100644
--- a/src/test/java/org/apache/freemarker/core/TabSizeTest.java
+++ b/src/test/java/org/apache/freemarker/core/TabSizeTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java
index d27b1a6..6ef95d7 100644
--- a/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplatGetEncodingTest.java
@@ -18,10 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java b/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java
index 825e92d..685e81a 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateConfigurationTest.java
@@ -18,15 +18,8 @@
  */
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java b/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java
index 270219f..8ab9112 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateConfigurationWithTemplateResolverTest.java
@@ -18,8 +18,7 @@
  */
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java b/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java
index 2677d39..0cf563d 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateConstructorsTest.java
@@ -19,11 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.Reader;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateLanguageVersionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateLanguageVersionTest.java b/src/test/java/org/apache/freemarker/core/TemplateLanguageVersionTest.java
index 1c8217a..12e2e4a 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateLanguageVersionTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateLanguageVersionTest.java
@@ -19,10 +19,8 @@
 
 package org.apache.freemarker.core;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java b/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java
index f493733..da63507 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateLevelSettings.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java b/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
index a05b5f8..83b80e5 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateLookupStrategyTest.java
@@ -19,11 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java b/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
index cd6a0a3..ca80efc 100644
--- a/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
+++ b/src/test/java/org/apache/freemarker/core/TemplateNotFoundMessageTest.java
@@ -19,12 +19,9 @@
 
 package org.apache.freemarker.core;
 
-import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.apache.freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java
index 5517630..33d97f1 100644
--- a/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java
+++ b/src/test/java/org/apache/freemarker/core/TheadInterruptingSupportTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/VersionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/VersionTest.java b/src/test/java/org/apache/freemarker/core/VersionTest.java
index 2ae4dcd..22ea454 100644
--- a/src/test/java/org/apache/freemarker/core/VersionTest.java
+++ b/src/test/java/org/apache/freemarker/core/VersionTest.java
@@ -19,11 +19,7 @@
 
 package org.apache.freemarker.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.sql.Date;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java
index e97e1f9..1bc49e2 100644
--- a/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/XHTMLOutputFormatTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.freemarker.core;
 
-import static org.apache.freemarker.core.outputformat.impl.XHTMLOutputFormat.INSTANCE;
-import static org.junit.Assert.assertEquals;
+import static org.apache.freemarker.core.outputformat.impl.XHTMLOutputFormat.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/XMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/XMLOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/XMLOutputFormatTest.java
index 22438a5..916193b 100644
--- a/src/test/java/org/apache/freemarker/core/XMLOutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/XMLOutputFormatTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.freemarker.core;
 
-import static org.apache.freemarker.core.outputformat.impl.XMLOutputFormat.INSTANCE;
-import static org.junit.Assert.assertEquals;
+import static org.apache.freemarker.core.outputformat.impl.XMLOutputFormat.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java
index ccda098..48099a7 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperTest.java
@@ -19,18 +19,9 @@
 
 package org.apache.freemarker.core.model.impl;
 
-import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.apache.freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -53,7 +44,11 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.freemarker.core.*;
+import org.apache.freemarker.core.Configuration;
+import org.apache.freemarker.core.Template;
+import org.apache.freemarker.core.TemplateException;
+import org.apache.freemarker.core.Version;
+import org.apache.freemarker.core._CoreAPI;
 import org.apache.freemarker.core.model.AdapterTemplateModel;
 import org.apache.freemarker.core.model.ObjectWrapper;
 import org.apache.freemarker.core.model.TemplateBooleanModel;
@@ -72,7 +67,6 @@ import org.apache.freemarker.core.model.TemplateScalarModel;
 import org.apache.freemarker.core.model.TemplateSequenceModel;
 import org.apache.freemarker.core.model.WrapperTemplateModel;
 import org.apache.freemarker.core.model.WrappingTemplateModel;
-import org.apache.freemarker.core.model.impl.beans.BeansWrapper;
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBasics.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBasics.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBasics.java
index b1b4a60..bc6b8d7 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBasics.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBasics.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.model.TemplateModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
index f0f3f21..8221a36 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
@@ -19,9 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.lang.ref.Reference;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperMiscTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperMiscTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperMiscTest.java
index 0e2df93..fd20bd6 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperMiscTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperMiscTest.java
@@ -19,11 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.model.TemplateBooleanModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperSingletonsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperSingletonsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperSingletonsTest.java
index 20abf41..027e6f2 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperSingletonsTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperSingletonsTest.java
@@ -19,9 +19,8 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.lang.ref.Reference;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java
index c18b049..90421c9 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/EnumModelsTest.java
@@ -19,13 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/ErrorMessagesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/ErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/ErrorMessagesTest.java
index 140b467..61a2612 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/ErrorMessagesTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/ErrorMessagesTest.java
@@ -18,13 +18,9 @@
  */
 
 package org.apache.freemarker.core.model.impl.beans;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.util.Collections;
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/FineTuneMethodAppearanceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/FineTuneMethodAppearanceTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/FineTuneMethodAppearanceTest.java
index fc828d8..d21e116 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/FineTuneMethodAppearanceTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/FineTuneMethodAppearanceTest.java
@@ -19,8 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.model.TemplateHashModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/ModelCacheTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/ModelCacheTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/ModelCacheTest.java
index 2f179e9..7d4a020 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/ModelCacheTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/ModelCacheTest.java
@@ -19,10 +19,7 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.model.TemplateModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/model/impl/beans/StaticModelsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/StaticModelsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/StaticModelsTest.java
index a6b82b6..35e9e7a 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/StaticModelsTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/StaticModelsTest.java
@@ -19,14 +19,8 @@
 
 package org.apache.freemarker.core.model.impl.beans;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormatTest.java
index 2f633c1..9d43712 100644
--- a/src/test/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormatTest.java
@@ -18,9 +18,7 @@
  */
 package org.apache.freemarker.core.outputformat.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormatTest.java
index a06b11d..79da001 100644
--- a/src/test/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormatTest.java
@@ -18,12 +18,8 @@
  */
 package org.apache.freemarker.core.outputformat.impl;
 
-import static org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat.INSTANCE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormatTest.java b/src/test/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormatTest.java
index 3f3d626..2c9b7ab 100644
--- a/src/test/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormatTest.java
@@ -18,10 +18,8 @@
  */
 package org.apache.freemarker.core.outputformat.impl;
 
-import static org.apache.freemarker.core.outputformat.impl.RTFOutputFormat.INSTANCE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.apache.freemarker.core.outputformat.impl.RTFOutputFormat.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.StringWriter;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
index c6490e5..7215e09 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java
@@ -19,11 +19,7 @@
 
 package org.apache.freemarker.core.templateresolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
index b11e0c7..369cef0 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/FileTemplateLoaderTest.java
@@ -18,12 +18,8 @@
  */
 package org.apache.freemarker.core.templateresolver;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
index 48560bc..79155b0 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java
@@ -18,9 +18,7 @@
  */
 package org.apache.freemarker.core.templateresolver;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryTest.java
index 926379e..d7a5daa 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryTest.java
@@ -18,12 +18,8 @@
  */
 package org.apache.freemarker.core.templateresolver;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
index 3d5151e..a8b2acf 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java
@@ -19,11 +19,9 @@
 
 package org.apache.freemarker.core.templateresolver;
 
-import static org.apache.freemarker.test.hamcerst.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.apache.freemarker.test.hamcerst.Matchers.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Locale;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java
index fe7e8ae..a24d2a3 100644
--- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java
+++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java
@@ -18,9 +18,7 @@
  */
 package org.apache.freemarker.core.templateresolver;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/AppMetaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/AppMetaTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/AppMetaTemplateDateFormatFactory.java
index 4e82c71..1a1b6b1 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/AppMetaTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/AppMetaTemplateDateFormatFactory.java
@@ -23,6 +23,8 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
@@ -30,8 +32,6 @@ import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
-import org.apache.freemarker.core.model.TemplateDateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
 
 public class AppMetaTemplateDateFormatFactory extends TemplateDateFormatFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/BaseNTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/BaseNTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/BaseNTemplateNumberFormatFactory.java
index 83e6116..eeae0ae 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/BaseNTemplateNumberFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/BaseNTemplateNumberFormatFactory.java
@@ -21,16 +21,16 @@ package org.apache.freemarker.core.userpkg;
 import java.util.Locale;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.model.TemplateNumberModel;
+import org.apache.freemarker.core.util._NumberUtil;
+import org.apache.freemarker.core.util._StringUtil;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormat;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateNumberModel;
-import org.apache.freemarker.core.util._NumberUtil;
-import org.apache.freemarker.core.util._StringUtil;
 
 /**
  * Shows a number in base N number system. Can only format numbers that fit into an {@code int},

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisDivTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisDivTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisDivTemplateDateFormatFactory.java
index 3404729..cd2bd99 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisDivTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisDivTemplateDateFormatFactory.java
@@ -23,6 +23,9 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.util._StringUtil;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
@@ -30,9 +33,6 @@ import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
-import org.apache.freemarker.core.model.TemplateDateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.util._StringUtil;
 
 public class EpochMillisDivTemplateDateFormatFactory extends TemplateDateFormatFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisTemplateDateFormatFactory.java
index 4948722..2d456e7 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/EpochMillisTemplateDateFormatFactory.java
@@ -23,14 +23,14 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
 import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
-import org.apache.freemarker.core.model.TemplateDateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
 
 public class EpochMillisTemplateDateFormatFactory extends TemplateDateFormatFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/HTMLISOTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/HTMLISOTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/HTMLISOTemplateDateFormatFactory.java
index 6e61053..24a790d 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/HTMLISOTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/HTMLISOTemplateDateFormatFactory.java
@@ -23,6 +23,12 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat;
+import org.apache.freemarker.core.util._DateUtil;
+import org.apache.freemarker.core.util._DateUtil.CalendarFieldsToDateConverter;
+import org.apache.freemarker.core.util._DateUtil.DateParseException;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
@@ -31,12 +37,6 @@ import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
-import org.apache.freemarker.core.model.TemplateDateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat;
-import org.apache.freemarker.core.util._DateUtil;
-import org.apache.freemarker.core.util._DateUtil.CalendarFieldsToDateConverter;
-import org.apache.freemarker.core.util._DateUtil.DateParseException;
 
 public class HTMLISOTemplateDateFormatFactory extends TemplateDateFormatFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/HexTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/HexTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/HexTemplateNumberFormatFactory.java
index 565eedd..0d1a3a8 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/HexTemplateNumberFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/HexTemplateNumberFormatFactory.java
@@ -21,14 +21,14 @@ package org.apache.freemarker.core.userpkg;
 import java.util.Locale;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.model.TemplateNumberModel;
+import org.apache.freemarker.core.util._NumberUtil;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormat;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateNumberModel;
-import org.apache.freemarker.core.util._NumberUtil;
 
 public class HexTemplateNumberFormatFactory extends TemplateNumberFormatFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/LocAndTZSensitiveTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/LocAndTZSensitiveTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/userpkg/LocAndTZSensitiveTemplateDateFormatFactory.java
index f8f419d..abe3e14 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/LocAndTZSensitiveTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/LocAndTZSensitiveTemplateDateFormatFactory.java
@@ -23,6 +23,8 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.model.TemplateDateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
 import org.apache.freemarker.core.valueformat.InvalidFormatParametersException;
 import org.apache.freemarker.core.valueformat.TemplateDateFormat;
 import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
@@ -30,8 +32,6 @@ import org.apache.freemarker.core.valueformat.TemplateFormatUtil;
 import org.apache.freemarker.core.valueformat.UnformattableValueException;
 import org.apache.freemarker.core.valueformat.UnknownDateTypeFormattingUnsupportedException;
 import org.apache.freemarker.core.valueformat.UnparsableValueException;
-import org.apache.freemarker.core.model.TemplateDateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
 
 public class LocAndTZSensitiveTemplateDateFormatFactory extends TemplateDateFormatFactory {
 



Mime
View raw message