From c278230bb69dd68ec1e1b92f71b1154004061d5b Mon Sep 17 00:00:00 2001
From: Ugo Cei <ugo@apache.org>
Date: Tue, 19 Feb 2008 12:56:51 +0000
Subject: [PATCH] Moved test data file to own package. Start writing some tests
 for parsing cell styles.

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@629092 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/xssf/usermodel/XSSFWorkbook.java      |   8 ++++++
 src/ooxml/testcases/log4j.properties          |  24 ++++++++++++++++++
 .../apache/poi/xssf/{io => data}/sample.xlsx  | Bin
 .../org/apache/poi/xssf/data/styles.xlsx      | Bin 0 -> 6557 bytes
 .../apache/poi/xssf/io/TestLoadSaveXSSF.java  |  13 +++++++++-
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/ooxml/testcases/log4j.properties
 rename src/ooxml/testcases/org/apache/poi/xssf/{io => data}/sample.xlsx (100%)
 create mode 100644 src/ooxml/testcases/org/apache/poi/xssf/data/styles.xlsx

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index 309225b3a..4d261a4b3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
@@ -34,6 +34,8 @@ import org.apache.poi.ss.usermodel.Palette;
 import org.apache.poi.ss.usermodel.SharedStringSource;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
 import org.apache.poi.xssf.strings.SharedStringsTable;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
@@ -69,6 +71,8 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
     private List<XSSFSheet> sheets = new LinkedList<XSSFSheet>();
     
     private SharedStringSource sharedStringSource;
+
+    private static POILogger log = POILogFactory.getLogger(XSSFWorkbook.class);
     
     public XSSFWorkbook() {
         this.workbook = CTWorkbook.Factory.newInstance();
@@ -94,6 +98,10 @@ public class XSSFWorkbook extends POIXMLDocument implements Workbook {
             // Load individual sheets
             for (CTSheet ctSheet : this.workbook.getSheets().getSheetArray()) {
                 PackageRelationship rel = this.getCorePart().getRelationship(ctSheet.getId());
+                if (rel == null) {
+                    log.log(log.WARN, "No relationship found for sheet " + ctSheet.getId());
+                    continue;
+                }
                 PackagePart part = getPart(rel);
                 WorksheetDocument worksheetDoc = WorksheetDocument.Factory.parse(part.getInputStream());
                 XSSFSheet sheet = new XSSFSheet(ctSheet, worksheetDoc.getWorksheet(), this);
diff --git a/src/ooxml/testcases/log4j.properties b/src/ooxml/testcases/log4j.properties
new file mode 100644
index 000000000..8479c8de2
--- /dev/null
+++ b/src/ooxml/testcases/log4j.properties
@@ -0,0 +1,24 @@
+# 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
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx b/src/ooxml/testcases/org/apache/poi/xssf/data/sample.xlsx
similarity index 100%
rename from src/ooxml/testcases/org/apache/poi/xssf/io/sample.xlsx
rename to src/ooxml/testcases/org/apache/poi/xssf/data/sample.xlsx
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/data/styles.xlsx b/src/ooxml/testcases/org/apache/poi/xssf/data/styles.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..dbfa53cfbf5376106026e3a70b2fd0086bc214d5
GIT binary patch
literal 6557
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

literal 0
HcmV?d00001

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
index 1c445f2b0..ec2b113b8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
@@ -22,6 +22,7 @@ import java.io.File;
 import junit.framework.TestCase;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -33,9 +34,10 @@ public class TestLoadSaveXSSF extends TestCase {
 
     protected void setUp() throws Exception {
         super.setUp();
+        System.setProperty("org.apache.poi.util.POILogger", org.apache.poi.util.CommonsLogger.class.getName());
         filename = System.getProperty("HSSF.testdata.path");
         if (filename == null) {
-            filename = "src/testcases/org/apache/poi/hssf/data";
+            filename = "src/ooxml/testcases/org/apache/poi/xssf/data";
         }
     }
     
@@ -51,5 +53,14 @@ public class TestLoadSaveXSSF extends TestCase {
         cell = row.getCell((short) 0);
         assertEquals("Lorem", cell.getRichStringCellValue().getString());
     }
+    
+    public void testLoadStyles() throws Exception {
+        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "styles.xlsx").getAbsolutePath());
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+        Cell cell = row.getCell((short) 0);
+        CellStyle style = cell.getCellStyle();
+        // assertNotNull(style);
+    }
 
 }