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

2 files changed, 5 insertions, 3 deletions

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
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() ;