http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/ParsingErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/ParsingErrorMessagesTest.java b/src/test/java/org/apache/freemarker/core/ast/ParsingErrorMessagesTest.java index a16f60b..916ca6b 100644 --- a/src/test/java/org/apache/freemarker/core/ast/ParsingErrorMessagesTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/ParsingErrorMessagesTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.ast.ParseException; -import org.apache.freemarker.core.util.StringUtil; +import org.apache.freemarker.core.util._StringUtil; import org.junit.Test; public class ParsingErrorMessagesTest { @@ -99,10 +99,10 @@ public class ParsingErrorMessagesTest { if (needle.startsWith("\\!")) { String netNeedle = needle.substring(2); if (msg.contains(netNeedle)) { - fail("The message shouldn't contain substring " + StringUtil.jQuote(netNeedle) + ":\n" + msg); + fail("The message shouldn't contain substring " + _StringUtil.jQuote(netNeedle) + ":\n" + msg); } } else if (!msg.contains(needle)) { - fail("The message didn't contain substring " + StringUtil.jQuote(needle) + ":\n" + msg); + fail("The message didn't contain substring " + _StringUtil.jQuote(needle) + ":\n" + msg); } } showError(e);
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/PrintfGTemplateNumberFormatFactory.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/PrintfGTemplateNumberFormatFactory.java b/src/test/java/org/apache/freemarker/core/ast/PrintfGTemplateNumberFormatFactory.java index 8bbba0d..db897c7 100644 --- a/src/test/java/org/apache/freemarker/core/ast/PrintfGTemplateNumberFormatFactory.java +++ b/src/test/java/org/apache/freemarker/core/ast/PrintfGTemplateNumberFormatFactory.java @@ -31,7 +31,7 @@ import org.apache.freemarker.core.ast.TemplateNumberFormatFactory; import org.apache.freemarker.core.ast.UnformattableValueException; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateNumberModel; -import org.apache.freemarker.core.util.StringUtil; +import org.apache.freemarker.core.util._StringUtil; /** * Formats like {@code %G} in {@code printf}, with the specified number of significant digits. Also has special @@ -55,7 +55,7 @@ public class PrintfGTemplateNumberFormatFactory extends TemplateNumberFormatFact } catch (NumberFormatException e) { throw new InvalidFormatParametersException( "The format parameter must be an integer, but was (shown quoted) " - + StringUtil.jQuote(params) + "."); + + _StringUtil.jQuote(params) + "."); } } else { // Use the default of %G http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/SQLTimeZoneTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/SQLTimeZoneTest.java b/src/test/java/org/apache/freemarker/core/ast/SQLTimeZoneTest.java index 8fbc40d..0b15523 100644 --- a/src/test/java/org/apache/freemarker/core/ast/SQLTimeZoneTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/SQLTimeZoneTest.java @@ -31,7 +31,7 @@ import java.util.Locale; import java.util.TimeZone; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.core.util.DateUtil; +import org.apache.freemarker.core.util._DateUtil; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; @@ -43,7 +43,7 @@ public class SQLTimeZoneTest extends TemplateTest { private final DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US); { - df.setTimeZone(DateUtil.UTC); + df.setTimeZone(_DateUtil.UTC); } // Values that JDBC in GMT+02 would produce @@ -196,7 +196,7 @@ public class SQLTimeZoneTest extends TemplateTest { @Test public void testCacheFlushings() throws Exception { Configuration cfg = getConfiguration(); - cfg.setTimeZone(DateUtil.UTC); + cfg.setTimeZone(_DateUtil.UTC); cfg.setDateFormat("yyyy-MM-dd E"); cfg.setTimeFormat("HH:mm:ss E"); cfg.setDateTimeFormat("yyyy-MM-dd'T'HH:mm:ss E"); @@ -256,7 +256,7 @@ public class SQLTimeZoneTest extends TemplateTest { @Test public void testDateAndTimeBuiltInsHasNoEffect() throws Exception { Configuration cfg = getConfiguration(); - cfg.setTimeZone(DateUtil.UTC); + cfg.setTimeZone(_DateUtil.UTC); cfg.setSQLDateAndTimeTimeZone(GMT_P02); assertOutput( "${javaDayErrorDate?date} ${javaDayErrorDate?time} ${sqlTimestamp?date} ${sqlTimestamp?time} " @@ -275,7 +275,7 @@ public class SQLTimeZoneTest extends TemplateTest { @Test public void testChangeSettingInTemplate() throws Exception { Configuration cfg = getConfiguration(); - cfg.setTimeZone(DateUtil.UTC); + cfg.setTimeZone(_DateUtil.UTC); assertNull(cfg.getSQLDateAndTimeTimeZone()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/TagSyntaxVariationsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/TagSyntaxVariationsTest.java b/src/test/java/org/apache/freemarker/core/ast/TagSyntaxVariationsTest.java index 8b1ecd1..bb1b1aa 100644 --- a/src/test/java/org/apache/freemarker/core/ast/TagSyntaxVariationsTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/TagSyntaxVariationsTest.java @@ -27,7 +27,7 @@ import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.ast.ParseException; -import org.apache.freemarker.core.util.StringUtil; +import org.apache.freemarker.core.util._StringUtil; import junit.framework.TestCase; @@ -220,13 +220,13 @@ public class TagSyntaxVariationsTest extends TestCase { } catch (ParseException e) { if (expected != null) { fail("Couldn't create Template from " - + StringUtil.jQuote(template) + ": " + e); + + _StringUtil.jQuote(template) + ": " + e); } else { return; } } if (expected == null) fail("Template parsing should have fail for " - + StringUtil.jQuote(template)); + + _StringUtil.jQuote(template)); StringWriter out = new StringWriter(); t.process(new Object(), out); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java index 5d8f6fc..1f3bc31 100644 --- a/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/TemplateConfigurationTest.java @@ -54,21 +54,9 @@ import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.TemplateExceptionHandler; import org.apache.freemarker.core.Version; -import org.apache.freemarker.core.ast.ArithmeticEngine; -import org.apache.freemarker.core.ast.Configurable; -import org.apache.freemarker.core.ast.CustomAttribute; -import org.apache.freemarker.core.ast.HTMLOutputFormat; -import org.apache.freemarker.core.ast.ParseException; -import org.apache.freemarker.core.ast.ParserConfiguration; -import org.apache.freemarker.core.ast.TemplateClassResolver; -import org.apache.freemarker.core.ast.TemplateConfiguration; -import org.apache.freemarker.core.ast.TemplateDateFormatFactory; -import org.apache.freemarker.core.ast.TemplateNumberFormatFactory; -import org.apache.freemarker.core.ast.UndefinedOutputFormat; -import org.apache.freemarker.core.ast.XMLOutputFormat; import org.apache.freemarker.core.model.impl.SimpleObjectWrapper; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; -import org.apache.freemarker.core.util.NullArgumentException; +import org.apache.freemarker.core.util._NullArgumentException; import org.junit.Test; import com.google.common.collect.ImmutableList; @@ -854,7 +842,7 @@ public class TemplateConfigurationTest { try { tc.setParentConfiguration(null); fail(); - } catch (NullArgumentException e) { + } catch (_NullArgumentException e) { // exected } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java b/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java index e7ca755..49b7ca8 100644 --- a/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/TemplateNameSpecialVariablesTest.java @@ -26,7 +26,7 @@ import org.apache.freemarker.core.TemplateException; import org.apache.freemarker.core.Version; import org.apache.freemarker.core.templateresolver.TemplateLoader; import org.apache.freemarker.core.templateresolver.impl.StringTemplateLoader; -import org.apache.freemarker.core.util.StringUtil; +import org.apache.freemarker.core.util._StringUtil; import org.apache.freemarker.test.TemplateTest; import org.junit.Before; import org.junit.Test; @@ -168,8 +168,8 @@ public class TemplateNameSpecialVariablesTest extends TemplateTest { + "{main.ftl}\n" + "In main: main.ftl\n"; if (allMain) { - expected = StringUtil.replace(expected, "imp.ftl", "main.ftl"); - expected = StringUtil.replace(expected, "inc.ftl", "main.ftl"); + expected = _StringUtil.replace(expected, "imp.ftl", "main.ftl"); + expected = _StringUtil.replace(expected, "inc.ftl", "main.ftl"); } assertOutputForNamed("main.ftl", expected); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java b/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java index 9ca90c1..59aae80 100644 --- a/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java +++ b/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java @@ -27,13 +27,11 @@ import java.util.Map; import org.apache.freemarker.core.Configuration; import org.apache.freemarker.core.Template; import org.apache.freemarker.core.TemplateException; -import org.apache.freemarker.core.ast.Environment; -import org.apache.freemarker.core.ast._CoreAPI; import org.apache.freemarker.core.ast.ThreadInterruptionSupportTemplatePostProcessor.TemplateProcessingThreadInterruptedException; import org.apache.freemarker.core.model.TemplateDirectiveBody; import org.apache.freemarker.core.model.TemplateDirectiveModel; import org.apache.freemarker.core.model.TemplateModel; -import org.apache.freemarker.core.util.NullWriter; +import org.apache.freemarker.core.util._NullWriter; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +88,7 @@ public class TheadInterruptingSupportTest { @Override public void run() { try { - template.process(this, NullWriter.INSTANCE); + template.process(this, _NullWriter.INSTANCE); } catch (TemplateProcessingThreadInterruptedException e) { //LOG.debug("Template processing interrupted", e); synchronized (this) { @@ -138,7 +136,7 @@ public class TheadInterruptingSupportTest { public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { while (true) { - body.render(NullWriter.INSTANCE); + body.render(_NullWriter.INSTANCE); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperReadOnlyTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperReadOnlyTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperReadOnlyTest.java index b660f2b..483ef66 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperReadOnlyTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperReadOnlyTest.java @@ -27,8 +27,7 @@ import java.lang.reflect.Method; import org.apache.freemarker.core.model.ObjectWrapper; import org.apache.freemarker.core.model.impl.DefaultObjectWrapper; -import org.apache.freemarker.core.model.impl.beans.BeansWrapper; -import org.apache.freemarker.core.util.ClassUtil; +import org.apache.freemarker.core.util._ClassUtil; import org.apache.freemarker.core.util.WriteProtectable; import junit.framework.TestCase; @@ -65,7 +64,7 @@ public class BeansWrapperReadOnlyTest extends TestCase { Class t = pd.getPropertyType(); Object val; - if (ClassUtil.isNumerical(t)) { + if (_ClassUtil.isNumerical(t)) { val = Byte.valueOf((byte) 1); } else if (t == boolean.class) { val = Boolean.TRUE; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java index 6d19982..9d4b3eb 100644 --- a/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java +++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/ParameterListPreferabilityTest.java @@ -29,7 +29,7 @@ import java.util.TreeMap; import org.apache.freemarker.core.model.impl.beans.ArgumentTypes; import org.apache.freemarker.core.model.impl.beans.OverloadedNumberUtil; -import org.apache.freemarker.core.util.NumberUtil; +import org.apache.freemarker.core.util._NumberUtil; import junit.framework.TestCase; @@ -424,9 +424,9 @@ public class ParameterListPreferabilityTest extends TestCase { for (int i = 0; i < sortedSignatures.length; i++) { for (int j = 0; j < sortedSignatures.length; j++) { assertEquals("sortedSignatures[" + i + "] <==> sortedSignatures [" + j + "]", - NumberUtil.getSignum( + _NumberUtil.getSignum( Integer.valueOf(j).compareTo(i)), - NumberUtil.getSignum( + _NumberUtil.getSignum( argTs.compareParameterListPreferability( sortedSignatures[i], sortedSignatures[j], varargs))); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/src/test/java/org/apache/freemarker/core/util/DateUtilTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/core/util/DateUtilTest.java b/src/test/java/org/apache/freemarker/core/util/DateUtilTest.java index d62e547..0b37b65 100644 --- a/src/test/java/org/apache/freemarker/core/util/DateUtilTest.java +++ b/src/test/java/org/apache/freemarker/core/util/DateUtilTest.java @@ -30,12 +30,10 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.apache.freemarker.core.util.DateUtil; -import org.apache.freemarker.core.util.UnrecognizedTimeZoneException; -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.DateUtil.TrivialCalendarFieldsToDateConverter; +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._DateUtil.TrivialCalendarFieldsToDateConverter; import junit.framework.TestCase; @@ -56,13 +54,13 @@ public class DateUtilTest extends TestCase { private final DateFormat df = new SimpleDateFormat("G yyyy-MM-dd HH:mm:ss:S Z", Locale.US); { - df.setTimeZone(DateUtil.UTC); + df.setTimeZone(_DateUtil.UTC); } private CalendarFieldsToDateConverter cf2dc = new TrivialCalendarFieldsToDateConverter(); private DateToISO8601CalendarFactory calendarFactory - = new DateUtil.TrivialDateToISO8601CalendarFactory(); + = new _DateUtil.TrivialDateToISO8601CalendarFactory(); public DateUtilTest(String name) { super(name); @@ -205,18 +203,18 @@ public class DateUtilTest extends TestCase { } public void testGetTimeZone() throws Exception { - assertTrue(DateUtil.getTimeZone("GMT") != DateUtil.UTC); - assertTrue(DateUtil.getTimeZone("UT1") != DateUtil.UTC); - assertEquals(DateUtil.getTimeZone("UTC"), DateUtil.UTC); + assertTrue(_DateUtil.getTimeZone("GMT") != _DateUtil.UTC); + assertTrue(_DateUtil.getTimeZone("UT1") != _DateUtil.UTC); + assertEquals(_DateUtil.getTimeZone("UTC"), _DateUtil.UTC); - assertEquals(DateUtil.getTimeZone("Europe/Rome"), + assertEquals(_DateUtil.getTimeZone("Europe/Rome"), TimeZone.getTimeZone("Europe/Rome")); - assertEquals(DateUtil.getTimeZone("Iceland"), // GMT and no DST + assertEquals(_DateUtil.getTimeZone("Iceland"), // GMT and no DST TimeZone.getTimeZone("Iceland")); try { - DateUtil.getTimeZone("Europe/NoSuch"); + _DateUtil.getTimeZone("Europe/NoSuch"); fail(); } catch (UnrecognizedTimeZoneException e) { // good @@ -227,12 +225,12 @@ public class DateUtilTest extends TestCase { Date t = new Date(0L); SimpleDateFormat tf = new SimpleDateFormat("HH:mm:ss"); - tf.setTimeZone(DateUtil.UTC); + tf.setTimeZone(_DateUtil.UTC); assertEquals("00:00:00", tf.format(t)); assertEquals("00:00:00", dateToISO8601UTCTimeString(t, false)); - TimeZone gmt1 = DateUtil.getTimeZone("GMT+01"); + TimeZone gmt1 = _DateUtil.getTimeZone("GMT+01"); tf.setTimeZone(gmt1); assertEquals("01:00:00", tf.format(t)); assertEquals("01:00:00+01:00", @@ -245,16 +243,16 @@ public class DateUtilTest extends TestCase { dateToISO8601UTCDateTimeString(d, true)); assertEquals("2000-02-08T09:05:04.25Z", dateToISO8601String(d, true, true, true, - DateUtil.ACCURACY_MILLISECONDS, null)); + _DateUtil.ACCURACY_MILLISECONDS, null)); assertEquals("2000-02-08T09:05:04Z", dateToISO8601String(d, true, true, true, - DateUtil.ACCURACY_SECONDS, null)); + _DateUtil.ACCURACY_SECONDS, null)); assertEquals("2000-02-08T09:05Z", dateToISO8601String(d, true, true, true, - DateUtil.ACCURACY_MINUTES, null)); + _DateUtil.ACCURACY_MINUTES, null)); assertEquals("2000-02-08T09Z", dateToISO8601String(d, true, true, true, - DateUtil.ACCURACY_HOURS, null)); + _DateUtil.ACCURACY_HOURS, null)); d = df.parse("AD 1998-10-30 19:30:00:000 +0400"); assertEquals( @@ -317,95 +315,95 @@ public class DateUtilTest extends TestCase { Date dsum = df.parse("AD 2010-05-09 20:00:00:0 UTC"); Date dwin = df.parse("AD 2010-01-01 20:00:00:0 UTC"); - TimeZone tzRome = DateUtil.getTimeZone("Europe/Rome"); + TimeZone tzRome = _DateUtil.getTimeZone("Europe/Rome"); assertEquals( "2010-01-01T21:00:00+01:00", - DateUtil.dateToXSString(dwin, true, true, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dwin, true, true, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "2010-05-09T22:00:00+02:00", - DateUtil.dateToXSString(dsum, true, true, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dsum, true, true, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "2010-01-01+01:00", // ISO doesn't allow date-only with TZ - DateUtil.dateToXSString(dwin, true, false, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dwin, true, false, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "2010-05-09+02:00", // ISO doesn't allow date-only with TZ - DateUtil.dateToXSString(dsum, true, false, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dsum, true, false, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "21:00:00+01:00", - DateUtil.dateToXSString(dwin, false, true, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dwin, false, true, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "22:00:00+02:00", - DateUtil.dateToXSString(dsum, false, true, true, DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); + _DateUtil.dateToXSString(dsum, false, true, true, _DateUtil.ACCURACY_SECONDS, tzRome, calendarFactory)); assertEquals( "-1-02-29T06:15:24Z", // ISO uses 0 for BC 1 - DateUtil.dateToXSString( + _DateUtil.dateToXSString( df.parse("BC 0001-03-02 09:15:24:0 +0300"), - true, true, true, DateUtil.ACCURACY_SECONDS, DateUtil.UTC, calendarFactory)); + true, true, true, _DateUtil.ACCURACY_SECONDS, _DateUtil.UTC, calendarFactory)); assertEquals( "-2-02-28T06:15:24Z", // ISO uses -1 for BC 2 - DateUtil.dateToXSString( + _DateUtil.dateToXSString( df.parse("BC 2-03-02 09:15:24:0 +0300"), - true, true, true, DateUtil.ACCURACY_SECONDS, DateUtil.UTC, calendarFactory)); + true, true, true, _DateUtil.ACCURACY_SECONDS, _DateUtil.UTC, calendarFactory)); } private String dateToISO8601DateTimeString( Date date, TimeZone tz) { return dateToISO8601String(date, true, true, true, - DateUtil.ACCURACY_SECONDS, tz); + _DateUtil.ACCURACY_SECONDS, tz); } private String dateToISO8601UTCDateTimeString( Date date, boolean offsetPart) { return dateToISO8601String(date, true, true, offsetPart, - DateUtil.ACCURACY_SECONDS, DateUtil.UTC); + _DateUtil.ACCURACY_SECONDS, _DateUtil.UTC); } private String dateToISO8601UTCDateTimeMSString( Date date, boolean offsetPart) { return dateToISO8601String(date, true, true, offsetPart, - DateUtil.ACCURACY_MILLISECONDS, DateUtil.UTC); + _DateUtil.ACCURACY_MILLISECONDS, _DateUtil.UTC); } private String dateToISO8601UTCDateTimeMSFString( Date date, boolean offsetPart) { return dateToISO8601String(date, true, true, offsetPart, - DateUtil.ACCURACY_MILLISECONDS_FORCED, DateUtil.UTC); + _DateUtil.ACCURACY_MILLISECONDS_FORCED, _DateUtil.UTC); } private String dateToISO8601DateString(Date date, TimeZone tz) { return dateToISO8601String(date, true, false, false, - DateUtil.ACCURACY_SECONDS, tz); + _DateUtil.ACCURACY_SECONDS, tz); } private String dateToISO8601UTCDateString(Date date) { return dateToISO8601String(date, true, false, false, - DateUtil.ACCURACY_SECONDS, DateUtil.UTC); + _DateUtil.ACCURACY_SECONDS, _DateUtil.UTC); } private String dateToISO8601TimeString( Date date, TimeZone tz) { return dateToISO8601String(date, false, true, true, - DateUtil.ACCURACY_SECONDS, tz); + _DateUtil.ACCURACY_SECONDS, tz); } private String dateToISO8601UTCTimeString( Date date, boolean offsetPart) { return dateToISO8601String(date, false, true, offsetPart, - DateUtil.ACCURACY_SECONDS, DateUtil.UTC); + _DateUtil.ACCURACY_SECONDS, _DateUtil.UTC); } private String dateToISO8601UTCTimeMSString( Date date, boolean offsetPart) { return dateToISO8601String(date, false, true, offsetPart, - DateUtil.ACCURACY_MILLISECONDS, DateUtil.UTC); + _DateUtil.ACCURACY_MILLISECONDS, _DateUtil.UTC); } private String dateToISO8601UTCTimeMSFString( Date date, boolean offsetPart) { return dateToISO8601String(date, false, true, offsetPart, - DateUtil.ACCURACY_MILLISECONDS_FORCED, DateUtil.UTC); + _DateUtil.ACCURACY_MILLISECONDS_FORCED, _DateUtil.UTC); } private String dateToISO8601String( @@ -413,7 +411,7 @@ public class DateUtilTest extends TestCase { boolean datePart, boolean timePart, boolean offsetPart, int accuracy, TimeZone timeZone) { - return DateUtil.dateToISO8601String( + return _DateUtil.dateToISO8601String( date, datePart, timePart, offsetPart, accuracy, @@ -425,49 +423,49 @@ public class DateUtilTest extends TestCase { assertDateParsing( "AD 1998-10-29 20:00:00:0 +0000", null, - "1998-10-30+04:00", DateUtil.UTC); + "1998-10-30+04:00", _DateUtil.UTC); assertDateParsing( "AD 1998-10-30 02:00:00:0 +0000", null, - "1998-10-30-02:00", DateUtil.UTC); + "1998-10-30-02:00", _DateUtil.UTC); assertDateParsing( "AD 1998-10-30 02:00:00:0 +0000", - "1998-10-30", DateUtil.parseXSTimeZone("-02:00")); + "1998-10-30", _DateUtil.parseXSTimeZone("-02:00")); assertDateParsing( null, "AD 1998-10-30 02:00:00:0 +0000", - "19981030", DateUtil.parseXSTimeZone("-02:00")); + "19981030", _DateUtil.parseXSTimeZone("-02:00")); assertDateParsing( "AD 1998-10-30 00:00:00:0 +0000", null, - "1998-10-30Z", DateUtil.UTC); + "1998-10-30Z", _DateUtil.UTC); assertDateParsing( "AD 1998-10-30 00:00:00:0 +0000", - "1998-10-30", DateUtil.UTC); + "1998-10-30", _DateUtil.UTC); assertDateParsing( null, "AD 1998-10-30 00:00:00:0 +0000", - "19981030", DateUtil.UTC); + "19981030", _DateUtil.UTC); assertDateParsing( "AD 1998-10-29 20:00:00:0 +0000", null, - "1998-10-30+04:00", DateUtil.UTC); + "1998-10-30+04:00", _DateUtil.UTC); assertDateParsing( "AD 1998-10-30 04:00:00:0 +0000", null, - "1998-10-30-04:00", DateUtil.UTC); + "1998-10-30-04:00", _DateUtil.UTC); assertDateParsing( "AD 1998-10-30 00:00:00:0 +0000", null, - "1998-10-30Z", DateUtil.UTC); + "1998-10-30Z", _DateUtil.UTC); try { // XS doesn't have year 0 assertDateParsing( "BC 0000-02-05 00:00:00:0 +0000", null, - "0000-02-03Z", DateUtil.UTC); + "0000-02-03Z", _DateUtil.UTC); fail(); } catch (DateParseException e) { echo(e); @@ -475,61 +473,61 @@ public class DateUtilTest extends TestCase { assertDateParsing( null, "BC 0001-02-05 00:00:00:0 +0000", - "0000-02-03", DateUtil.UTC); + "0000-02-03", _DateUtil.UTC); assertDateParsing( null, "BC 0001-02-05 00:00:00:0 +0000", - "00000203", DateUtil.UTC); + "00000203", _DateUtil.UTC); assertDateParsing( "BC 0001-02-05 00:00:00:0 +0000", // Julian "BC 0002-02-05 00:00:00:0 +0000", // Julian - "-0001-02-03", DateUtil.UTC); // Proleptic Gregorian + "-0001-02-03", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( null, "BC 0002-02-05 00:00:00:0 +0000", // Julian - "-00010203", DateUtil.UTC); // Proleptic Gregorian + "-00010203", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( "AD 0001-02-05 00:00:00:0 +0000", // Julian null, - "0001-02-03Z", DateUtil.UTC); // Proleptic Gregorian + "0001-02-03Z", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( "AD 0001-02-05 00:00:00:0 +0000", // Julian - "0001-02-03", DateUtil.UTC); // Proleptic Gregorian + "0001-02-03", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( null, "AD 0001-02-05 00:00:00:0 +0000", // Julian - "00010203", DateUtil.UTC); // Proleptic Gregorian + "00010203", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( "AD 1001-12-07 00:00:00:0 +0000", // Julian null, - "1001-12-13Z", DateUtil.UTC); // Proleptic Gregorian + "1001-12-13Z", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( "AD 1001-12-07 00:00:00:0 +0000", // Julian - "1001-12-13", DateUtil.UTC); // Proleptic Gregorian + "1001-12-13", _DateUtil.UTC); // Proleptic Gregorian assertDateParsing( "AD 2006-12-31 00:00:00:0 +0000", null, - "2006-12-31Z", DateUtil.UTC); + "2006-12-31Z", _DateUtil.UTC); assertDateParsing( "AD 2006-12-31 00:00:00:0 +0000", - "2006-12-31", DateUtil.UTC); + "2006-12-31", _DateUtil.UTC); assertDateParsing( "AD 2006-01-01 00:00:00:0 +0000", null, - "2006-01-01Z", DateUtil.UTC); + "2006-01-01Z", _DateUtil.UTC); assertDateParsing( "AD 2006-01-01 00:00:00:0 +0000", - "2006-01-01", DateUtil.UTC); + "2006-01-01", _DateUtil.UTC); assertDateParsing( "AD 12006-01-01 00:00:00:0 +0000", - "12006-01-01", DateUtil.UTC); + "12006-01-01", _DateUtil.UTC); assertDateParsing( null, "AD 12006-01-01 00:00:00:0 +0000", - "120060101", DateUtil.UTC); + "120060101", _DateUtil.UTC); } public void testParseDateMalformed() { @@ -554,105 +552,105 @@ public class DateUtilTest extends TestCase { public void testParseTime() throws DateParseException { assertTimeParsing( "AD 1970-01-01 17:30:05:0 +0000", - "17:30:05", DateUtil.UTC); + "17:30:05", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 17:30:05:0 +0000", - "173005", DateUtil.UTC); + "173005", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:100 +0000", - "07:30:00.1", DateUtil.UTC); + "07:30:00.1", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:120 +0000", - "07:30:00.12", DateUtil.UTC); + "07:30:00.12", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "07:30:00.123", DateUtil.UTC); + "07:30:00.123", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "07:30:00.1235", DateUtil.UTC); + "07:30:00.1235", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "07:30:00.12346", DateUtil.UTC); + "07:30:00.12346", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 07:30:00:123 +0000", - "073000.12346", DateUtil.UTC); + "073000.12346", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 07:30:00:123 +0000", - "073000,12346", DateUtil.UTC); + "073000,12346", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:120 +0000", - "07:30:00.12", DateUtil.UTC); + "07:30:00.12", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 07:30:00:500 +0000", - "07:30:00.5", DateUtil.UTC); + "07:30:00.5", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 16:30:05:0 +0000", - "17:30:05+01:00", DateUtil.UTC); + "17:30:05+01:00", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:30:05:0 +0000", - "173005+01", DateUtil.UTC); + "173005+01", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 19:00:05:0 +0000", - "17:30:05-01:30", DateUtil.UTC); + "17:30:05-01:30", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 19:00:05:0 +0000", - "173005-0130", DateUtil.UTC); + "173005-0130", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 16:30:05:500 +0000", - "17:30:05.5+01:00", DateUtil.UTC); + "17:30:05.5+01:00", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:30:05:500 +0000", - "173005.5+0100", DateUtil.UTC); + "173005.5+0100", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:30:05:500 +0000", - "173005.5+01", DateUtil.UTC); + "173005.5+01", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:00:00:0 +0000", - "170000+01", DateUtil.UTC); + "170000+01", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:00:00:0 +0000", - "1700+01", DateUtil.UTC); + "1700+01", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-01 16:00:00:0 +0000", - "17+01", DateUtil.UTC); + "17+01", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 00:00:00:0 +0000", - "00:00:00", DateUtil.UTC); + "00:00:00", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-02 00:00:00:0 +0000", - "24:00:00", DateUtil.UTC); + "24:00:00", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-02 00:00:00:0 +0000", - "240000", DateUtil.UTC); + "240000", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-02 00:00:00:0 +0000", - "2400", DateUtil.UTC); + "2400", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-02 00:00:00:0 +0000", - "24:00", DateUtil.UTC); + "24:00", _DateUtil.UTC); assertTimeParsing( null, "AD 1970-01-02 00:00:00:0 +0000", - "24", DateUtil.UTC); + "24", _DateUtil.UTC); assertTimeParsing( "AD 1970-01-01 23:59:59:999 +0000", - "23:59:59.999", DateUtil.UTC); + "23:59:59.999", _DateUtil.UTC); } public void testParseTimeMalformed() { @@ -681,73 +679,73 @@ public class DateUtilTest extends TestCase { public void testParseDateTime() throws DateParseException { assertDateTimeParsing( "AD 1998-10-30 11:30:00:0 +0000", - "1998-10-30T15:30:00+04:00", DateUtil.UTC); + "1998-10-30T15:30:00+04:00", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 11:30:00:0 +0000", - "19981030T153000+0400", DateUtil.UTC); + "19981030T153000+0400", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 11:30:00:500 +0000", - "1998-10-30T15:30:00.5+04:00", DateUtil.UTC); + "1998-10-30T15:30:00.5+04:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 15:30:00:0 +0000", - "1998-10-30T15:30:00Z", DateUtil.UTC); + "1998-10-30T15:30:00Z", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 15:30:00:0 +0000", - "19981030T1530Z", DateUtil.UTC); + "19981030T1530Z", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 15:30:00:500 +0000", - "1998-10-30T15:30:00.5Z", DateUtil.UTC); + "1998-10-30T15:30:00.5Z", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 11:30:00:0 +0000", - "1998-10-30T15:30:00+04:00", DateUtil.UTC); + "1998-10-30T15:30:00+04:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 15:30:00:0 +0000", - "1998-10-30T15:30:00Z", DateUtil.UTC); + "1998-10-30T15:30:00Z", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 15:30:00:0 +0000", - "1998-10-30T15:30:00", DateUtil.UTC); + "1998-10-30T15:30:00", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 15:30:00:0 +0000", - "1998-10-30T15:30", DateUtil.UTC); + "1998-10-30T15:30", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-29 20:00:00:0 +0000", - "1998-10-30T00:00:00+04:00", DateUtil.UTC); + "1998-10-30T00:00:00+04:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 02:00:00:0 +0000", - "1998-10-30T00:00:00-02:00", DateUtil.UTC); + "1998-10-30T00:00:00-02:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 00:00:00:0 +0000", - "1998-10-30T00:00:00Z", DateUtil.UTC); + "1998-10-30T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-29 20:00:00:0 +0000", - "1998-10-30T00:00:00+04:00", DateUtil.UTC); + "1998-10-30T00:00:00+04:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1998-10-30 00:00:00:0 +0000", - "1998-10-30T00:00:00Z", DateUtil.UTC); + "1998-10-30T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 00:00:00:0 +0000", - "1998-10-30T00:00Z", DateUtil.UTC); + "1998-10-30T00:00Z", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 00:00:00:0 +0000", - "1998-10-30T00:00", DateUtil.UTC); + "1998-10-30T00:00", _DateUtil.UTC); assertDateTimeParsing( null, "AD 1998-10-30 00:00:00:0 +0000", - "19981030T00Z", DateUtil.UTC); + "19981030T00Z", _DateUtil.UTC); // BC years try { assertDateTimeParsing( "", null, - "0000-02-03T00:00:00Z", DateUtil.UTC); + "0000-02-03T00:00:00Z", _DateUtil.UTC); fail(); } catch (DateParseException e) { echo(e); @@ -755,67 +753,67 @@ public class DateUtilTest extends TestCase { assertDateTimeParsing( null, "BC 0001-02-05 00:00:00:0 +0000", - "0000-02-03T00:00:00Z", DateUtil.UTC); + "0000-02-03T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( "BC 0001-02-05 00:00:00:0 +0000", // Julian "BC 0002-02-05 00:00:00:0 +0000", // Julian - "-0001-02-03T00:00:00Z", DateUtil.UTC); // Proleptic Gregorian + "-0001-02-03T00:00:00Z", _DateUtil.UTC); // Proleptic Gregorian assertDateTimeParsing( "AD 0001-02-05 00:00:00:0 +0000", // Julian - "0001-02-03T00:00:00Z", DateUtil.UTC); // Proleptic Gregorian + "0001-02-03T00:00:00Z", _DateUtil.UTC); // Proleptic Gregorian assertDateTimeParsing( "AD 1001-12-07 00:00:00:0 +0000", // Julian - "1001-12-13T00:00:00Z", DateUtil.UTC); // Proleptic Gregorian + "1001-12-13T00:00:00Z", _DateUtil.UTC); // Proleptic Gregorian assertDateTimeParsing( "AD 11001-12-13 00:00:00:0 +0000", - "11001-12-13T00:00:00Z", DateUtil.UTC); + "11001-12-13T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( null, "AD 11001-12-13 00:00:00:0 +0000", - "110011213T00Z", DateUtil.UTC); + "110011213T00Z", _DateUtil.UTC); assertDateTimeParsing( "AD 2006-12-31 00:00:00:0 +0000", - "2006-12-31T00:00:00Z", DateUtil.UTC); + "2006-12-31T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( "AD 2006-01-01 00:00:00:0 +0000", - "2006-01-01T00:00:00Z", DateUtil.UTC); + "2006-01-01T00:00:00Z", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "1970-01-01T07:30:00.123", DateUtil.UTC); + "1970-01-01T07:30:00.123", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "1970-01-01T07:30:00.1235", DateUtil.UTC); + "1970-01-01T07:30:00.1235", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 07:30:00:123 +0000", - "1970-01-01T07:30:00.12346", DateUtil.UTC); + "1970-01-01T07:30:00.12346", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 07:30:00:120 +0000", - "1970-01-01T07:30:00.12", DateUtil.UTC); + "1970-01-01T07:30:00.12", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 07:30:00:500 +0000", - "1970-01-01T07:30:00.5", DateUtil.UTC); + "1970-01-01T07:30:00.5", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 16:30:05:0 +0000", - "1970-01-01T17:30:05+01:00", DateUtil.UTC); + "1970-01-01T17:30:05+01:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 16:30:05:500 +0000", - "1970-01-01T17:30:05.5+01:00", DateUtil.UTC); + "1970-01-01T17:30:05.5+01:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 00:00:00:0 +0000", - "1970-01-01T00:00:00", DateUtil.UTC); + "1970-01-01T00:00:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-02 00:00:00:0 +0000", - "1970-01-01T24:00:00", DateUtil.UTC); + "1970-01-01T24:00:00", _DateUtil.UTC); assertDateTimeParsing( "AD 1970-01-01 23:59:59:999 +0000", - "1970-01-01T23:59:59.999", DateUtil.UTC); + "1970-01-01T23:59:59.999", _DateUtil.UTC); } public void testParseDateTimeMalformed() throws DateParseException { @@ -834,54 +832,54 @@ public class DateUtilTest extends TestCase { public void testParseXSTimeZone() throws DateParseException { assertEquals(0, - DateUtil.parseXSTimeZone("Z").getOffset(0)); + _DateUtil.parseXSTimeZone("Z").getOffset(0)); assertEquals(0, - DateUtil.parseXSTimeZone("-00:00").getOffset(0)); + _DateUtil.parseXSTimeZone("-00:00").getOffset(0)); assertEquals(0, - DateUtil.parseXSTimeZone("+00:00").getOffset(0)); + _DateUtil.parseXSTimeZone("+00:00").getOffset(0)); assertEquals(90 * 60 * 1000, - DateUtil.parseXSTimeZone("+01:30").getOffset(0)); + _DateUtil.parseXSTimeZone("+01:30").getOffset(0)); assertEquals(-4 * 60 * 60 * 1000, - DateUtil.parseXSTimeZone("-04:00").getOffset(0)); + _DateUtil.parseXSTimeZone("-04:00").getOffset(0)); assertEquals(((-23 * 60) - 59) * 60 * 1000, - DateUtil.parseXSTimeZone("-23:59").getOffset(0)); + _DateUtil.parseXSTimeZone("-23:59").getOffset(0)); assertEquals(((23 * 60) + 59) * 60 * 1000, - DateUtil.parseXSTimeZone("+23:59").getOffset(0)); + _DateUtil.parseXSTimeZone("+23:59").getOffset(0)); } public void testParseXSTimeZoneWrong() { try { - DateUtil.parseXSTimeZone("04:00").getOffset(0); + _DateUtil.parseXSTimeZone("04:00").getOffset(0); fail(); } catch (DateParseException e) { echo(e); } try { - DateUtil.parseXSTimeZone("-04:00x").getOffset(0); + _DateUtil.parseXSTimeZone("-04:00x").getOffset(0); fail(); } catch (DateParseException e) { echo(e); } try { - DateUtil.parseXSTimeZone("-04").getOffset(0); + _DateUtil.parseXSTimeZone("-04").getOffset(0); fail(); } catch (DateParseException e) { echo(e); } try { - DateUtil.parseXSTimeZone("+24:00").getOffset(0); + _DateUtil.parseXSTimeZone("+24:00").getOffset(0); fail(); } catch (DateParseException e) { echo(e); } try { - DateUtil.parseXSTimeZone("-24:00").getOffset(0); + _DateUtil.parseXSTimeZone("-24:00").getOffset(0); fail(); } catch (DateParseException e) { echo(e); } try { - DateUtil.parseXSTimeZone("-01:60").getOffset(0); + _DateUtil.parseXSTimeZone("-01:60").getOffset(0); fail(); } catch (DateParseException e) { echo(e); @@ -941,7 +939,7 @@ public class DateUtilTest extends TestCase { private void assertJavaxAndFTLXSDateTimesSame(String s) throws DateParseException { XMLGregorianCalendar xgc = datetypeFactory.newXMLGregorianCalendar(s); Date javaxDate = xgc.toGregorianCalendar().getTime(); - Date ftlDate = DateUtil.parseXSDateTime(s, TimeZone.getDefault(), cf2dc); + Date ftlDate = _DateUtil.parseXSDateTime(s, TimeZone.getDefault(), cf2dc); assertEquals(javaxDate, ftlDate); } @@ -954,12 +952,12 @@ public class DateUtilTest extends TestCase { if (expectedXS != null) { assertEquals( expectedXS, - df.format(DateUtil.parseXSDate(parsed, tz, cf2dc))); + df.format(_DateUtil.parseXSDate(parsed, tz, cf2dc))); } if (expectedISO8601 != null) { assertEquals( expectedISO8601, - df.format(DateUtil.parseISO8601Date(parsed, tz, cf2dc))); + df.format(_DateUtil.parseISO8601Date(parsed, tz, cf2dc))); } } @@ -972,12 +970,12 @@ public class DateUtilTest extends TestCase { if (expectedXS != null) { assertEquals( expectedXS, - df.format(DateUtil.parseXSDateTime(parsed, tz, cf2dc))); + df.format(_DateUtil.parseXSDateTime(parsed, tz, cf2dc))); } if (expectedISO8601 != null) { assertEquals( expectedISO8601, - df.format(DateUtil.parseISO8601DateTime(parsed, tz, cf2dc))); + df.format(_DateUtil.parseISO8601DateTime(parsed, tz, cf2dc))); } } @@ -990,25 +988,25 @@ public class DateUtilTest extends TestCase { if (expectedXS != null) { assertEquals( expectedXS, - df.format(DateUtil.parseXSTime(parsed, tz, cf2dc))); + df.format(_DateUtil.parseXSTime(parsed, tz, cf2dc))); } if (expectedISO8601 != null) { assertEquals( expectedISO8601, - df.format(DateUtil.parseISO8601Time(parsed, tz, cf2dc))); + df.format(_DateUtil.parseISO8601Time(parsed, tz, cf2dc))); } } private void assertDateMalformed(String parsed) { try { - DateUtil.parseXSDate(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseXSDate(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected echo(e); } try { - DateUtil.parseISO8601Date(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601Date(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected @@ -1018,14 +1016,14 @@ public class DateUtilTest extends TestCase { private void assertTimeMalformed(String parsed) { try { - DateUtil.parseXSTime(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseXSTime(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected echo(e); } try { - DateUtil.parseISO8601Time(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601Time(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected @@ -1035,14 +1033,14 @@ public class DateUtilTest extends TestCase { private void assertDateTimeMalformed(String parsed) { try { - DateUtil.parseXSDateTime(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseXSDateTime(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected echo(e); } try { - DateUtil.parseISO8601DateTime(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601DateTime(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected @@ -1052,7 +1050,7 @@ public class DateUtilTest extends TestCase { private void assertISO8601DateMalformed(String parsed) { try { - DateUtil.parseISO8601Date(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601Date(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected @@ -1062,7 +1060,7 @@ public class DateUtilTest extends TestCase { private void assertISO8601TimeMalformed(String parsed) { try { - DateUtil.parseISO8601Time(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601Time(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected @@ -1072,7 +1070,7 @@ public class DateUtilTest extends TestCase { private void assertISO8601DateTimeMalformed(String parsed) { try { - DateUtil.parseISO8601DateTime(parsed, DateUtil.UTC, cf2dc); + _DateUtil.parseISO8601DateTime(parsed, _DateUtil.UTC, cf2dc); fail(); } catch (DateParseException e) { // Expected http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/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 2295b98..3948f32 100644 --- a/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java +++ b/src/test/java/org/apache/freemarker/core/util/NumberUtilTest.java @@ -24,60 +24,60 @@ import java.math.BigInteger; import junit.framework.TestCase; -import org.apache.freemarker.core.util.NumberUtil; +import org.apache.freemarker.core.util._NumberUtil; import org.junit.Test; public class NumberUtilTest extends TestCase { @Test public void testGetSignum() { - assertEquals(1, NumberUtil.getSignum(Double.valueOf(Double.POSITIVE_INFINITY))); - assertEquals(1, NumberUtil.getSignum(Double.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(Double.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(Double.valueOf(-3))); - assertEquals(-1, NumberUtil.getSignum(Double.valueOf(Double.NEGATIVE_INFINITY))); + assertEquals(1, _NumberUtil.getSignum(Double.valueOf(Double.POSITIVE_INFINITY))); + assertEquals(1, _NumberUtil.getSignum(Double.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(Double.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(Double.valueOf(-3))); + assertEquals(-1, _NumberUtil.getSignum(Double.valueOf(Double.NEGATIVE_INFINITY))); try { - NumberUtil.getSignum(Double.valueOf(Double.NaN)); + _NumberUtil.getSignum(Double.valueOf(Double.NaN)); fail(); } catch (ArithmeticException e) { // expected } - assertEquals(1, NumberUtil.getSignum(Float.valueOf(Float.POSITIVE_INFINITY))); - assertEquals(1, NumberUtil.getSignum(Float.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(Float.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(Float.valueOf(-3))); - assertEquals(-1, NumberUtil.getSignum(Float.valueOf(Float.NEGATIVE_INFINITY))); + assertEquals(1, _NumberUtil.getSignum(Float.valueOf(Float.POSITIVE_INFINITY))); + assertEquals(1, _NumberUtil.getSignum(Float.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(Float.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(Float.valueOf(-3))); + assertEquals(-1, _NumberUtil.getSignum(Float.valueOf(Float.NEGATIVE_INFINITY))); try { - NumberUtil.getSignum(Float.valueOf(Float.NaN)); + _NumberUtil.getSignum(Float.valueOf(Float.NaN)); fail(); } catch (ArithmeticException e) { // expected } - assertEquals(1, NumberUtil.getSignum(Long.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(Long.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(Long.valueOf(-3))); + assertEquals(1, _NumberUtil.getSignum(Long.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(Long.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(Long.valueOf(-3))); - assertEquals(1, NumberUtil.getSignum(Integer.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(Integer.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(Integer.valueOf(-3))); + assertEquals(1, _NumberUtil.getSignum(Integer.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(Integer.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(Integer.valueOf(-3))); - assertEquals(1, NumberUtil.getSignum(Short.valueOf((short) 3))); - assertEquals(0, NumberUtil.getSignum(Short.valueOf((short) 0))); - assertEquals(-1, NumberUtil.getSignum(Short.valueOf((short) -3))); + assertEquals(1, _NumberUtil.getSignum(Short.valueOf((short) 3))); + assertEquals(0, _NumberUtil.getSignum(Short.valueOf((short) 0))); + assertEquals(-1, _NumberUtil.getSignum(Short.valueOf((short) -3))); - assertEquals(1, NumberUtil.getSignum(Byte.valueOf((byte) 3))); - assertEquals(0, NumberUtil.getSignum(Byte.valueOf((byte) 0))); - assertEquals(-1, NumberUtil.getSignum(Byte.valueOf((byte) -3))); + assertEquals(1, _NumberUtil.getSignum(Byte.valueOf((byte) 3))); + assertEquals(0, _NumberUtil.getSignum(Byte.valueOf((byte) 0))); + assertEquals(-1, _NumberUtil.getSignum(Byte.valueOf((byte) -3))); - assertEquals(1, NumberUtil.getSignum(BigDecimal.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(BigDecimal.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(BigDecimal.valueOf(-3))); + assertEquals(1, _NumberUtil.getSignum(BigDecimal.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(BigDecimal.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(BigDecimal.valueOf(-3))); - assertEquals(1, NumberUtil.getSignum(BigInteger.valueOf(3))); - assertEquals(0, NumberUtil.getSignum(BigInteger.valueOf(0))); - assertEquals(-1, NumberUtil.getSignum(BigInteger.valueOf(-3))); + assertEquals(1, _NumberUtil.getSignum(BigInteger.valueOf(3))); + assertEquals(0, _NumberUtil.getSignum(BigInteger.valueOf(0))); + assertEquals(-1, _NumberUtil.getSignum(BigInteger.valueOf(-3))); } @Test @@ -108,7 +108,7 @@ public class NumberUtilTest extends TestCase { }; for (BigDecimal n : ns) { - assertEquals(n.doubleValue() == n.longValue(), NumberUtil.isIntegerBigDecimal(n)); + assertEquals(n.doubleValue() == n.longValue(), _NumberUtil.isIntegerBigDecimal(n)); } } @@ -117,96 +117,96 @@ public class NumberUtilTest extends TestCase { public void testToIntExcact() { for (int n : new int[] { Integer.MIN_VALUE, Byte.MIN_VALUE, -1, 0, 1, Byte.MAX_VALUE, Integer.MAX_VALUE }) { if (n != Integer.MIN_VALUE && n != Integer.MAX_VALUE) { - assertEquals(n, NumberUtil.toIntExact(Byte.valueOf((byte) n))); - assertEquals(n, NumberUtil.toIntExact(Short.valueOf((short) n))); - assertEquals(n, NumberUtil.toIntExact(Float.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(Byte.valueOf((byte) n))); + assertEquals(n, _NumberUtil.toIntExact(Short.valueOf((short) n))); + assertEquals(n, _NumberUtil.toIntExact(Float.valueOf(n))); } - assertEquals(n, NumberUtil.toIntExact(Integer.valueOf(n))); - assertEquals(n, NumberUtil.toIntExact(Long.valueOf(n))); - assertEquals(n, NumberUtil.toIntExact(Double.valueOf(n))); - assertEquals(n, NumberUtil.toIntExact(BigDecimal.valueOf(n))); - assertEquals(n, NumberUtil.toIntExact(BigDecimal.valueOf(n * 10L).divide(BigDecimal.TEN))); - assertEquals(n, NumberUtil.toIntExact(BigInteger.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(Integer.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(Long.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(Double.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(BigDecimal.valueOf(n))); + assertEquals(n, _NumberUtil.toIntExact(BigDecimal.valueOf(n * 10L).divide(BigDecimal.TEN))); + assertEquals(n, _NumberUtil.toIntExact(BigInteger.valueOf(n))); } try { - NumberUtil.toIntExact(Long.valueOf(Integer.MIN_VALUE - 1L)); + _NumberUtil.toIntExact(Long.valueOf(Integer.MIN_VALUE - 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Long.valueOf(Integer.MAX_VALUE + 1L)); + _NumberUtil.toIntExact(Long.valueOf(Integer.MAX_VALUE + 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Float.valueOf(1.00001f)); + _NumberUtil.toIntExact(Float.valueOf(1.00001f)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Float.valueOf(Integer.MIN_VALUE - 129L)); + _NumberUtil.toIntExact(Float.valueOf(Integer.MIN_VALUE - 129L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Float.valueOf(Integer.MAX_VALUE)); + _NumberUtil.toIntExact(Float.valueOf(Integer.MAX_VALUE)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Double.valueOf(1.00001)); + _NumberUtil.toIntExact(Double.valueOf(1.00001)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Double.valueOf(Integer.MIN_VALUE - 1L)); + _NumberUtil.toIntExact(Double.valueOf(Integer.MIN_VALUE - 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(Double.valueOf(Integer.MAX_VALUE + 1L)); + _NumberUtil.toIntExact(Double.valueOf(Integer.MAX_VALUE + 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(new BigDecimal("100.000001")); + _NumberUtil.toIntExact(new BigDecimal("100.000001")); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(BigDecimal.valueOf(Integer.MIN_VALUE - 1L)); + _NumberUtil.toIntExact(BigDecimal.valueOf(Integer.MIN_VALUE - 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(BigDecimal.valueOf(Integer.MAX_VALUE + 1L)); + _NumberUtil.toIntExact(BigDecimal.valueOf(Integer.MAX_VALUE + 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(BigInteger.valueOf(Integer.MIN_VALUE - 1L)); + _NumberUtil.toIntExact(BigInteger.valueOf(Integer.MIN_VALUE - 1L)); fail(); } catch (ArithmeticException e) { // Expected } try { - NumberUtil.toIntExact(BigInteger.valueOf(Integer.MAX_VALUE + 1L)); + _NumberUtil.toIntExact(BigInteger.valueOf(Integer.MAX_VALUE + 1L)); fail(); } catch (ArithmeticException e) { // Expected http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/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 1814691..edabe26 100644 --- a/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java +++ b/src/test/java/org/apache/freemarker/core/util/StringUtilTest.java @@ -19,14 +19,18 @@ package org.apache.freemarker.core.util; -import static org.junit.Assert.*; +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 java.io.IOException; import java.io.StringWriter; import java.util.regex.Pattern; -import org.apache.freemarker.core.util.CollectionUtils; -import org.apache.freemarker.core.util.StringUtil; import org.hamcrest.Matchers; import org.junit.Test; @@ -34,7 +38,7 @@ public class StringUtilTest { @Test public void testV2319() { - assertEquals("\\n\\r\\f\\b\\t\\x00\\x19", StringUtil.javaScriptStringEnc("\n\r\f\b\t\u0000\u0019")); + assertEquals("\\n\\r\\f\\b\\t\\x00\\x19", _StringUtil.javaScriptStringEnc("\n\r\f\b\t\u0000\u0019")); } @Test @@ -85,17 +89,17 @@ public class StringUtilTest { @Test public void testSameStringsReturned() { String s = "==> I/m <safe>!"; - assertTrue(s == StringUtil.jsStringEnc(s, false)); // "==" because is must return the same object - assertTrue(s == StringUtil.jsStringEnc(s, true)); + assertTrue(s == _StringUtil.jsStringEnc(s, false)); // "==" because is must return the same object + assertTrue(s == _StringUtil.jsStringEnc(s, true)); s = ""; - assertTrue(s == StringUtil.jsStringEnc(s, false)); - assertTrue(s == StringUtil.jsStringEnc(s, true)); + assertTrue(s == _StringUtil.jsStringEnc(s, false)); + assertTrue(s == _StringUtil.jsStringEnc(s, true)); s = "\u00E1rv\u00EDzt\u0171r\u0151 \u3020"; - assertEquals(s, StringUtil.jsStringEnc(s, false)); - assertTrue(s == StringUtil.jsStringEnc(s, false)); - assertTrue(s == StringUtil.jsStringEnc(s, true)); + assertEquals(s, _StringUtil.jsStringEnc(s, false)); + assertTrue(s == _StringUtil.jsStringEnc(s, false)); + assertTrue(s == _StringUtil.jsStringEnc(s, true)); } @Test @@ -124,84 +128,84 @@ public class StringUtilTest { } private void assertEsc(String s, String javaScript, String json) { - assertEquals(javaScript, StringUtil.jsStringEnc(s, false)); - assertEquals(json, StringUtil.jsStringEnc(s, true)); + assertEquals(javaScript, _StringUtil.jsStringEnc(s, false)); + assertEquals(json, _StringUtil.jsStringEnc(s, true)); } private void assertFTLEsc(String s, String partAny, String partQuot, String partApos, String quoted) { - assertEquals(partAny, StringUtil.FTLStringLiteralEnc(s)); - assertEquals(partQuot, StringUtil.FTLStringLiteralEnc(s, '\"')); - assertEquals(partApos, StringUtil.FTLStringLiteralEnc(s, '\'')); - assertEquals(quoted, StringUtil.ftlQuote(s)); + assertEquals(partAny, _StringUtil.FTLStringLiteralEnc(s)); + assertEquals(partQuot, _StringUtil.FTLStringLiteralEnc(s, '\"')); + assertEquals(partApos, _StringUtil.FTLStringLiteralEnc(s, '\'')); + assertEquals(quoted, _StringUtil.ftlQuote(s)); } @Test public void testTrim() { - assertSame(CollectionUtils.EMPTY_CHAR_ARRAY, StringUtil.trim(CollectionUtils.EMPTY_CHAR_ARRAY)); - assertSame(CollectionUtils.EMPTY_CHAR_ARRAY, StringUtil.trim(" \t\u0001 ".toCharArray())); + assertSame(_CollectionUtil.EMPTY_CHAR_ARRAY, _StringUtil.trim(_CollectionUtil.EMPTY_CHAR_ARRAY)); + assertSame(_CollectionUtil.EMPTY_CHAR_ARRAY, _StringUtil.trim(" \t\u0001 ".toCharArray())); { char[] cs = "foo".toCharArray(); assertSame(cs, cs); } - assertArrayEquals("foo".toCharArray(), StringUtil.trim("foo ".toCharArray())); - assertArrayEquals("foo".toCharArray(), StringUtil.trim(" foo".toCharArray())); - assertArrayEquals("foo".toCharArray(), StringUtil.trim(" foo ".toCharArray())); - assertArrayEquals("foo".toCharArray(), StringUtil.trim("\t\tfoo \r\n".toCharArray())); - assertArrayEquals("x".toCharArray(), StringUtil.trim(" x ".toCharArray())); - assertArrayEquals("x y z".toCharArray(), StringUtil.trim(" x y z ".toCharArray())); + assertArrayEquals("foo".toCharArray(), _StringUtil.trim("foo ".toCharArray())); + assertArrayEquals("foo".toCharArray(), _StringUtil.trim(" foo".toCharArray())); + assertArrayEquals("foo".toCharArray(), _StringUtil.trim(" foo ".toCharArray())); + assertArrayEquals("foo".toCharArray(), _StringUtil.trim("\t\tfoo \r\n".toCharArray())); + assertArrayEquals("x".toCharArray(), _StringUtil.trim(" x ".toCharArray())); + assertArrayEquals("x y z".toCharArray(), _StringUtil.trim(" x y z ".toCharArray())); } @Test public void testIsTrimmedToEmpty() { - assertTrue(StringUtil.isTrimmableToEmpty("".toCharArray())); - assertTrue(StringUtil.isTrimmableToEmpty("\r\r\n\u0001".toCharArray())); - assertFalse(StringUtil.isTrimmableToEmpty("x".toCharArray())); - assertFalse(StringUtil.isTrimmableToEmpty(" x ".toCharArray())); + assertTrue(_StringUtil.isTrimmableToEmpty("".toCharArray())); + assertTrue(_StringUtil.isTrimmableToEmpty("\r\r\n\u0001".toCharArray())); + assertFalse(_StringUtil.isTrimmableToEmpty("x".toCharArray())); + assertFalse(_StringUtil.isTrimmableToEmpty(" x ".toCharArray())); } @Test public void testJQuote() { - assertEquals("null", StringUtil.jQuote(null)); - assertEquals("\"foo\"", StringUtil.jQuote("foo")); - assertEquals("\"123\"", StringUtil.jQuote(Integer.valueOf(123))); + assertEquals("null", _StringUtil.jQuote(null)); + assertEquals("\"foo\"", _StringUtil.jQuote("foo")); + assertEquals("\"123\"", _StringUtil.jQuote(Integer.valueOf(123))); assertEquals("\"foo's \\\"bar\\\"\"", - StringUtil.jQuote("foo's \"bar\"")); + _StringUtil.jQuote("foo's \"bar\"")); assertEquals("\"\\n\\r\\t\\u0001\"", - StringUtil.jQuote("\n\r\t\u0001")); + _StringUtil.jQuote("\n\r\t\u0001")); assertEquals("\"<\\nb\\rc\\td\\u0001>\"", - StringUtil.jQuote("<\nb\rc\td\u0001>")); + _StringUtil.jQuote("<\nb\rc\td\u0001>")); } @Test public void testJQuoteNoXSS() { - assertEquals("null", StringUtil.jQuoteNoXSS(null)); - assertEquals("\"foo\"", StringUtil.jQuoteNoXSS("foo")); - assertEquals("\"123\"", StringUtil.jQuoteNoXSS(Integer.valueOf(123))); + assertEquals("null", _StringUtil.jQuoteNoXSS(null)); + assertEquals("\"foo\"", _StringUtil.jQuoteNoXSS("foo")); + assertEquals("\"123\"", _StringUtil.jQuoteNoXSS(Integer.valueOf(123))); assertEquals("\"foo's \\\"bar\\\"\"", - StringUtil.jQuoteNoXSS("foo's \"bar\"")); + _StringUtil.jQuoteNoXSS("foo's \"bar\"")); assertEquals("\"\\n\\r\\t\\u0001\"", - StringUtil.jQuoteNoXSS("\n\r\t\u0001")); + _StringUtil.jQuoteNoXSS("\n\r\t\u0001")); assertEquals("\"\\u003C\\nb\\rc\\td\\u0001>\"", - StringUtil.jQuoteNoXSS("<\nb\rc\td\u0001>")); + _StringUtil.jQuoteNoXSS("<\nb\rc\td\u0001>")); assertEquals("\"\\u003C\\nb\\rc\\td\\u0001>\"", - StringUtil.jQuoteNoXSS((Object) "<\nb\rc\td\u0001>")); + _StringUtil.jQuoteNoXSS((Object) "<\nb\rc\td\u0001>")); } @Test public void testFTLStringLiteralEnc() { - assertEquals("", StringUtil.FTLStringLiteralEnc("")); - assertEquals("abc", StringUtil.FTLStringLiteralEnc("abc")); - assertEquals("{", StringUtil.FTLStringLiteralEnc("{")); - assertEquals("a{b}c", StringUtil.FTLStringLiteralEnc("a{b}c")); - assertEquals("a#b", StringUtil.FTLStringLiteralEnc("a#b")); - assertEquals("a$b", StringUtil.FTLStringLiteralEnc("a$b")); - assertEquals("a#\\{b}c", StringUtil.FTLStringLiteralEnc("a#{b}c")); - assertEquals("a$\\{b}c", StringUtil.FTLStringLiteralEnc("a${b}c")); - assertEquals("a'c\\\"d", StringUtil.FTLStringLiteralEnc("a'c\"d", '"')); - assertEquals("a\\'c\"d", StringUtil.FTLStringLiteralEnc("a'c\"d", '\'')); - assertEquals("a\\'c\"d", StringUtil.FTLStringLiteralEnc("a'c\"d", '\'')); - assertEquals("\\n\\r\\t\\f\\x0002\\\\", StringUtil.FTLStringLiteralEnc("\n\r\t\f\u0002\\")); - assertEquals("\\l\\g\\a", StringUtil.FTLStringLiteralEnc("<>&")); + assertEquals("", _StringUtil.FTLStringLiteralEnc("")); + assertEquals("abc", _StringUtil.FTLStringLiteralEnc("abc")); + assertEquals("{", _StringUtil.FTLStringLiteralEnc("{")); + assertEquals("a{b}c", _StringUtil.FTLStringLiteralEnc("a{b}c")); + assertEquals("a#b", _StringUtil.FTLStringLiteralEnc("a#b")); + assertEquals("a$b", _StringUtil.FTLStringLiteralEnc("a$b")); + assertEquals("a#\\{b}c", _StringUtil.FTLStringLiteralEnc("a#{b}c")); + assertEquals("a$\\{b}c", _StringUtil.FTLStringLiteralEnc("a${b}c")); + assertEquals("a'c\\\"d", _StringUtil.FTLStringLiteralEnc("a'c\"d", '"')); + assertEquals("a\\'c\"d", _StringUtil.FTLStringLiteralEnc("a'c\"d", '\'')); + assertEquals("a\\'c\"d", _StringUtil.FTLStringLiteralEnc("a'c\"d", '\'')); + assertEquals("\\n\\r\\t\\f\\x0002\\\\", _StringUtil.FTLStringLiteralEnc("\n\r\t\f\u0002\\")); + assertEquals("\\l\\g\\a", _StringUtil.FTLStringLiteralEnc("<>&")); } @Test @@ -243,34 +247,34 @@ public class StringUtilTest { assertGlobMatches("**/a??/b*.ftl", "a11/b1.ftl", "x/a11/b123.ftl", "x/y/a11/b.ftl"); assertGlobDoesNotMatch("**/a??/b*.ftl", "a1/b1.ftl", "x/a11/c123.ftl"); - assertFalse(StringUtil.globToRegularExpression("ab*").matcher("aBc").matches()); - assertTrue(StringUtil.globToRegularExpression("ab*", true).matcher("aBc").matches()); - assertTrue(StringUtil.globToRegularExpression("ab", true).matcher("aB").matches()); - assertTrue(StringUtil.globToRegularExpression("\u00E1b*", true).matcher("\u00C1bc").matches()); + assertFalse(_StringUtil.globToRegularExpression("ab*").matcher("aBc").matches()); + assertTrue(_StringUtil.globToRegularExpression("ab*", true).matcher("aBc").matches()); + assertTrue(_StringUtil.globToRegularExpression("ab", true).matcher("aB").matches()); + assertTrue(_StringUtil.globToRegularExpression("\u00E1b*", true).matcher("\u00C1bc").matches()); try { - StringUtil.globToRegularExpression("x**/y"); + _StringUtil.globToRegularExpression("x**/y"); fail(); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("**")); } try { - StringUtil.globToRegularExpression("**y"); + _StringUtil.globToRegularExpression("**y"); fail(); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("**")); } try { - StringUtil.globToRegularExpression("[ab]c"); + _StringUtil.globToRegularExpression("[ab]c"); fail(); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("unsupported")); } try { - StringUtil.globToRegularExpression("{aa,bb}c"); + _StringUtil.globToRegularExpression("{aa,bb}c"); fail(); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), Matchers.containsString("unsupported")); @@ -278,7 +282,7 @@ public class StringUtilTest { } private void assertGlobMatches(String glob, String... ss) { - Pattern pattern = StringUtil.globToRegularExpression(glob); + Pattern pattern = _StringUtil.globToRegularExpression(glob); for (String s : ss) { if (!pattern.matcher(s).matches()) { fail("Glob " + glob + " (regexp: " + pattern + ") doesn't match " + s); @@ -287,7 +291,7 @@ public class StringUtilTest { } private void assertGlobDoesNotMatch(String glob, String... ss) { - Pattern pattern = StringUtil.globToRegularExpression(glob); + Pattern pattern = _StringUtil.globToRegularExpression(glob); for (String s : ss) { if (pattern.matcher(s).matches()) { fail("Glob " + glob + " (regexp: " + pattern + ") matches " + s); @@ -298,27 +302,27 @@ public class StringUtilTest { @Test public void testHTMLEnc() { String s = ""; - assertSame(s, StringUtil.HTMLEnc(s)); + assertSame(s, _StringUtil.XMLEncNA(s)); s = "asd"; - assertSame(s, StringUtil.HTMLEnc(s)); + assertSame(s, _StringUtil.XMLEncNA(s)); - assertEquals("a&b<c>d"e'f", StringUtil.HTMLEnc("a&b<c>d\"e'f")); - assertEquals("<", StringUtil.HTMLEnc("<")); - assertEquals("<a", StringUtil.HTMLEnc("<a")); - assertEquals("<a>", StringUtil.HTMLEnc("<a>")); - assertEquals("a>", StringUtil.HTMLEnc("a>")); - assertEquals("<>", StringUtil.HTMLEnc("<>")); - assertEquals("a<>b", StringUtil.HTMLEnc("a<>b")); + assertEquals("a&b<c>d"e'f", _StringUtil.XMLEncNA("a&b<c>d\"e'f")); + assertEquals("<", _StringUtil.XMLEncNA("<")); + assertEquals("<a", _StringUtil.XMLEncNA("<a")); + assertEquals("<a>", _StringUtil.XMLEncNA("<a>")); + assertEquals("a>", _StringUtil.XMLEncNA("a>")); + assertEquals("<>", _StringUtil.XMLEncNA("<>")); + assertEquals("a<>b", _StringUtil.XMLEncNA("a<>b")); } @Test public void testXHTMLEnc() throws IOException { String s = ""; - assertSame(s, StringUtil.XHTMLEnc(s)); + assertSame(s, _StringUtil.XHTMLEnc(s)); s = "asd"; - assertSame(s, StringUtil.XHTMLEnc(s)); + assertSame(s, _StringUtil.XHTMLEnc(s)); testXHTMLEnc("a&b<c>d"e'f", "a&b<c>d\"e'f"); testXHTMLEnc("<", "<"); @@ -330,20 +334,20 @@ public class StringUtilTest { } private void testXHTMLEnc(String expected, String in) throws IOException { - assertEquals(expected, StringUtil.XHTMLEnc(in)); + assertEquals(expected, _StringUtil.XHTMLEnc(in)); StringWriter sw = new StringWriter(); - StringUtil.XHTMLEnc(in, sw); + _StringUtil.XHTMLEnc(in, sw); assertEquals(expected, sw.toString()); } @Test public void testXMLEnc() throws IOException { String s = ""; - assertSame(s, StringUtil.XMLEnc(s)); + assertSame(s, _StringUtil.XMLEnc(s)); s = "asd"; - assertSame(s, StringUtil.XMLEnc(s)); + assertSame(s, _StringUtil.XMLEnc(s)); testXMLEnc("a&b<c>d"e'f", "a&b<c>d\"e'f"); testXMLEnc("<", "<"); @@ -355,61 +359,61 @@ public class StringUtilTest { } private void testXMLEnc(String expected, String in) throws IOException { - assertEquals(expected, StringUtil.XMLEnc(in)); + assertEquals(expected, _StringUtil.XMLEnc(in)); StringWriter sw = new StringWriter(); - StringUtil.XMLEnc(in, sw); + _StringUtil.XMLEnc(in, sw); assertEquals(expected, sw.toString()); } @Test public void testXMLEncQAttr() throws IOException { String s = ""; - assertSame(s, StringUtil.XMLEncQAttr(s)); + assertSame(s, _StringUtil.XMLEncQAttr(s)); s = "asd"; - assertSame(s, StringUtil.XMLEncQAttr(s)); + assertSame(s, _StringUtil.XMLEncQAttr(s)); - assertEquals("a&b<c>d"e'f", StringUtil.XMLEncQAttr("a&b<c>d\"e'f")); - assertEquals("<", StringUtil.XMLEncQAttr("<")); - assertEquals("<a", StringUtil.XMLEncQAttr("<a")); - assertEquals("<a>", StringUtil.XMLEncQAttr("<a>")); - assertEquals("a>", StringUtil.XMLEncQAttr("a>")); - assertEquals("<>", StringUtil.XMLEncQAttr("<>")); - assertEquals("a<>b", StringUtil.XMLEncQAttr("a<>b")); + assertEquals("a&b<c>d"e'f", _StringUtil.XMLEncQAttr("a&b<c>d\"e'f")); + assertEquals("<", _StringUtil.XMLEncQAttr("<")); + assertEquals("<a", _StringUtil.XMLEncQAttr("<a")); + assertEquals("<a>", _StringUtil.XMLEncQAttr("<a>")); + assertEquals("a>", _StringUtil.XMLEncQAttr("a>")); + assertEquals("<>", _StringUtil.XMLEncQAttr("<>")); + assertEquals("a<>b", _StringUtil.XMLEncQAttr("a<>b")); } @Test public void testXMLEncNQG() throws IOException { String s = ""; - assertSame(s, StringUtil.XMLEncNQG(s)); + assertSame(s, _StringUtil.XMLEncNQG(s)); s = "asd"; - assertSame(s, StringUtil.XMLEncNQG(s)); + assertSame(s, _StringUtil.XMLEncNQG(s)); - assertEquals("a&b<c>d\"e'f", StringUtil.XMLEncNQG("a&b<c>d\"e'f")); - assertEquals("<", StringUtil.XMLEncNQG("<")); - assertEquals("<a", StringUtil.XMLEncNQG("<a")); - assertEquals("<a>", StringUtil.XMLEncNQG("<a>")); - assertEquals("a>", StringUtil.XMLEncNQG("a>")); - assertEquals("<>", StringUtil.XMLEncNQG("<>")); - assertEquals("a<>b", StringUtil.XMLEncNQG("a<>b")); + assertEquals("a&b<c>d\"e'f", _StringUtil.XMLEncNQG("a&b<c>d\"e'f")); + assertEquals("<", _StringUtil.XMLEncNQG("<")); + assertEquals("<a", _StringUtil.XMLEncNQG("<a")); + assertEquals("<a>", _StringUtil.XMLEncNQG("<a>")); + assertEquals("a>", _StringUtil.XMLEncNQG("a>")); + assertEquals("<>", _StringUtil.XMLEncNQG("<>")); + assertEquals("a<>b", _StringUtil.XMLEncNQG("a<>b")); - assertEquals(">", StringUtil.XMLEncNQG(">")); - assertEquals("]>", StringUtil.XMLEncNQG("]>")); - assertEquals("]]>", StringUtil.XMLEncNQG("]]>")); - assertEquals("x]]>", StringUtil.XMLEncNQG("x]]>")); - assertEquals("x]>", StringUtil.XMLEncNQG("x]>")); - assertEquals("]x>", StringUtil.XMLEncNQG("]x>")); + assertEquals(">", _StringUtil.XMLEncNQG(">")); + assertEquals("]>", _StringUtil.XMLEncNQG("]>")); + assertEquals("]]>", _StringUtil.XMLEncNQG("]]>")); + assertEquals("x]]>", _StringUtil.XMLEncNQG("x]]>")); + assertEquals("x]>", _StringUtil.XMLEncNQG("x]>")); + assertEquals("]x>", _StringUtil.XMLEncNQG("]x>")); } @Test public void testRTFEnc() throws IOException { String s = ""; - assertSame(s, StringUtil.RTFEnc(s)); + assertSame(s, _StringUtil.RTFEnc(s)); s = "asd"; - assertSame(s, StringUtil.RTFEnc(s)); + assertSame(s, _StringUtil.RTFEnc(s)); testRTFEnc("a\\{b\\}c\\\\d", "a{b}c\\d"); testRTFEnc("\\{", "{"); @@ -421,10 +425,10 @@ public class StringUtilTest { } private void testRTFEnc(String expected, String in) throws IOException { - assertEquals(expected, StringUtil.RTFEnc(in)); + assertEquals(expected, _StringUtil.RTFEnc(in)); StringWriter sw = new StringWriter(); - StringUtil.RTFEnc(in, sw); + _StringUtil.RTFEnc(in, sw); assertEquals(expected, sw.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a5d9575f/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 38e231a..f274391 100644 --- a/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java +++ b/src/test/java/org/apache/freemarker/manualtest/TemplateConfigurationExamples.java @@ -36,7 +36,7 @@ import org.apache.freemarker.core.templateresolver.FirstMatchTemplateConfigurati import org.apache.freemarker.core.templateresolver.MergingTemplateConfigurationFactory; import org.apache.freemarker.core.templateresolver.OrMatcher; import org.apache.freemarker.core.templateresolver.PathGlobMatcher; -import org.apache.freemarker.core.util.DateUtil; +import org.apache.freemarker.core.util._DateUtil; import org.junit.Test; public class TemplateConfigurationExamples extends ExamplesTest { @@ -128,7 +128,7 @@ public class TemplateConfigurationExamples extends ExamplesTest { tcStats.setDateTimeFormat("iso"); tcStats.setDateFormat("iso"); tcStats.setTimeFormat("iso"); - tcStats.setTimeZone(DateUtil.UTC); + tcStats.setTimeZone(_DateUtil.UTC); TemplateConfiguration tcMail = new TemplateConfiguration(); tcMail.setEncoding("utf-8");
