修改测试案例

easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java

@@ -1,20 +1,11 @@
 package com.alibaba.easyexcel.test.core.excludeorinclude;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
+import org.junit.jupiter.api.*;
 
-import org.junit.jupiter.api.Assertions;
+import java.io.File;
-import org.junit.jupiter.api.BeforeAll;
+import java.util.*;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
 
 /**
  * @author Jiaju Zhuang
@@ -159,7 +150,7 @@ public class ExcludeOrIncludeDataTest {
         excludeColumnIndexes.add(0);
         excludeColumnIndexes.add(3);
         EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnIndexes(excludeColumnIndexes).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -175,7 +166,7 @@ public class ExcludeOrIncludeDataTest {
         excludeColumnFieldNames.add("column3");
         excludeColumnFieldNames.add("column4");
         EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnFieldNames(excludeColumnFieldNames).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -189,7 +180,7 @@ public class ExcludeOrIncludeDataTest {
         includeColumnIndexes.add(1);
         includeColumnIndexes.add(2);
         EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnIndexes(includeColumnIndexes).sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -203,8 +194,10 @@ public class ExcludeOrIncludeDataTest {
         Set<String> includeColumnFieldNames = new HashSet<String>();
         includeColumnFieldNames.add("column2");
         includeColumnFieldNames.add("column3");
-        EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnFieldNames(includeColumnFieldNames).sheet()
+        EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .doWrite(data());
+                .sheet()
+                .includeColumnFieldNames(includeColumnFieldNames)
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -220,10 +213,10 @@ public class ExcludeOrIncludeDataTest {
         includeColumnIndexes.add(2);
         includeColumnIndexes.add(0);
         EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .includeColumnIndexes(includeColumnIndexes)
+                .includeColumnIndexes(includeColumnIndexes)
-            .orderByIncludeColumn(true).
+                .orderByIncludeColumn(true).
-            sheet()
+                sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);
@@ -240,10 +233,10 @@ public class ExcludeOrIncludeDataTest {
         includeColumnFieldNames.add("column2");
         includeColumnFieldNames.add("column3");
         EasyExcel.write(file, ExcludeOrIncludeData.class)
-            .includeColumnFieldNames(includeColumnFieldNames)
+                .includeColumnFieldNames(includeColumnFieldNames)
-            .orderByIncludeColumn(true).
+                .orderByIncludeColumn(true).
-            sheet()
+                sheet()
-            .doWrite(data());
+                .doWrite(data());
         List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
         Assertions.assertEquals(1, dataMap.size());
         Map<Integer, String> record = dataMap.get(0);

easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java

@@ -705,19 +705,6 @@ public class WriteTest {
         EasyExcel.write(fileName).head(head()).sheet("模板").doWrite(dataList());
     }
 
-    @Test
-    public void sheetCol(){
-        String fileName = TestFileUtil.getPath() + "customCol" + System.currentTimeMillis() + ".xlsx";
-        try (ExcelWriter excelWriter = EasyExcel.write(fileName, DemoData.class).includeColumnFieldNames(Arrays.asList("string","date","doubleData")).build()) {
-            // 把sheet设置为不需要头 不然会输出sheet的头 这样看起来第一个table 就有2个头了
-            WriteSheet writeSheet = EasyExcel.writerSheet("模板").includeColumnFieldNames(Arrays.asList("string","date")).build();
-            excelWriter.write(data(), writeSheet);
-            writeSheet = EasyExcel.writerSheet(1,"模板1").needHead(false).build();
-            // 第二次写如也会创建头，然后在第一次的后面写入数据
-            WriteTable string = EasyExcel.writerTable().needHead(true).includeColumnFieldNames(Arrays.asList("string")).build();
-            excelWriter.write(data(),writeSheet,string);
-        }
-    }
     private List<LongestMatchColumnWidthData> dataLong() {
         List<LongestMatchColumnWidthData> list = ListUtils.newArrayList();
         for (int i = 0; i < 10; i++) {