Fix build broken by previous checkin by creating a TestUnfixedBugs for ooxml as well...

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1498280 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 8fdc452dabd875c98532e58a1d7884c970cef317..1fc0d4cf4fce2c4409b974ad3db4126d5160cc1a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -722,6 +722,7 @@ under the License.
               <batchtest todir="${ooxml.reports.test}">
                   <fileset dir="${ooxml.src.test}">
                       <include name="**/${testpattern}.java"/>
+                      <exclude name="**/TestUnfixedBugs.java"/>
                       <exclude name="**/All*Tests.java"/>
                   </fileset>
               </batchtest>

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
new file mode 100644 (file)
index 0000000..ce3fc2d
--- /dev/null
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
@@ -0,0 +1,81 @@
+/* ====================================================================\r
+   Licensed to the Apache Software Foundation (ASF) under one or more\r
+   contributor license agreements.  See the NOTICE file distributed with\r
+   this work for additional information regarding copyright ownership.\r
+   The ASF licenses this file to You under the Apache License, Version 2.0\r
+   (the "License"); you may not use this file except in compliance with\r
+   the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+   Unless required by applicable law or agreed to in writing, software\r
+   distributed under the License is distributed on an "AS IS" BASIS,\r
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+   See the License for the specific language governing permissions and\r
+   limitations under the License.\r
+==================================================================== */\r
+\r
+package org.apache.poi.xssf.usermodel;\r
+\r
+import java.io.IOException;\r
+import java.io.UnsupportedEncodingException;\r
+\r
+import junit.framework.AssertionFailedError;\r
+import junit.framework.TestCase;\r
+\r
+import org.apache.poi.hssf.HSSFTestDataSamples;\r
+import org.apache.poi.ss.usermodel.Cell;\r
+import org.apache.poi.ss.usermodel.Row;\r
+import org.apache.poi.ss.usermodel.Sheet;\r
+import org.apache.poi.ss.usermodel.Workbook;\r
+import org.apache.poi.xssf.SXSSFITestDataProvider;\r
+import org.apache.poi.xssf.XSSFTestDataSamples;\r
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;\r
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;\r
+\r
+/**\r
+ * @author centic\r
+ * \r
+ * This testcase contains tests for bugs that are yet to be fixed. Therefore,\r
+ * the standard ant test target does not run these tests. Run this testcase with\r
+ * the single-test target. The names of the tests usually correspond to the\r
+ * Bugzilla id's PLEASE MOVE tests from this class to TestBugs once the bugs are\r
+ * fixed, so that they are then run automatically.\r
+ */\r
+public final class TestUnfixedBugs extends TestCase {\r
+    public void testBug54084Unicode() throws IOException {\r
+        // sample XLSX with the same text-contents as the text-file above\r
+        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("54084 - Greek - beyond BMP.xlsx");\r
+        \r
+        verifyBug54084Unicode(wb);\r
+\r
+//        OutputStream baos = new FileOutputStream("/tmp/test.xlsx");\r
+//        try {\r
+//            wb.write(baos);\r
+//        } finally {\r
+//            baos.close();\r
+//        }\r
+        \r
+        // now write the file and read it back in\r
+        XSSFWorkbook wbWritten = XSSFTestDataSamples.writeOutAndReadBack(wb);\r
+        verifyBug54084Unicode(wbWritten);\r
+\r
+        // finally also write it out via the streaming interface and verify that we still can read it back in\r
+        Workbook wbStreamingWritten = SXSSFITestDataProvider.instance.writeOutAndReadBack(new SXSSFWorkbook(wb));\r
+        verifyBug54084Unicode(wbStreamingWritten);\r
+    }\r
+\r
+    private void verifyBug54084Unicode(Workbook wb) throws UnsupportedEncodingException {\r
+        // expected data is stored in UTF-8 in a text-file\r
+        String testData = new String(HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt"), "UTF-8").trim();\r
+        \r
+        Sheet sheet = wb.getSheetAt(0);\r
+        Row row = sheet.getRow(0);\r
+        Cell cell = row.getCell(0);\r
+        \r
+        String value = cell.getStringCellValue();\r
+        //System.out.println(value);\r
+        \r
+        assertEquals("The data in the text-file should exactly match the data that we read from the workbook", testData, value);\r
+    }   \r
+}\r

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
index 0ebb78e37fe2dcaace3550a720bb2895ed76dacc..e62909eddf02ebecc76453bd88e7b873f0d91bff 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
@@ -25,14 +25,6 @@ import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.record.RecordFormatException;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.SXSSFITestDataProvider;
-import org.apache.poi.xssf.XSSFTestDataSamples;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 /**
  * @author aviks
@@ -85,41 +77,4 @@ public final class TestUnfixedBugs extends TestCase {
 
         assertEquals("evaluating e1", 30., eval.evaluate(e1).getNumberValue());
     }
-    
-
-    public void testBug54084Unicode() throws IOException {
-        // sample XLSX with the same text-contents as the text-file above
-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("54084 - Greek - beyond BMP.xlsx");
-        
-        verifyBug54084Unicode(wb);
-
-//        OutputStream baos = new FileOutputStream("/tmp/test.xlsx");
-//        try {
-//            wb.write(baos);
-//        } finally {
-//            baos.close();
-//        }
-        
-        // now write the file and read it back in
-        XSSFWorkbook wbWritten = XSSFTestDataSamples.writeOutAndReadBack(wb);
-        verifyBug54084Unicode(wbWritten);
-
-        // finally also write it out via the streaming interface and verify that we still can read it back in
-        Workbook wbStreamingWritten = SXSSFITestDataProvider.instance.writeOutAndReadBack(new SXSSFWorkbook(wb));
-        verifyBug54084Unicode(wbStreamingWritten);
-    }
-
-    private void verifyBug54084Unicode(Workbook wb) throws UnsupportedEncodingException {
-        // expected data is stored in UTF-8 in a text-file
-        String testData = new String(HSSFTestDataSamples.getTestDataFileContent("54084 - Greek - beyond BMP.txt"), "UTF-8").trim();
-        
-        Sheet sheet = wb.getSheetAt(0);
-        Row row = sheet.getRow(0);
-        Cell cell = row.getCell(0);
-        
-        String value = cell.getStringCellValue();
-        //System.out.println(value);
-        
-        assertEquals("The data in the text-file should exactly match the data that we read from the workbook", testData, value);
-    }   
 }