freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [1/2] 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:43 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/2.3-gae 99c5a6534 -> f4d2ae375


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/utility/DateUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/DateUtilTest.java b/src/test/java/freemarker/template/utility/DateUtilTest.java
index d97ef4b..c5b5e93 100644
--- a/src/test/java/freemarker/template/utility/DateUtilTest.java
+++ b/src/test/java/freemarker/template/utility/DateUtilTest.java
@@ -30,11 +30,11 @@ import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import junit.framework.TestCase;
 import freemarker.template.utility.DateUtil.CalendarFieldsToDateConverter;
 import freemarker.template.utility.DateUtil.DateParseException;
 import freemarker.template.utility.DateUtil.DateToISO8601CalendarFactory;
 import freemarker.template.utility.DateUtil.TrivialCalendarFieldsToDateConverter;
+import junit.framework.TestCase;
 
 public class DateUtilTest extends TestCase {
     

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/template/utility/NumberUtilTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/template/utility/NumberUtilTest.java b/src/test/java/freemarker/template/utility/NumberUtilTest.java
index 011704b..12bcd56 100644
--- a/src/test/java/freemarker/template/utility/NumberUtilTest.java
+++ b/src/test/java/freemarker/template/utility/NumberUtilTest.java
@@ -22,10 +22,10 @@ package freemarker.template.utility;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import junit.framework.TestCase;
-
 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/f4d2ae37/src/test/java/freemarker/test/servlet/WebAppTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/WebAppTestCase.java b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
index ba309b0..0df5d54 100644
--- a/src/test/java/freemarker/test/servlet/WebAppTestCase.java
+++ b/src/test/java/freemarker/test/servlet/WebAppTestCase.java
@@ -19,8 +19,7 @@
 
 package 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/f4d2ae37/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
index 2ba6dac..93482c2 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestSuite.java
@@ -32,8 +32,6 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import junit.framework.TestSuite;
-
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -46,6 +44,7 @@ import freemarker.ext.dom.NodeModel;
 import freemarker.template.Configuration;
 import freemarker.template.Version;
 import freemarker.template.utility.StringUtil;
+import junit.framework.TestSuite;
 
 /**
  * Test suite where the test cases are defined in testcases.xml, and usually process

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f4d2ae37/src/test/java/freemarker/test/templatesuite/models/Listables.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/models/Listables.java b/src/test/java/freemarker/test/templatesuite/models/Listables.java
index d607a7e..f06eaad 100644
--- a/src/test/java/freemarker/test/templatesuite/models/Listables.java
+++ b/src/test/java/freemarker/test/templatesuite/models/Listables.java
@@ -18,31 +18,22 @@
  */
 package freemarker.test.templatesuite.models;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.SortedMap;
 import java.util.TreeSet;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
-import freemarker.core._DelayedJQuote;
-import freemarker.core._TemplateModelException;
 import freemarker.ext.beans.BeansWrapperBuilder;
-import freemarker.ext.util.WrapperTemplateModel;
-import freemarker.template.AdapterTemplateModel;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultMapAdapter;
 import freemarker.template.DefaultObjectWrapperBuilder;
-import freemarker.template.MapKeyValuePairIterator;
 import freemarker.template.ObjectWrapper;
 import freemarker.template.SimpleCollection;
 import freemarker.template.SimpleHash;
@@ -51,10 +42,7 @@ import freemarker.template.TemplateHashModelEx;
 import freemarker.template.TemplateHashModelEx2;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
-import freemarker.template.TemplateModelWithAPISupport;
 import freemarker.template.WrappingTemplateModel;
-import freemarker.template.TemplateHashModelEx2.KeyValuePairIterator;
-import freemarker.template.utility.ObjectWrapperWithAPISupport;
 
 @SuppressWarnings("boxing")
 public class Listables {


Mime
View raw message