From 6f5a44c139cf332077da92db7e2e2b88d91b0eeb Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Fri, 4 Nov 2016 10:55:31 +0000
Subject: [PATCH] More unit testing for XWPF list numbering complex cases, and
 some TODOs on improving it, inspired by users@ discussions

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1768005 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/poi/xwpf/usermodel/XWPFNum.java    |   4 +-
 .../poi/xwpf/usermodel/TestXWPFParagraph.java |  84 ++++++++++++++++++
 test-data/document/ComplexNumberedLists.docx  | Bin 0 -> 14458 bytes
 3 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 test-data/document/ComplexNumberedLists.docx

diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
index b1ae7ed8c..7674510c1 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
+++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
@@ -19,8 +19,8 @@ package org.apache.poi.xwpf.usermodel;
 
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTNum;
 
-/**
- * @author Philipp Epp
+/**
+ * TODO Bring more of the logic over from XWPFParagraph
  */
 public class XWPFNum {
     protected XWPFNumbering numbering;
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index 6cd3171f3..756aeef55 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
@@ -592,4 +592,88 @@ public final class TestXWPFParagraph {
         }
         assertEquals("This is a test.\n\n\n\n3\n4\n5\n\n\n\nThis is a whole paragraph where one word is deleted.\n", str.toString());
     }
+    
+    @Test
+    public void testNumberedLists() throws Exception {
+        XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("ComplexNumberedLists.docx");
+        XWPFParagraph p;
+        
+        p = doc.getParagraphArray(0);
+        assertEquals("This is a document with numbered lists", p.getText());
+        assertEquals(null, p.getNumID());
+        assertEquals(null, p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(1);
+        assertEquals("Entry #1", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(2);
+        assertEquals("Entry #2, with children", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(3);
+        assertEquals("2-a", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(4);
+        assertEquals("2-b", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(5);
+        assertEquals("2-c", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(1), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(6);
+        assertEquals("Entry #3", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(7);
+        assertEquals("Entry #4", p.getText());
+        assertEquals(BigInteger.valueOf(1), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        // New list
+        p = doc.getParagraphArray(8);
+        assertEquals("Restarted to 1 from 5", p.getText());
+        assertEquals(BigInteger.valueOf(2), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(9);
+        assertEquals("Restarted @ 2", p.getText());
+        assertEquals(BigInteger.valueOf(2), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        p = doc.getParagraphArray(10);
+        assertEquals("Restarted @ 3", p.getText());
+        assertEquals(BigInteger.valueOf(2), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        assertEquals(null, p.getNumStartOverride());
+        
+        // New list starting at 10
+        p = doc.getParagraphArray(11);
+        assertEquals("Jump to new list at 10", p.getText());
+        assertEquals(BigInteger.valueOf(6), p.getNumID());
+        assertEquals(BigInteger.valueOf(0), p.getNumIlvl());
+        // TODO Why isn't this seen as 10?
+        assertEquals(null, p.getNumStartOverride());
+        
+        // TODO Shouldn't we use XWPFNumbering or similar here?
+        // TODO Make it easier to change
+    }
 }
diff --git a/test-data/document/ComplexNumberedLists.docx b/test-data/document/ComplexNumberedLists.docx
new file mode 100644
index 0000000000000000000000000000000000000000..b4409c9d1595df7001e18a5bccf783fb20d73611
GIT binary patch
literal 14458
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

literal 0
HcmV?d00001