diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java index 34a379353..e79a30bd1 100644 --- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java +++ b/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java @@ -105,7 +105,7 @@ public class ExcelAntTask extends Task { Project.MSG_ERR ) ; return ; } - if( tests != null && tests.size() > 0 ) { + if( tests.size() > 0 ) { Iterator testsIt = tests.iterator() ; while( testsIt.hasNext() ) { @@ -115,15 +115,13 @@ public class ExcelAntTask extends Task { workbookUtil = ExcelAntWorkbookUtilFactory.getInstance( excelFileName ) ; - if( functions != null ) { - Iterator functionsIt = functions.iterator() ; - while( functionsIt.hasNext() ) { - ExcelAntUserDefinedFunction eaUdf = functionsIt.next() ; - try { - workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName() ) ; - } catch ( Exception e) { - throw new BuildException( e.getMessage(), e ); - } + Iterator functionsIt = functions.iterator() ; + while( functionsIt.hasNext() ) { + ExcelAntUserDefinedFunction eaUdf = functionsIt.next() ; + try { + workbookUtil.addFunction(eaUdf.getFunctionAlias(), eaUdf.getClassName() ) ; + } catch ( Exception e) { + throw new BuildException( e.getMessage(), e ); } } test.setWorkbookUtil( workbookUtil ) ; @@ -158,16 +156,14 @@ public class ExcelAntTask extends Task { getLocation()); } - Workbook workbook; File workbookFile = new File( excelFileName ) ; try { FileInputStream fis = new FileInputStream( workbookFile ) ; - workbook = WorkbookFactory.create( fis ) ; + return WorkbookFactory.create( fis ) ; } catch (Exception e) { throw new BuildException("Cannot load file " + excelFileName + ". Make sure the path and file permissions are correct.", e, getLocation()); } - return workbook ; } diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java b/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java index 651a2319d..732eead09 100644 --- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java +++ b/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java @@ -73,4 +73,9 @@ public class TestBuildFile extends BuildFileTest { executeTarget("test-udf"); assertLogContaining("1/1 tests passed"); } + + public void testSetText() { + executeTarget("test-settext"); + assertLogContaining("1/1 tests passed"); + } } diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml b/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml index de0e616ae..6d938897f 100644 --- a/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml +++ b/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml @@ -135,4 +135,14 @@ under the License. + + + + + + + + + +