http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 916193b..22438a5 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.*; -import static org.junit.Assert.*; +import static org.apache.freemarker.core.outputformat.impl.XMLOutputFormat.INSTANCE; +import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.StringWriter;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java index 473ad38..57611f1 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java @@ -25,8 +25,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import org.apache.freemarker.core.model.impl.beans.MethodSorter; - class AlphabeticalMethodSorter implements MethodSorter { private final boolean desc; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 3a030c3..140b467 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 @@ -30,12 +30,12 @@ import java.util.Collections; import java.util.Date; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; -import org.apache.freemarker.core.outputformat.impl.TemplateHTMLOutputModel; import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateMethodModelEx; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; +import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; +import org.apache.freemarker.core.outputformat.impl.TemplateHTMLOutputModel; import org.junit.Test; public class ErrorMessagesTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java index ae6d7f1..08a52e3 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java @@ -23,8 +23,6 @@ import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; import java.lang.reflect.Method; -import org.apache.freemarker.core.model.impl.beans.MethodAppearanceFineTuner; -import org.apache.freemarker.core.model.impl.beans.SingletonCustomizer; import org.apache.freemarker.core.model.impl.beans.BeansWrapper.MethodAppearanceDecision; import org.apache.freemarker.core.model.impl.beans.BeansWrapper.MethodAppearanceDecisionInput; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/model/impl/beans/IsMoreSpecificParameterTypeTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/IsMoreSpecificParameterTypeTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/IsMoreSpecificParameterTypeTest.java index d11ff14..e71f071 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/IsMoreSpecificParameterTypeTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/IsMoreSpecificParameterTypeTest.java @@ -23,8 +23,6 @@ import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import org.apache.freemarker.core.model.impl.beans._MethodUtil; - import junit.framework.TestCase; public class IsMoreSpecificParameterTypeTest extends TestCase { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java index 547917d..b4cff32 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java @@ -28,8 +28,6 @@ import java.util.Set; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Version; -import org.apache.freemarker.core.model.impl.beans.BeansWrapper; -import org.apache.freemarker.core.model.impl.beans.MethodAppearanceFineTuner; /** * A hack to keep some unit tests producing exactly the same results on Java 8 as on Java 5-7, by hiding members http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtilTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtilTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtilTest.java index 8b5969f..de5cc1d 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtilTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtilTest.java @@ -22,9 +22,6 @@ package org.apache.freemarker.core.model.impl.beans; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.freemarker.core.model.impl.beans.OverloadedNumberUtil; -import org.apache.freemarker.core.model.impl.beans.TypeFlags; - import junit.framework.TestCase; @SuppressWarnings("boxing") http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 fd9929f..c6490e5 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/DefaultTemplateResolverTest.java @@ -32,9 +32,7 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateNotFoundException; import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateLookupStrategy; import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateNameFormat; import org.apache.freemarker.core.templateresolver.impl.DefaultTemplateResolver; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 66de647..48560bc 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/MultiTemplateLoaderTest.java @@ -27,10 +27,6 @@ import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import org.apache.commons.io.IOUtils; -import org.apache.freemarker.core.templateresolver.TemplateLoader; -import org.apache.freemarker.core.templateresolver.TemplateLoaderSession; -import org.apache.freemarker.core.templateresolver.TemplateLoadingResult; -import org.apache.freemarker.core.templateresolver.TemplateLoadingResultStatus; import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 cdf5deb..3d5151e 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateNameFormatTest.java @@ -29,7 +29,6 @@ import java.io.IOException; import java.util.Locale; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.ParseException; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateNotFoundException; import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 6096005..fe7e8ae 100644 --- a/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java +++ b/src/test/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcherTest.java @@ -18,17 +18,12 @@ */ package org.apache.freemarker.core.templateresolver; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; -import org.apache.freemarker.core.templateresolver.AndMatcher; -import org.apache.freemarker.core.templateresolver.FileExtensionMatcher; -import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher; -import org.apache.freemarker.core.templateresolver.NotMatcher; -import org.apache.freemarker.core.templateresolver.OrMatcher; -import org.apache.freemarker.core.templateresolver.PathGlobMatcher; -import org.apache.freemarker.core.templateresolver.PathRegexMatcher; import org.junit.Test; public class TemplateSourceMatcherTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java b/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java index 3948f32..74011a8 100644 --- a/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java +++ b/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java @@ -22,11 +22,10 @@ package org.apache.freemarker.core.util; import java.math.BigDecimal; import java.math.BigInteger; -import junit.framework.TestCase; - -import org.apache.freemarker.core.util._NumberUtil; import org.junit.Test; +import junit.framework.TestCase; + public class NumberUtilTest extends TestCase { @Test http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 eba927d..2ded8a3 100644 --- a/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java +++ b/src/test/java/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples.java @@ -18,12 +18,12 @@ */ package org.apache.freemarker.manualtest; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.RTFOutputFormat; -import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.outputformat.impl.XMLOutputFormat; import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory; import org.apache.freemarker.core.templateresolver.FileExtensionMatcher; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java index 5c2a3f6..e63e59f 100644 --- a/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java +++ b/src/test/java/org/apache/freemarker/manualtest/ExamplesTest.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.util.Properties; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.ByteArrayTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 af5ba00..5fc7097 100644 --- a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java +++ b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java @@ -18,16 +18,16 @@ */ package org.apache.freemarker.manualtest; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.Date; import org.apache.freemarker.core.Configuration; +import org.apache.freemarker.core.Template; +import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.PlainTextOutputFormat; import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; -import org.apache.freemarker.core.Template; -import org.apache.freemarker.core.TemplateConfiguration; import org.apache.freemarker.core.outputformat.impl.XMLOutputFormat; import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory; import org.apache.freemarker.core.templateresolver.FileExtensionMatcher; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 48b45bc..3151c27 100644 --- a/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java +++ b/src/test/java/org/apache/freemarker/servlet/InitParamParserTest.java @@ -33,7 +33,6 @@ import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.MockServletContext; import org.apache.freemarker.core.templateresolver.impl.ClassTemplateLoader; import org.apache.freemarker.core.templateresolver.impl.MultiTemplateLoader; -import org.apache.freemarker.servlet.InitParamParser; import org.junit.Test; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/servlet/jsp/JspTestFreemarkerServlet.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/JspTestFreemarkerServlet.java b/src/test/java/org/apache/freemarker/servlet/jsp/JspTestFreemarkerServlet.java index 1bc4a32..1891c4d 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/JspTestFreemarkerServlet.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/JspTestFreemarkerServlet.java @@ -24,7 +24,6 @@ import javax.servlet.ServletContext; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.servlet.FreemarkerServlet; -import org.apache.freemarker.servlet.jsp.TaglibFactory; public class JspTestFreemarkerServlet extends FreemarkerServlet { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 a44c51a..d6aa345 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java @@ -36,7 +36,6 @@ import javax.xml.parsers.SAXParserFactory; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.model.TemplateMethodModelEx; -import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.model.TemplateScalarModel; import org.apache.freemarker.core.model.impl.SimpleScalar; import org.apache.freemarker.core.model.impl.beans.BeansWrapper; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/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 43ac335..33a5223 100644 --- a/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java +++ b/src/test/java/org/apache/freemarker/servlet/jsp/TaglibMethodUtilTest.java @@ -19,11 +19,10 @@ package org.apache.freemarker.servlet.jsp; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.lang.reflect.Method; -import org.apache.freemarker.servlet.jsp.TaglibMethodUtil; import org.junit.Test; public class TaglibMethodUtilTest { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ace88bf8/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java index b231bec..660a979 100644 --- a/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java +++ b/src/test/java/org/apache/freemarker/test/ResourcesExtractor.java @@ -21,7 +21,6 @@ package org.apache.freemarker.test; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream;
