Merge branch 'dev-1.10.x'

Author: Sayi

poi-tl/src/test/java/com/deepoove/poi/tl/config/ConfigELTest.java

@@ -1,6 +1,7 @@
 package com.deepoove.poi.tl.config;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -65,9 +66,7 @@ public void testDefaultELMode() throws Exception {
         paragraph = document.getParagraphArray(1);
         assertEquals(paragraph.getText(), "卅一");
         paragraph = document.getParagraphArray(3);
-        assertEquals(paragraph.getText(), "");
-        paragraph = document.getParagraphArray(4);
-        assertEquals(paragraph.getText(), "");
+        assertNull(paragraph);
 
         assertEquals(document.getAllPictures().size(), 1);
         assertEquals(document.getTables().size(), 1);

poi-tl/src/test/java/com/deepoove/poi/tl/issue/Issue157.java

@@ -57,10 +57,8 @@ public void testNullMerge() throws Exception {
         XWPFParagraph paragraph = document.getParagraphArray(0);
         assertEquals(paragraph.getText(), "testTitle");
         paragraph = document.getParagraphArray(1);
-        assertEquals(paragraph.getText(), "");
-        paragraph = document.getParagraphArray(2);
         assertEquals(paragraph.getText(), "老师：t1\n" + "年龄：18");
-        paragraph = document.getParagraphArray(3);
+        paragraph = document.getParagraphArray(2);
         assertEquals(paragraph.getText(), "老师：t2\n" + "年龄：36");
 
         document.close();

poi-tl/src/test/java/com/deepoove/poi/tl/issue/Issue636.java

@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.deepoove.poi.XWPFTemplate;
-
 public class Issue636 {
 
     @Test