freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/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:57 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 03aecddc8 -> 0e21f6aab


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/LocaleSensitiveTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/LocaleSensitiveTemplateNumberFormatFactory.java
b/src/test/java/org/apache/freemarker/core/userpkg/LocaleSensitiveTemplateNumberFormatFactory.java
index 231246b..1f2f974 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/LocaleSensitiveTemplateNumberFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/LocaleSensitiveTemplateNumberFormatFactory.java
@@ -21,13 +21,13 @@ 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.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;
 
 public class LocaleSensitiveTemplateNumberFormatFactory extends TemplateNumberFormatFactory
{
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/userpkg/PrintfGTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/userpkg/PrintfGTemplateNumberFormatFactory.java
b/src/test/java/org/apache/freemarker/core/userpkg/PrintfGTemplateNumberFormatFactory.java
index 7364df2..26a693a 100644
--- a/src/test/java/org/apache/freemarker/core/userpkg/PrintfGTemplateNumberFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/userpkg/PrintfGTemplateNumberFormatFactory.java
@@ -23,15 +23,15 @@ import java.math.BigInteger;
 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.outputformat.impl.HTMLOutputFormat;
+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.UnformattableValueException;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateNumberModel;
-import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat;
-import org.apache.freemarker.core.util._StringUtil;
 
 /**
  * Formats like {@code %G} in {@code printf}, with the specified number of significant digits.
Also has special

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java b/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java
index a38ef73..5c207ef 100644
--- a/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java
+++ b/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java
@@ -19,13 +19,7 @@
 
 package org.apache.freemarker.core.util;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.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/valueformat/NumberFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/valueformat/NumberFormatTest.java b/src/test/java/org/apache/freemarker/core/valueformat/NumberFormatTest.java
index d5c8adb..ba78e12 100644
--- a/src/test/java/org/apache/freemarker/core/valueformat/NumberFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/valueformat/NumberFormatTest.java
@@ -18,11 +18,8 @@
  */
 package org.apache.freemarker.core.valueformat;
 
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-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.math.BigDecimal;
@@ -31,7 +28,11 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.freemarker.core.*;
+import org.apache.freemarker.core.Configuration;
+import org.apache.freemarker.core.Environment;
+import org.apache.freemarker.core.Template;
+import org.apache.freemarker.core.TemplateConfiguration;
+import org.apache.freemarker.core.TemplateException;
 import org.apache.freemarker.core.model.TemplateDirectiveBody;
 import org.apache.freemarker.core.model.TemplateDirectiveModel;
 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/valueformat/impl/ExtendedDecimalFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
b/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
index 29bbc6a..dc1b473 100644
--- a/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/valueformat/impl/ExtendedDecimalFormatTest.java
@@ -18,12 +18,9 @@
  */
 package org.apache.freemarker.core.valueformat.impl;
 
-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.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.text.DecimalFormat;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/dom/DOMSimplifiersTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/dom/DOMSimplifiersTest.java b/src/test/java/org/apache/freemarker/dom/DOMSimplifiersTest.java
index 103ceb4..5daab78 100644
--- a/src/test/java/org/apache/freemarker/dom/DOMSimplifiersTest.java
+++ b/src/test/java/org/apache/freemarker/dom/DOMSimplifiersTest.java
@@ -18,7 +18,7 @@
  */
 package org.apache.freemarker.dom;
 
-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/dom/DOMTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/dom/DOMTest.java b/src/test/java/org/apache/freemarker/dom/DOMTest.java
index 06f3779..2938062 100644
--- a/src/test/java/org/apache/freemarker/dom/DOMTest.java
+++ b/src/test/java/org/apache/freemarker/dom/DOMTest.java
@@ -18,10 +18,8 @@
  */
 package org.apache.freemarker.dom;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.startsWith;
-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.StringReader;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java
b/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java
index 2ded8a3..ec3c0d8 100644
--- a/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java
+++ b/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java
@@ -18,7 +18,7 @@
  */
 package org.apache.freemarker.manualtest;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.TemplateConfiguration;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/manualtest/CustomFormatsExample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/CustomFormatsExample.java b/src/test/java/org/apache/freemarker/manualtest/CustomFormatsExample.java
index 0f4cee5..31f923b 100644
--- a/src/test/java/org/apache/freemarker/manualtest/CustomFormatsExample.java
+++ b/src/test/java/org/apache/freemarker/manualtest/CustomFormatsExample.java
@@ -24,13 +24,13 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.freemarker.core.valueformat.impl.AliasTemplateDateFormatFactory;
-import org.apache.freemarker.core.valueformat.impl.AliasTemplateNumberFormatFactory;
 import org.apache.freemarker.core.Configuration;
-import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
 import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.userpkg.BaseNTemplateNumberFormatFactory;
+import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory;
+import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
+import org.apache.freemarker.core.valueformat.impl.AliasTemplateDateFormatFactory;
+import org.apache.freemarker.core.valueformat.impl.AliasTemplateNumberFormatFactory;
 import org.junit.Test;
 
