Renamed XxxUtil classes to XxxUtils, as this convention is more widespread nowadays.
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ebb39b84 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ebb39b84 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ebb39b84 Branch: refs/heads/3 Commit: ebb39b8457918dcf58211edeb45e6eaaf6e0b0dc Parents: cfd3796 Author: ddekany <ddek...@apache.org> Authored: Tue Aug 8 19:56:35 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Tue Aug 8 19:56:35 2017 +0200 ---------------------------------------------------------------------- .../core/FM2ASTToFM3SourceConverter.java | 22 +- .../core/UnexpectedNodeContentException.java | 6 +- .../apache/freemarker/converter/Converter.java | 4 +- .../freemarker/converter/ConverterUtilTest.java | 24 - .../org/apache/freemarker/core/ASTPrinter.java | 10 +- .../org/apache/freemarker/core/ASTTest.java | 8 +- .../freemarker/core/ConfigurationTest.java | 10 +- .../freemarker/core/CoreLocaleUtilsTest.java | 22 +- ...leParsingAndProcessingConfigurationTest.java | 4 +- .../MutableProcessingConfigurationTest.java | 30 +- .../core/ParsingErrorMessagesTest.java | 6 +- .../apache/freemarker/core/SQLTimeZoneTest.java | 10 +- .../core/TagSyntaxVariationsTest.java | 6 +- .../DefaultObjectWrapperSingletonsTest.java | 4 +- .../core/model/impl/IsApplicableTest.java | 2 +- .../impl/IsMoreSpecificParameterTypeTest.java | 100 +- .../model/impl/MiscNumericalOperationsTest.java | 2 +- .../model/impl/ModelAPINewInstanceTest.java | 6 +- .../model/impl/OverloadedNumberUtilTest.java | 585 ------- .../model/impl/OverloadedNumberUtilsTest.java | 585 +++++++ .../impl/ParameterListPreferabilityTest.java | 12 +- .../templatesuite/models/JavaObjectInfo.java | 4 +- .../models/OverloadedMethods2.java | 146 +- .../BaseNTemplateNumberFormatFactory.java | 10 +- .../core/userpkg/CustomHTMLOutputFormat.java | 4 +- ...EpochMillisDivTemplateDateFormatFactory.java | 4 +- .../HTMLISOTemplateDateFormatFactory.java | 18 +- .../userpkg/HexTemplateNumberFormatFactory.java | 4 +- .../PrintfGTemplateNumberFormatFactory.java | 4 +- .../core/userpkg/TestTemplateCallableModel.java | 4 +- .../core/util/CollectionUtilTest.java | 43 - .../core/util/CollectionUtilsTest.java | 43 + .../freemarker/core/util/DateUtilTest.java | 1085 ------------ .../freemarker/core/util/DateUtilsTest.java | 1085 ++++++++++++ .../freemarker/core/util/NumberUtilTest.java | 215 --- .../freemarker/core/util/NumberUtilsTest.java | 215 +++ .../freemarker/core/util/StringUtilTest.java | 416 ----- .../freemarker/core/util/StringUtilsTest.java | 416 +++++ .../org/apache/freemarker/core/ASTComment.java | 4 +- .../freemarker/core/ASTDirAssignment.java | 6 +- .../apache/freemarker/core/ASTDirEscape.java | 4 +- .../apache/freemarker/core/ASTDirImport.java | 4 +- .../apache/freemarker/core/ASTDirInclude.java | 4 +- .../org/apache/freemarker/core/ASTDirItems.java | 6 +- .../org/apache/freemarker/core/ASTDirList.java | 6 +- .../freemarker/core/ASTDirMacroOrFunction.java | 14 +- .../apache/freemarker/core/ASTDirSetting.java | 10 +- .../apache/freemarker/core/ASTDirSwitch.java | 4 +- .../freemarker/core/ASTDollarInterpolation.java | 2 +- .../freemarker/core/ASTDynamicTopLevelCall.java | 12 +- .../freemarker/core/ASTExpAddOrConcat.java | 16 +- .../freemarker/core/ASTExpArithmetic.java | 2 +- .../freemarker/core/ASTExpBooleanLiteral.java | 4 +- .../apache/freemarker/core/ASTExpBuiltIn.java | 76 +- .../freemarker/core/ASTExpBuiltInVariable.java | 8 +- .../freemarker/core/ASTExpComparison.java | 14 +- .../org/apache/freemarker/core/ASTExpDot.java | 4 +- .../freemarker/core/ASTExpDynamicKeyName.java | 2 +- .../freemarker/core/ASTExpFunctionCall.java | 4 +- .../freemarker/core/ASTExpStringLiteral.java | 4 +- .../apache/freemarker/core/ASTExpVariable.java | 4 +- .../apache/freemarker/core/ASTExpression.java | 14 +- .../org/apache/freemarker/core/ASTNode.java | 4 +- .../apache/freemarker/core/ASTStaticText.java | 20 +- .../apache/freemarker/core/BuiltInForDate.java | 2 +- .../core/BuiltInForLegacyEscaping.java | 2 +- .../freemarker/core/BuiltInsForDates.java | 18 +- .../core/BuiltInsForMultipleTypes.java | 18 +- .../freemarker/core/BuiltInsForNodes.java | 4 +- .../freemarker/core/BuiltInsForNumbers.java | 16 +- .../core/BuiltInsForOutputFormatRelated.java | 2 +- .../freemarker/core/BuiltInsForSequences.java | 16 +- .../core/BuiltInsForStringsBasic.java | 20 +- .../core/BuiltInsForStringsEncoding.java | 22 +- .../freemarker/core/BuiltInsForStringsMisc.java | 20 +- .../core/BuiltInsForStringsRegexp.java | 4 +- .../core/BuiltInsWithParseTimeParameters.java | 4 +- .../apache/freemarker/core/Configuration.java | 48 +- .../core/CoreSettingValueNotSetException.java | 4 +- .../core/CustomSettingValueNotSetException.java | 4 +- .../org/apache/freemarker/core/Environment.java | 62 +- .../core/InvalidSettingNameException.java | 8 +- .../core/InvalidSettingValueException.java | 6 +- .../org/apache/freemarker/core/MessageUtil.java | 344 ---- .../apache/freemarker/core/MessageUtils.java | 344 ++++ .../org/apache/freemarker/core/MiscUtil.java | 69 - ...utableParsingAndProcessingConfiguration.java | 6 +- .../core/MutableProcessingConfiguration.java | 36 +- .../core/NonSequenceOrCollectionException.java | 4 +- .../apache/freemarker/core/ParseException.java | 10 +- .../apache/freemarker/core/RegexpHelper.java | 4 +- .../org/apache/freemarker/core/Template.java | 10 +- .../freemarker/core/TemplateBooleanFormat.java | 8 +- .../freemarker/core/TemplateClassResolver.java | 8 +- .../freemarker/core/TemplateConfiguration.java | 12 +- .../core/TemplateElementArrayBuilder.java | 4 +- .../freemarker/core/TemplateException.java | 16 +- .../core/TemplateExceptionHandler.java | 4 +- .../freemarker/core/TemplateLanguage.java | 4 +- .../org/apache/freemarker/core/Version.java | 8 +- .../apache/freemarker/core/_CallableUtils.java | 6 +- .../apache/freemarker/core/_DelayedAOrAn.java | 2 +- .../apache/freemarker/core/_DelayedJQuote.java | 4 +- .../freemarker/core/_DelayedJQuotedListing.java | 4 +- .../freemarker/core/_DelayedShortClassName.java | 4 +- .../core/_ErrorDescriptionBuilder.java | 22 +- .../org/apache/freemarker/core/_EvalUtil.java | 545 ------ .../org/apache/freemarker/core/_EvalUtils.java | 545 ++++++ ...ObjectBuilderSettingEvaluationException.java | 4 +- .../core/_ObjectBuilderSettingEvaluator.java | 32 +- .../core/_TemplateModelException.java | 4 +- .../impl/BigDecimalArithmeticEngine.java | 28 +- .../impl/ConservativeArithmeticEngine.java | 26 +- .../freemarker/core/debug/DebuggerServer.java | 6 +- .../freemarker/core/debug/_DebuggerService.java | 4 +- .../core/model/impl/ArgumentTypes.java | 36 +- .../freemarker/core/model/impl/BeanModel.java | 4 +- .../core/model/impl/ClassBasedModelFactory.java | 4 +- .../core/model/impl/ClassIntrospector.java | 2 +- .../core/model/impl/DefaultObjectWrapper.java | 38 +- .../DefaultObjectWrapperTCCLSingletonUtil.java | 129 -- .../DefaultObjectWrapperTCCLSingletonUtils.java | 129 ++ .../model/impl/OverloadedJavaMethodModel.java | 2 +- .../core/model/impl/OverloadedMethods.java | 6 +- .../model/impl/OverloadedMethodsSubset.java | 14 +- .../core/model/impl/OverloadedNumberUtil.java | 1289 -------------- .../core/model/impl/OverloadedNumberUtils.java | 1289 ++++++++++++++ .../ReflectionCallableMemberDescriptor.java | 4 +- .../model/impl/RestrictedObjectWrapper.java | 4 +- .../core/model/impl/SimpleJavaMethodModel.java | 2 +- .../core/model/impl/SimpleMethod.java | 16 +- .../core/model/impl/UnsafeMethods.java | 6 +- .../freemarker/core/model/impl/_MethodUtil.java | 319 ---- .../core/model/impl/_MethodUtils.java | 319 ++++ .../freemarker/core/model/impl/_ModelAPI.java | 8 +- .../core/outputformat/OutputFormat.java | 8 +- .../outputformat/impl/HTMLOutputFormat.java | 8 +- .../core/outputformat/impl/RTFOutputFormat.java | 8 +- .../outputformat/impl/XHTMLOutputFormat.java | 8 +- .../core/outputformat/impl/XMLOutputFormat.java | 8 +- .../templateresolver/FileNameGlobMatcher.java | 6 +- .../FirstMatchTemplateConfigurationFactory.java | 4 +- .../MalformedTemplateNameException.java | 4 +- .../core/templateresolver/PathGlobMatcher.java | 8 +- .../core/templateresolver/PathRegexMatcher.java | 4 +- .../impl/ByteArrayTemplateLoader.java | 4 +- .../impl/ClassTemplateLoader.java | 6 +- .../impl/DefaultTemplateNameFormat.java | 4 +- .../impl/DefaultTemplateResolver.java | 16 +- .../impl/FileTemplateLoader.java | 10 +- .../impl/StringTemplateLoader.java | 4 +- .../core/util/DuplicateStringKeyException.java | 2 +- .../apache/freemarker/core/util/FTLUtil.java | 4 +- .../core/util/OptInTemplateClassResolver.java | 14 +- .../freemarker/core/util/StringToIndexMap.java | 2 +- .../util/UnrecognizedTimeZoneException.java | 2 +- .../apache/freemarker/core/util/_ClassUtil.java | 168 -- .../freemarker/core/util/_ClassUtils.java | 168 ++ .../freemarker/core/util/_CollectionUtil.java | 220 --- .../freemarker/core/util/_CollectionUtils.java | 220 +++ .../apache/freemarker/core/util/_DateUtil.java | 914 ---------- .../apache/freemarker/core/util/_DateUtils.java | 914 ++++++++++ .../freemarker/core/util/_JavaVersions.java | 2 +- .../freemarker/core/util/_LocaleUtil.java | 43 - .../freemarker/core/util/_LocaleUtils.java | 43 + .../freemarker/core/util/_NumberUtil.java | 224 --- .../freemarker/core/util/_NumberUtils.java | 224 +++ .../freemarker/core/util/_SecurityUtil.java | 87 - .../freemarker/core/util/_SecurityUtils.java | 87 + .../freemarker/core/util/_StringUtil.java | 1625 ------------------ .../freemarker/core/util/_StringUtils.java | 1625 ++++++++++++++++++ .../core/valueformat/TemplateFormatUtil.java | 6 +- .../impl/AliasTemplateDateFormatFactory.java | 8 +- .../impl/AliasTemplateNumberFormatFactory.java | 8 +- .../impl/ExtendedDecimalFormatParser.java | 8 +- .../impl/ISOLikeTemplateDateFormat.java | 28 +- .../impl/ISOLikeTemplateDateFormatFactory.java | 8 +- .../valueformat/impl/ISOTemplateDateFormat.java | 16 +- .../valueformat/impl/XSTemplateDateFormat.java | 16 +- freemarker-core/src/main/javacc/FTL.jj | 12 +- .../apache/freemarker/dom/DocumentModel.java | 2 +- .../apache/freemarker/dom/DomStringUtil.java | 67 - .../apache/freemarker/dom/DomStringUtils.java | 67 + .../org/apache/freemarker/dom/ElementModel.java | 8 +- .../apache/freemarker/dom/NodeListModel.java | 4 +- .../apache/freemarker/dom/NodeOutputter.java | 8 +- .../apache/freemarker/dom/test/DOMLoader.java | 6 +- .../BaseNTemplateNumberFormatFactory.java | 10 +- .../examples/TemplateConfigurationExamples.java | 4 +- .../freemarker/servlet/FreemarkerServlet.java | 52 +- .../freemarker/servlet/InitParamParser.java | 6 +- .../servlet/WebAppTemplateLoader.java | 16 +- .../jsp/FreeMarkerJspApplicationContext.java | 4 +- .../freemarker/servlet/jsp/JspTagModelBase.java | 4 +- .../servlet/jsp/JspWriterAdapter.java | 4 +- .../freemarker/servlet/jsp/TaglibFactory.java | 62 +- .../servlet/jsp/TaglibMethodUtil.java | 117 -- .../servlet/jsp/TaglibMethodUtils.java | 117 ++ .../servlet/jsp/_FreeMarkerPageContext21.java | 4 +- .../servlet/jsp/TaglibMethodUtilTest.java | 108 -- .../servlet/jsp/TaglibMethodUtilsTest.java | 107 ++ .../jsp/taglibmembers/AttributeAccessorTag.java | 4 +- .../jsp/taglibmembers/AttributeInfoTag.java | 8 +- .../servlet/test/Model2TesterServlet.java | 4 +- .../freemarker/servlet/test/WebAppTestCase.java | 4 +- .../CopyrightCommentRemoverTemplateLoader.java | 4 +- .../apache/freemarker/test/FileTestCase.java | 10 +- .../freemarker/test/ResourcesExtractor.java | 14 +- .../apache/freemarker/test/TemplateTest.java | 10 +- .../freemarker/test/TemplateTestCase.java | 10 +- .../freemarker/test/TemplateTestSuite.java | 14 +- .../org/apache/freemarker/test/TestUtil.java | 244 --- .../org/apache/freemarker/test/TestUtils.java | 244 +++ .../templateutil/AssertEqualsDirective.java | 4 +- .../test/templateutil/AssertFailsDirective.java | 16 +- .../templateutil/BadParameterTypeException.java | 6 +- .../MissingRequiredParameterException.java | 6 +- .../UnsupportedParameterException.java | 6 +- 218 files changed, 9777 insertions(+), 9869 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java b/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java index 6d9b25c..1b171bd 100644 --- a/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java +++ b/freemarker-converter/src/main/java/freemarker/core/FM2ASTToFM3SourceConverter.java @@ -36,10 +36,10 @@ import org.apache.freemarker.converter.ConverterException; import org.apache.freemarker.converter.ConverterUtils; import org.apache.freemarker.converter.UnconvertableLegacyFeatureException; import org.apache.freemarker.core.util.FTLUtil; -import org.apache.freemarker.core.util._ClassUtil; +import org.apache.freemarker.core.util._ClassUtils; import org.apache.freemarker.core.util._NullArgumentException; import org.apache.freemarker.core.util._ObjectHolder; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._StringUtils; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -232,7 +232,7 @@ public class FM2ASTToFM3SourceConverter { } private String convertFtlHeaderParamName(String name) throws ConverterException { - String converted = name.indexOf('_') == -1 ? name : _StringUtil.snakeCaseToCamelCase(name); + String converted = name.indexOf('_') == -1 ? name : _StringUtils.snakeCaseToCamelCase(name); if (converted.equals("attributes")) { converted = "customSettings"; } @@ -246,7 +246,7 @@ public class FM2ASTToFM3SourceConverter { printExp((Expression) node); } else { throw new UnexpectedNodeContentException(node, "Unhandled node class", - _ClassUtil.getShortClassNameOfObject(node)); + _ClassUtils.getShortClassNameOfObject(node)); } } @@ -606,7 +606,7 @@ public class FM2ASTToFM3SourceConverter { } private String convertSettingName(String name, TemplateObject node) throws ConverterException { - String converted = name.indexOf('_') == -1 ? name : _StringUtil.snakeCaseToCamelCase(name); + String converted = name.indexOf('_') == -1 ? name : _StringUtils.snakeCaseToCamelCase(name); if (converted.equals("classicCompatible")) { throw new UnconvertableLegacyFeatureException("There \"classicCompatible\" setting doesn't exist in " @@ -1327,7 +1327,7 @@ public class FM2ASTToFM3SourceConverter { pos = printSeparatorAndWSAndExpComments(pos, beforeFirstNestedContParam ? ";" : ","); String nestedContParamName = getParam(node, paramIdx, ParameterRole.TARGET_LOOP_VARIABLE, String.class); - print(_StringUtil.toFTLTopLevelIdentifierReference(nestedContParamName)); + print(_StringUtils.toFTLTopLevelIdentifierReference(nestedContParamName)); String identifierInSrc = readIdentifier(pos); assertNodeContent(identifierInSrc.length() != 0, node, "Can't find nested content parameter name in the source"); @@ -1485,7 +1485,7 @@ public class FM2ASTToFM3SourceConverter { printWithConvertedExpComments(src.substring(wsStartPos, opPos)); String operatorInSrc = src.substring(opPos, opPos + operator.length()); assertNodeContent(operatorInSrc.equals(operator), node, - "Expected " + _StringUtil.jQuote(operator) + ", found {}", operatorInSrc); + "Expected " + _StringUtils.jQuote(operator) + ", found {}", operatorInSrc); print(operator); } @@ -1600,7 +1600,7 @@ public class FM2ASTToFM3SourceConverter { } private String convertBuiltInVariableName(String name) throws ConverterException { - String converted = name.indexOf('_') == -1 ? name : _StringUtil.snakeCaseToCamelCase(name); + String converted = name.indexOf('_') == -1 ? name : _StringUtils.snakeCaseToCamelCase(name); if (converted.equals("currentNode")) { converted = "node"; @@ -1638,7 +1638,7 @@ public class FM2ASTToFM3SourceConverter { static { Map<String, String> domKeyMapping = new HashMap<>(); for (String atAtKey : AtAtKeyAccessor.getAtAtKeys()) { - String atAtKeyCC = _StringUtil.snakeCaseToCamelCase(atAtKey); + String atAtKeyCC = _StringUtils.snakeCaseToCamelCase(atAtKey); if (!atAtKeyCC.equals(atAtKey)) { domKeyMapping.put(atAtKey, atAtKeyCC); } @@ -1956,7 +1956,7 @@ public class FM2ASTToFM3SourceConverter { private String convertBuiltInName(String name) throws ConverterException { String converted = IRREGULAR_BUILT_IN_NAME_CONVERSIONS.get(name); if (converted == null) { - converted = name.indexOf('_') == -1 ? name : _StringUtil.snakeCaseToCamelCase(name); + converted = name.indexOf('_') == -1 ? name : _StringUtils.snakeCaseToCamelCase(name); } if (!fm3BuiltInNames.contains(converted)) { @@ -2413,7 +2413,7 @@ public class FM2ASTToFM3SourceConverter { if (pos == src.length() || !src.startsWith(separatorSymbol, pos)) { if (!separatorOptional) { throw new ConverterException( - "Expected separator " + _StringUtil.jQuote(separatorSymbol) + " at position " + pos + "."); + "Expected separator " + _StringUtils.jQuote(separatorSymbol) + " at position " + pos + "."); } if (separatorPosInOutput != null) { separatorPosInOutput.set(null); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-converter/src/main/java/freemarker/core/UnexpectedNodeContentException.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/main/java/freemarker/core/UnexpectedNodeContentException.java b/freemarker-converter/src/main/java/freemarker/core/UnexpectedNodeContentException.java index f7c7408..090f18e 100644 --- a/freemarker-converter/src/main/java/freemarker/core/UnexpectedNodeContentException.java +++ b/freemarker-converter/src/main/java/freemarker/core/UnexpectedNodeContentException.java @@ -20,11 +20,11 @@ package freemarker.core; import org.apache.freemarker.converter.ConverterException; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._StringUtils; public class UnexpectedNodeContentException extends ConverterException { public UnexpectedNodeContentException(TemplateObject node, String errorMessage, Object msgParam) { - super("Unexpected AST content for " + _StringUtil.jQuote(node.getNodeTypeSymbol()) + " node (class: " + super("Unexpected AST content for " + _StringUtils.jQuote(node.getNodeTypeSymbol()) + " node (class: " + node.getClass().getName() + "):\n" + renderMessage(errorMessage, msgParam), node.getBeginLine(), node.getBeginColumn()); @@ -43,7 +43,7 @@ public class UnexpectedNodeContentException extends ConverterException { return "null"; } if (param instanceof String || param instanceof Character) { - return _StringUtil.jQuote(param); + return _StringUtils.jQuote(param); } return param.toString(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-converter/src/main/java/org/apache/freemarker/converter/Converter.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/main/java/org/apache/freemarker/converter/Converter.java b/freemarker-converter/src/main/java/org/apache/freemarker/converter/Converter.java index c0527f9..b3dd1b7 100644 --- a/freemarker-converter/src/main/java/org/apache/freemarker/converter/Converter.java +++ b/freemarker-converter/src/main/java/org/apache/freemarker/converter/Converter.java @@ -34,7 +34,7 @@ import java.util.Set; import java.util.regex.Pattern; import org.apache.freemarker.core.util._NullArgumentException; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -260,7 +260,7 @@ public abstract class Converter { storeConversionMarkers(ctx.getConversionMarkers(), ctx); convertedFileCount++; } catch (IOException e) { - throw new ConverterException("I/O exception while converting " + _StringUtil.jQuote(src) + ".", e); + throw new ConverterException("I/O exception while converting " + _StringUtils.jQuote(src) + ".", e); } finally { try { if (ctx != null && ctx.outputStream != null) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-converter/src/test/java/org/freemarker/converter/ConverterUtilTest.java ---------------------------------------------------------------------- diff --git a/freemarker-converter/src/test/java/org/freemarker/converter/ConverterUtilTest.java b/freemarker-converter/src/test/java/org/freemarker/converter/ConverterUtilTest.java deleted file mode 100644 index 3646834..0000000 --- a/freemarker-converter/src/test/java/org/freemarker/converter/ConverterUtilTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.freemarker.converter; - -public class ConverterUtilTest { - -} http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTPrinter.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTPrinter.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTPrinter.java index 299c70f..2bc1eea 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTPrinter.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTPrinter.java @@ -41,8 +41,8 @@ import java.util.regex.PatternSyntaxException; import org.apache.freemarker.core.model.TemplateModel; import org.apache.freemarker.core.util.FTLUtil; -import org.apache.freemarker.core.util._ClassUtil; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._ClassUtils; +import org.apache.freemarker.core.util._StringUtils; import org.apache.freemarker.test.TestConfigurationBuilder; /** @@ -109,7 +109,7 @@ public class ASTPrinter { try { fnPattern = Pattern.compile(args[2]); } catch (PatternSyntaxException e) { - p(_StringUtil.jQuote(args[2]) + " is not a valid regular expression"); + p(_StringUtils.jQuote(args[2]) + " is not a valid regular expression"); System.exit(-1); return; } @@ -352,7 +352,7 @@ public class ASTPrinter { } } else { printNodeLineStart(paramRole, ind, out); - out.write(_StringUtil.jQuote(node)); + out.write(_StringUtils.jQuote(node)); printNodeLineEnd(node, out, opts); } } @@ -362,7 +362,7 @@ public class ASTPrinter { if (opts.getShowJavaClass()) { out.write(" // "); commentStared = true; - out.write(_ClassUtil.getShortClassNameOfObject(node, true)); + out.write(_ClassUtils.getShortClassNameOfObject(node, true)); } if (opts.getShowLocation() && node instanceof ASTNode) { if (!commentStared) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTTest.java index 7379e28..217b7ff 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ASTTest.java @@ -23,8 +23,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import org.apache.freemarker.core.ASTPrinter.Options; -import org.apache.freemarker.core.util._StringUtil; -import org.apache.freemarker.test.TestUtil; +import org.apache.freemarker.core.util._StringUtils; +import org.apache.freemarker.test.TestUtils; import org.apache.freemarker.test.FileTestCase; public class ASTTest extends FileTestCase { @@ -88,7 +88,7 @@ public class ASTTest extends FileTestCase { assertExpectedFileEqualsString( testName + ".ast", ASTPrinter.getASTAsString(templateName, - TestUtil.removeFTLCopyrightComment( + TestUtils.removeFTLCopyrightComment( normalizeLineBreaks( loadTestTextResource( getTestFileURL( @@ -97,7 +97,7 @@ public class ASTTest extends FileTestCase { } private String normalizeLineBreaks(final String s) throws FileNotFoundException, IOException { - return _StringUtil.replace(s, "\r\n", "\n").replace('\r', '\n'); + return _StringUtils.replace(s, "\r\n", "\n").replace('\r', '\n'); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConfigurationTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConfigurationTest.java index 2f7af7b..dab1460 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConfigurationTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConfigurationTest.java @@ -82,8 +82,8 @@ import org.apache.freemarker.core.userpkg.EpochMillisTemplateDateFormatFactory; import org.apache.freemarker.core.userpkg.HexTemplateNumberFormatFactory; import org.apache.freemarker.core.userpkg.NameClashingDummyOutputFormat; import org.apache.freemarker.core.userpkg.SeldomEscapedOutputFormat; -import org.apache.freemarker.core.util._CollectionUtil; -import org.apache.freemarker.core.util._DateUtil; +import org.apache.freemarker.core.util._CollectionUtils; +import org.apache.freemarker.core.util._DateUtils; import org.apache.freemarker.core.util._NullWriter; import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory; import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory; @@ -530,7 +530,7 @@ public class ConfigurationTest { { Template t = cfg.getTemplate("Stat/t.de.ftlx"); assertEquals("TODO,XML", t.getBooleanFormat()); - assertEquals(_DateUtil.UTC, t.getTimeZone()); + assertEquals(_DateUtils.UTC, t.getTimeZone()); } assertNotNull(cfgB.getTemplateConfigurations()); @@ -848,13 +848,13 @@ public class ConfigurationTest { public void testCollectionSettingMutability() throws IOException { Builder cb = new Builder(VERSION_3_0_0); - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(cb.getSharedVariables())); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(cb.getSharedVariables())); Map<String, Object> mutableValue = new HashMap<>(); mutableValue.put("x", "v1"); cb.setSharedVariables(mutableValue); Map<String, Object> immutableValue = cb.getSharedVariables(); assertNotSame(mutableValue, immutableValue); // Must be a copy - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(immutableValue)); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(immutableValue)); assertEquals(mutableValue, immutableValue); mutableValue.put("y", "v2"); assertNotEquals(mutableValue, immutableValue); // No aliasing http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java index 6714fc3..ce7922f 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/CoreLocaleUtilsTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.*; import java.util.Locale; -import org.apache.freemarker.core.util._LocaleUtil; +import org.apache.freemarker.core.util._LocaleUtils; import org.junit.Test; public class CoreLocaleUtilsTest { @@ -33,40 +33,40 @@ public class CoreLocaleUtilsTest { locale = new Locale("ru", "RU", "Linux"); assertEquals("ru_RU_Linux", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertEquals("ru_RU", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertEquals("ru", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); locale = new Locale("ch", "CH"); assertEquals("ch_CH", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertEquals("ch", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); locale = new Locale("ja"); assertEquals("ja", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); locale = new Locale("ja", "", ""); assertEquals("ja", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); locale = new Locale(""); assertEquals("", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); locale = new Locale("hu", "", "Linux"); assertEquals("hu__Linux", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertEquals("hu", locale.toString()); - locale = _LocaleUtil.getLessSpecificLocale(locale); + locale = _LocaleUtils.getLessSpecificLocale(locale); assertNull(locale); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableParsingAndProcessingConfigurationTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableParsingAndProcessingConfigurationTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableParsingAndProcessingConfigurationTest.java index 54ce6b1..cbdcbe4 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableParsingAndProcessingConfigurationTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableParsingAndProcessingConfigurationTest.java @@ -32,7 +32,7 @@ import java.util.TimeZone; import org.apache.freemarker.core.outputformat.impl.HTMLOutputFormat; import org.apache.freemarker.core.outputformat.impl.UndefinedOutputFormat; import org.apache.freemarker.core.outputformat.impl.XMLOutputFormat; -import org.apache.freemarker.core.util._DateUtil; +import org.apache.freemarker.core.util._DateUtils; import org.apache.freemarker.core.util._NullArgumentException; import org.junit.Test; @@ -261,7 +261,7 @@ public class MutableParsingAndProcessingConfigurationTest { assertEquals(TimeZone.getDefault(), cfgB.getTimeZone()); assertFalse(cfgB.isTimeZoneSet()); - TimeZone nonDefault = TimeZone.getDefault().equals(_DateUtil.UTC) ? TimeZone.getTimeZone("PST") : _DateUtil.UTC; + TimeZone nonDefault = TimeZone.getDefault().equals(_DateUtils.UTC) ? TimeZone.getTimeZone("PST") : _DateUtils.UTC; cfgB.setTimeZone(nonDefault); assertTrue(cfgB.isTimeZoneSet()); assertEquals(nonDefault, cfgB.getTimeZone()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableProcessingConfigurationTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableProcessingConfigurationTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableProcessingConfigurationTest.java index 5db5dd9..0d764be 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableProcessingConfigurationTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/MutableProcessingConfigurationTest.java @@ -36,8 +36,8 @@ import org.apache.freemarker.core.userpkg.BaseNTemplateNumberFormatFactory; import org.apache.freemarker.core.userpkg.EpochMillisDivTemplateDateFormatFactory; import org.apache.freemarker.core.userpkg.EpochMillisTemplateDateFormatFactory; import org.apache.freemarker.core.userpkg.HexTemplateNumberFormatFactory; -import org.apache.freemarker.core.util._CollectionUtil; -import org.apache.freemarker.core.util._DateUtil; +import org.apache.freemarker.core.util._CollectionUtils; +import org.apache.freemarker.core.util._DateUtils; import org.apache.freemarker.core.util._NullWriter; import org.apache.freemarker.core.valueformat.TemplateDateFormatFactory; import org.apache.freemarker.core.valueformat.TemplateNumberFormatFactory; @@ -80,52 +80,52 @@ public class MutableProcessingConfigurationTest { MutableProcessingConfiguration<?> mpc = new Configuration.Builder(Configuration.VERSION_3_0_0); { - assertTrue(_CollectionUtil.isListKnownToBeUnmodifiable(mpc.getAutoIncludes())); + assertTrue(_CollectionUtils.isListKnownToBeUnmodifiable(mpc.getAutoIncludes())); List<String> mutableValue = new ArrayList<>(); mutableValue.add("x"); mpc.setAutoIncludes(mutableValue); List<String> immutableValue = mpc.getAutoIncludes(); assertNotSame(mutableValue, immutableValue); // Must be a copy - assertTrue(_CollectionUtil.isListKnownToBeUnmodifiable(immutableValue)); + assertTrue(_CollectionUtils.isListKnownToBeUnmodifiable(immutableValue)); assertEquals(mutableValue, immutableValue); mutableValue.add("y"); assertNotEquals(mutableValue, immutableValue); // No aliasing } { - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(mpc.getAutoImports())); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(mpc.getAutoImports())); Map<String, String> mutableValue = new HashMap<>(); mutableValue.put("x", "x.ftl"); mpc.setAutoImports(mutableValue); Map<String, String> immutableValue = mpc.getAutoImports(); assertNotSame(mutableValue, immutableValue); // Must be a copy - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(immutableValue)); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(immutableValue)); assertEquals(mutableValue, immutableValue); mutableValue.put("y", "y.ftl"); assertNotEquals(mutableValue, immutableValue); // No aliasing } { - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(mpc.getCustomDateFormats())); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(mpc.getCustomDateFormats())); Map<String, TemplateDateFormatFactory> mutableValue = new HashMap<>(); mutableValue.put("x", EpochMillisTemplateDateFormatFactory.INSTANCE); mpc.setCustomDateFormats(mutableValue); Map<String, TemplateDateFormatFactory> immutableValue = mpc.getCustomDateFormats(); assertNotSame(mutableValue, immutableValue); // Must be a copy - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(immutableValue)); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(immutableValue)); assertEquals(mutableValue, immutableValue); mutableValue.put("y", EpochMillisDivTemplateDateFormatFactory.INSTANCE); assertNotEquals(mutableValue, immutableValue); // No aliasing } { - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(mpc.getCustomNumberFormats())); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(mpc.getCustomNumberFormats())); Map<String, TemplateNumberFormatFactory> mutableValue = new HashMap<>(); mutableValue.put("x", BaseNTemplateNumberFormatFactory.INSTANCE); mpc.setCustomNumberFormats(mutableValue); Map<String, TemplateNumberFormatFactory> immutableValue = mpc.getCustomNumberFormats(); assertNotSame(mutableValue, immutableValue); // Must be a copy - assertTrue(_CollectionUtil.isMapKnownToBeUnmodifiable(immutableValue)); + assertTrue(_CollectionUtils.isMapKnownToBeUnmodifiable(immutableValue)); assertEquals(mutableValue, immutableValue); mutableValue.put("y", HexTemplateNumberFormatFactory.INSTANCE); assertNotEquals(mutableValue, immutableValue); // No aliasing @@ -202,13 +202,13 @@ public class MutableProcessingConfigurationTest { assertEquals(TimeZone.getDefault(), env2.getTimeZone()); assertNull(env2.getSQLDateAndTimeTimeZone()); - env1.setSQLDateAndTimeTimeZone(_DateUtil.UTC); + env1.setSQLDateAndTimeTimeZone(_DateUtils.UTC); // cfg: assertEquals(TimeZone.getDefault(), cfg.getTimeZone()); assertNull(cfg.getSQLDateAndTimeTimeZone()); // env: assertEquals(TimeZone.getDefault(), env1.getTimeZone()); - assertEquals(_DateUtil.UTC, env1.getSQLDateAndTimeTimeZone()); + assertEquals(_DateUtils.UTC, env1.getSQLDateAndTimeTimeZone()); env1.setTimeZone(localTZ); // cfg: @@ -216,7 +216,7 @@ public class MutableProcessingConfigurationTest { assertNull(cfg.getSQLDateAndTimeTimeZone()); // env: assertEquals(localTZ, env1.getTimeZone()); - assertEquals(_DateUtil.UTC, env1.getSQLDateAndTimeTimeZone()); + assertEquals(_DateUtils.UTC, env1.getSQLDateAndTimeTimeZone()); // env 2: assertEquals(TimeZone.getDefault(), env2.getTimeZone()); assertNull(env2.getSQLDateAndTimeTimeZone()); @@ -235,14 +235,14 @@ public class MutableProcessingConfigurationTest { Environment env2 = t.createProcessingEnvironment(null, new StringWriter()); env1.setTimeZone(localTZ); - env1.setSQLDateAndTimeTimeZone(_DateUtil.UTC); + env1.setSQLDateAndTimeTimeZone(_DateUtils.UTC); // cfg: assertEquals(otherTZ1, cfg.getTimeZone()); assertEquals(otherTZ2, cfg.getSQLDateAndTimeTimeZone()); // env: assertEquals(localTZ, env1.getTimeZone()); - assertEquals(_DateUtil.UTC, env1.getSQLDateAndTimeTimeZone()); + assertEquals(_DateUtils.UTC, env1.getSQLDateAndTimeTimeZone()); // env 2: assertEquals(otherTZ1, env2.getTimeZone()); assertEquals(otherTZ2, env2.getSQLDateAndTimeTimeZone()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java index 3189615..731a063 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ParsingErrorMessagesTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.*; import java.io.IOException; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._StringUtils; import org.apache.freemarker.test.TestConfigurationBuilder; import org.junit.Test; @@ -190,10 +190,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 " + _StringUtils.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 " + _StringUtils.jQuote(needle) + ":\n" + msg); } } showError(e); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java index 3939a15..869167b 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/SQLTimeZoneTest.java @@ -30,7 +30,7 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import org.apache.freemarker.core.util._DateUtil; +import org.apache.freemarker.core.util._DateUtils; import org.apache.freemarker.test.TemplateTest; import org.junit.Test; @@ -42,7 +42,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(_DateUtils.UTC); } // Values that JDBC in GMT+02 would produce @@ -266,7 +266,7 @@ public class SQLTimeZoneTest extends TemplateTest { private Configuration.ExtendableBuilder<?> testCacheFlushing_createBuilder() { return createConfigurationBuilder() - .timeZone(_DateUtil.UTC) + .timeZone(_DateUtils.UTC) .sqlDateAndTimeTimeZone(null) // Default from FM2... .dateFormat("yyyy-MM-dd E") .timeFormat("HH:mm:ss E") @@ -276,7 +276,7 @@ public class SQLTimeZoneTest extends TemplateTest { @Test public void testDateAndTimeBuiltInsHasNoEffect() throws Exception { setConfiguration(createConfigurationBuilder() - .timeZone(_DateUtil.UTC) + .timeZone(_DateUtils.UTC) .sqlDateAndTimeTimeZone(GMT_P02) .build()); @@ -297,7 +297,7 @@ public class SQLTimeZoneTest extends TemplateTest { @Test public void testChangeSettingInTemplate() throws Exception { setConfiguration(createConfigurationBuilder() - .timeZone(_DateUtil.UTC) + .timeZone(_DateUtils.UTC) .sqlDateAndTimeTimeZone(null) .build()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java index ee521d9..51286b4 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/TagSyntaxVariationsTest.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Map; import org.apache.freemarker.core.userpkg.UpperCaseDirective; -import org.apache.freemarker.core.util._StringUtil; +import org.apache.freemarker.core.util._StringUtils; import org.apache.freemarker.test.TestConfigurationBuilder; import junit.framework.TestCase; @@ -179,13 +179,13 @@ public class TagSyntaxVariationsTest extends TestCase { } catch (ParseException e) { if (expected != null) { fail("Couldn't invoke Template from " - + _StringUtil.jQuote(template) + ": " + e); + + _StringUtils.jQuote(template) + ": " + e); } else { return; } } if (expected == null) fail("Template parsing should have fail for " - + _StringUtil.jQuote(template)); + + _StringUtils.jQuote(template)); StringWriter out = new StringWriter(); t.process(new Object(), out); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperSingletonsTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperSingletonsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperSingletonsTest.java index be2c6a2..dd7581c 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperSingletonsTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperSingletonsTest.java @@ -34,7 +34,7 @@ import org.apache.freemarker.core.model.TemplateDateModel; import org.apache.freemarker.core.model.TemplateHashModel; import org.apache.freemarker.core.model.TemplateModelException; import org.apache.freemarker.core.model.TemplateScalarModel; -import org.apache.freemarker.test.TestUtil; +import org.apache.freemarker.test.TestUtils; import junit.framework.TestCase; @@ -52,7 +52,7 @@ public class DefaultObjectWrapperSingletonsTest extends TestCase { public void testBuilderEqualsAndHash() throws Exception { assertEquals(Configuration.VERSION_3_0_0, new DefaultObjectWrapper.Builder(Configuration.VERSION_3_0_0).getIncompatibleImprovements()); try { - new DefaultObjectWrapper.Builder(TestUtil.getClosestFutureVersion()); + new DefaultObjectWrapper.Builder(TestUtils.getClosestFutureVersion()); fail("Maybe you need to update this test for the new FreeMarker version"); } catch (IllegalArgumentException e) { assertThat(e.getMessage(), containsString("upgrade")); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsApplicableTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsApplicableTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsApplicableTest.java index 599e6f2..fbf62a6 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsApplicableTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsApplicableTest.java @@ -65,7 +65,7 @@ public class IsApplicableTest extends TestCase { assertApplicable(ats, BigDecimal.class); assertApplicable(ats, BigInteger.class); - ats = new ArgumentTypes(new Object[] { new OverloadedNumberUtil.IntegerOrByte(1, (byte) 1) }); + ats = new ArgumentTypes(new Object[] { new OverloadedNumberUtils.IntegerOrByte(1, (byte) 1) }); assertApplicable(ats, Object.class); assertNotApplicable(ats, CharSequence.class); assertNotApplicable(ats, String.class); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsMoreSpecificParameterTypeTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsMoreSpecificParameterTypeTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsMoreSpecificParameterTypeTest.java index 3de3f13..4195ab4 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsMoreSpecificParameterTypeTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/IsMoreSpecificParameterTypeTest.java @@ -32,67 +32,67 @@ public class IsMoreSpecificParameterTypeTest extends TestCase { } public void testFixed() { - assertEquals(1, _MethodUtil.isMoreOrSameSpecificParameterType(String.class, String.class, true, 0)); - assertEquals(1, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, int.class, true, 0)); + assertEquals(1, _MethodUtils.isMoreOrSameSpecificParameterType(String.class, String.class, true, 0)); + assertEquals(1, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, int.class, true, 0)); - assertEquals(2, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Integer.class, true, 0)); - assertEquals(2, _MethodUtil.isMoreOrSameSpecificParameterType(boolean.class, Boolean.class, true, 0)); + assertEquals(2, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Integer.class, true, 0)); + assertEquals(2, _MethodUtils.isMoreOrSameSpecificParameterType(boolean.class, Boolean.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, long.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, double.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Long.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Double.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Long.class, true, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Double.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, long.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, double.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Long.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Double.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Long.class, true, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Double.class, true, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(HashMap.class, Map.class, true, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(String.class, CharSequence.class, true, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Number.class, true, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Number.class, true, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(HashMap.class, Map.class, true, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(String.class, CharSequence.class, true, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Number.class, true, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Number.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Map.class, String.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, int.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Boolean.class, boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, String.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, BigDecimal.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Long.class, Integer.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(long.class, Integer.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Long.class, int.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, BigDecimal.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Map.class, String.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, int.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Boolean.class, boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, String.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, BigDecimal.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Long.class, Integer.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(long.class, Integer.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Long.class, int.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, BigDecimal.class, true, 0)); } public void testBuggy() { - assertEquals(1, _MethodUtil.isMoreOrSameSpecificParameterType(String.class, String.class, false, 0)); - assertEquals(1, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, int.class, false, 0)); + assertEquals(1, _MethodUtils.isMoreOrSameSpecificParameterType(String.class, String.class, false, 0)); + assertEquals(1, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, int.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Integer.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(boolean.class, Boolean.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Integer.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(boolean.class, Boolean.class, false, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, long.class, false, 0)); - assertEquals(3, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, double.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Long.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Double.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Long.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Double.class, false, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, long.class, false, 0)); + assertEquals(3, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, double.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Long.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Double.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Long.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Double.class, false, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(HashMap.class, Map.class, false, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(String.class, CharSequence.class, false, 0)); - assertEquals(4, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, Number.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Number.class, false, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(HashMap.class, Map.class, false, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(String.class, CharSequence.class, false, 0)); + assertEquals(4, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, Number.class, false, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Number.class, false, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Map.class, String.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, int.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Boolean.class, boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, Boolean.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, String.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(int.class, BigDecimal.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Long.class, Integer.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(long.class, Integer.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Long.class, int.class, true, 0)); - assertEquals(0, _MethodUtil.isMoreOrSameSpecificParameterType(Integer.class, BigDecimal.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Map.class, String.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, int.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Boolean.class, boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, Boolean.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, String.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(int.class, BigDecimal.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Long.class, Integer.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(long.class, Integer.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Long.class, int.class, true, 0)); + assertEquals(0, _MethodUtils.isMoreOrSameSpecificParameterType(Integer.class, BigDecimal.class, true, 0)); } } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MiscNumericalOperationsTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MiscNumericalOperationsTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MiscNumericalOperationsTest.java index 9e175e5..dab5372 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MiscNumericalOperationsTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/MiscNumericalOperationsTest.java @@ -61,7 +61,7 @@ public class MiscNumericalOperationsTest extends TestCase { BigInteger bi = new BigInteger("123"); assertEquals(DefaultObjectWrapper.forceUnwrappedNumberToType(new BigDecimal("123.6"), BigInteger.class), bi); assertEquals(DefaultObjectWrapper.forceUnwrappedNumberToType( - new OverloadedNumberUtil.IntegerBigDecimal(new BigDecimal("123")), BigInteger.class), bi); + new OverloadedNumberUtils.IntegerBigDecimal(new BigDecimal("123")), BigInteger.class), bi); assertTrue(DefaultObjectWrapper.forceUnwrappedNumberToType(bi, BigInteger.class) == bi); assertEquals(DefaultObjectWrapper.forceUnwrappedNumberToType(Long.valueOf(123), BigInteger.class), bi); assertEquals(DefaultObjectWrapper.forceUnwrappedNumberToType(Double.valueOf(123.6), BigInteger.class), bi); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ebb39b84/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java ---------------------------------------------------------------------- diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java index 0b0a614..b6be7f1 100644 --- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java +++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/ModelAPINewInstanceTest.java @@ -20,7 +20,7 @@ package org.apache.freemarker.core.model.impl; import org.apache.freemarker.core.Configuration; -import org.apache.freemarker.test.TestUtil; +import org.apache.freemarker.test.TestUtils; import junit.framework.TestCase; @@ -111,8 +111,8 @@ public class ModelAPINewInstanceTest extends TestCase { public Constructors(Integer x, Integer y) { s = "Integer " + x + ", Integer " + y; } public Constructors(Object x, Object y) { s = "Object " + x + ", Object " + y; } - public Constructors(int... xs) { s = "int... " + TestUtil.arrayToString(xs); } - public Constructors(Object x, int... ys) { s = "Object " + x + ", int... " + TestUtil.arrayToString(ys); } + public Constructors(int... xs) { s = "int... " + TestUtils.arrayToString(xs); } + public Constructors(Object x, int... ys) { s = "Object " + x + ", int... " + TestUtils.arrayToString(ys); } @Override public String toString() {
