Merge pull request #5 from ochedru/issue_4

Closes #4
dhatim · Apr 19, 2016 · bfcc8df · bfcc8df
2 parents fa41014 + 7749e0e
commit bfcc8df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/dhatim/fastexcel/Workbook.java b/src/main/java/org/dhatim/fastexcel/Workbook.java
@@ -177,6 +177,11 @@ int getIndex(Worksheet ws) {
     public Worksheet newWorksheet(String name) {
         // Replace chars forbidden in worksheet names (backslahses and colons) by dashes
         String sheetName = name.replaceAll("[/\\\\\\?\\*\\]\\[\\:]", "-");
+
+        // Maximum length worksheet name is 31 characters
+        if (sheetName.length() > 31) {
+            sheetName = sheetName.substring(0, 31);
+        }
         Worksheet worksheet = new Worksheet(this, sheetName);
         synchronized (worksheets) {
             worksheets.add(worksheet);

diff --git a/src/test/java/org/dhatim/fastexcel/Correctness.java b/src/test/java/org/dhatim/fastexcel/Correctness.java
@@ -68,6 +68,14 @@ public void singleEmptyWorksheet() throws Exception {
         byte[] data = writeWorkbook(wb -> wb.newWorksheet("Worksheet 1"));
     }
 
+    @Test
+    public void worksheetWithNameLongerThan31Chars() throws Exception {
+        byte[] data = writeWorkbook(wb -> {
+            Worksheet ws = wb.newWorksheet("01234567890123456789012345678901");
+            assertThat(ws.getName()).isEqualTo("0123456789012345678901234567890");
+        });
+    }
+
     @Test
     public void checkMaxRows() throws Exception {
         byte[] data = writeWorkbook(wb -> wb.newWorksheet("Worksheet 1").value(Worksheet.MAX_ROWS - 1, 0, "test"));