 @SuppressWarnings("boxing")

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java
b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java
index 5fc7097..f128d5c 100644
--- a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java
+++ b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java
@@ -18,7 +18,7 @@
  */
 package org.apache.freemarker.manualtest;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Date;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberFormatFactory.java
b/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberFormatFactory.java
index 7013b30..bcbaefb 100644
--- a/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberFormatFactory.java
@@ -21,11 +21,11 @@ package org.apache.freemarker.manualtest;
 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.valueformat.TemplateNumberFormat;
 import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory;
 import org.apache.freemarker.core.valueformat.TemplateValueFormatException;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateNumberModel;
 
 /**
  * A number format that takes any other number format as parameter (specified as a string,
as

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java b/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
index 72d47b4..97c1d5b 100644
--- a/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/FreemarkerServletTest.java
@@ -18,19 +18,9 @@
  */
 package org.apache.freemarker.servlet;
 
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_CONTENT_TYPE;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_CONTENT_TYPE;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_OVERRIDE_RESPONSE_LOCALE;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_RESPONSE_CHARACTER_ENCODING;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_VALUE_ALWAYS;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_VALUE_NEVER;
-import static org.apache.freemarker.servlet.FreemarkerServlet.INIT_PARAM_VALUE_WHEN_TEMPLATE_HAS_MIME_TYPE;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.instanceOf;
-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.apache.freemarker.servlet.FreemarkerServlet.*;
+import static org.hamcrest.Matchers.*;
+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/servlet/InitParamParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java b/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
index 3151c27..3507189 100644
--- a/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java
@@ -18,13 +18,8 @@
  */
 package org.apache.freemarker.servlet;
 
-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.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
index 808fec4..d190704 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
@@ -19,10 +19,7 @@
 
 package org.apache.freemarker.servlet.jsp;
 
-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.util.AbstractList;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
index d6aa345..396e8aa 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
@@ -19,9 +19,7 @@
 
 package org.apache.freemarker.servlet.jsp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.InputStream;
 import java.net.URL;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java
index 33a5223..6116135 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java
@@ -19,7 +19,7 @@
 
 package org.apache.freemarker.servlet.jsp;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.lang.reflect.Method;
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/test/TemplateTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/TemplateTest.java b/src/test/java/org/apache/freemarker/test/TemplateTest.java
index 68c9ea5..9eee45c 100644
--- a/src/test/java/org/apache/freemarker/test/TemplateTest.java
+++ b/src/test/java/org/apache/freemarker/test/TemplateTest.java
@@ -19,10 +19,8 @@
 
 package org.apache.freemarker.test;
 
-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.InputStream;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java
index 19c9531..5074bb1 100644
--- a/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java
+++ b/src/test/java/org/apache/freemarker/test/servlet/WebAppTestCase.java
@@ -19,8 +19,7 @@
 
 package org.apache.freemarker.test.servlet;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+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/test/templatesuite/TemplateTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
index 2d136f5..4fab03b 100644
--- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
+++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestCase.java
@@ -65,11 +65,11 @@ import org.apache.freemarker.core.model.impl.beans.BeansWrapperBuilder;
 import org.apache.freemarker.core.model.impl.beans.BooleanModel;
 import org.apache.freemarker.core.model.impl.beans.Java7MembersOnlyBeansWrapper;
 import org.apache.freemarker.core.model.impl.beans.ResourceBundleModel;
-import org.apache.freemarker.dom.NodeModel;
 import org.apache.freemarker.core.templateresolver.impl.FileTemplateLoader;
 import org.apache.freemarker.core.util._NullArgumentException;
 import org.apache.freemarker.core.util._NullWriter;
 import org.apache.freemarker.core.util._StringUtil;
+import org.apache.freemarker.dom.NodeModel;
 import org.apache.freemarker.test.CopyrightCommentRemoverTemplateLoader;
 import org.apache.freemarker.test.templatesuite.models.BooleanAndStringTemplateModel;
 import org.apache.freemarker.test.templatesuite.models.BooleanHash1;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java
b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java
index b768e2e..2808ed1 100644
--- a/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java
+++ b/src/test/java/org/apache/freemarker/test/templatesuite/TemplateTestSuite.java
@@ -34,8 +34,8 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.Version;
-import org.apache.freemarker.dom.NodeModel;
 import org.apache.freemarker.core.util._StringUtil;
+import org.apache.freemarker.dom.NodeModel;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/test/util/AssertDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java
index 91e4fde..15e74e5 100644
--- a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java
+++ b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import org.apache.freemarker.core.Environment;
 import org.apache.freemarker.core.NestedContentNotSupportedException;
 import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core._CoreAPI;
 import org.apache.freemarker.core.model.TemplateBooleanModel;
 import org.apache.freemarker.core.model.TemplateDirectiveBody;
 import org.apache.freemarker.core.model.TemplateDirectiveModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0e21f6aa/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java
index 8ceb529..1012f9d 100644
--- a/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java
+++ b/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import org.apache.freemarker.core.Environment;
 import org.apache.freemarker.core.NestedContentNotSupportedException;
 import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core._CoreAPI;
 import org.apache.freemarker.core.model.TemplateBooleanModel;
 import org.apache.freemarker.core.model.TemplateDateModel;
 import org.apache.freemarker.core.model.TemplateDirectiveBody;


Mime
View raw message