From c4cbc23fd8a7706658fa2a755131dab36defed70 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Thu, 21 Jul 2011 11:55:05 +0000 Subject: [PATCH] renamed excelant test class to avoid collision with poi-examples when all classes compiled in the same directory, also removed duplicated log4j.properties git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1149134 13f79535-47bb-0310-9956-ffa450edef68 --- ...ge.java => CalculateMortgageFunction.java} | 4 +++- .../util/TestExcelAntWorkbookUtil.java | 4 ++-- src/ooxml/testcases/log4j.properties | 24 ------------------- 3 files changed, 5 insertions(+), 27 deletions(-) rename src/excelant/testcases/org/apache/poi/ss/examples/formula/{CalculateMortgage.java => CalculateMortgageFunction.java} (96%) delete mode 100644 src/ooxml/testcases/log4j.properties diff --git a/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgage.java b/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java similarity index 96% rename from src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgage.java rename to src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java index 4b9a325cdf..83ac61e4c8 100755 --- a/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgage.java +++ b/src/excelant/testcases/org/apache/poi/ss/examples/formula/CalculateMortgageFunction.java @@ -26,12 +26,14 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction ; /** * A simple user-defined function to calculate principal and interest. + * + * Used by {@link org.apache.poi.ss.excelant.util.TestExcelAntWorkbookUtil}. * * @author Jon Svede ( jon [at] loquatic [dot] com ) * @author Brian Bush ( brian [dot] bush [at] nrel [dot] gov ) * */ -public class CalculateMortgage implements FreeRefFunction { +public class CalculateMortgageFunction implements FreeRefFunction { public ValueEval evaluate( ValueEval[] args, OperationEvaluationContext ec ) { diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java b/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java index 5b0d3e8027..ad95c4307b 100755 --- a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java +++ b/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import junit.framework.TestCase; -import org.apache.poi.ss.examples.formula.CalculateMortgage; +import org.apache.poi.ss.examples.formula.CalculateMortgageFunction; import org.apache.poi.ss.formula.udf.UDFFinder; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Workbook; @@ -50,7 +50,7 @@ public class TestExcelAntWorkbookUtil extends TestCase { assertNotNull( fixture ) ; - fixture.addFunction("h2_ZFactor", new CalculateMortgage() ) ; + fixture.addFunction("h2_ZFactor", new CalculateMortgageFunction() ) ; UDFFinder functions = fixture.getFunctions() ; diff --git a/src/ooxml/testcases/log4j.properties b/src/ooxml/testcases/log4j.properties deleted file mode 100644 index 8479c8de26..0000000000 --- a/src/ooxml/testcases/log4j.properties +++ /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. - -log4j.debug=false - -log4j.rootLogger=INFO,Stdout - -log4j.appender.Stdout=org.apache.log4j.ConsoleAppender -log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n - -log4j.org.apache.poi=DEBUG \ No newline at end of file -- 2.39.5