Skip to content

Commit 5afa7e2

Browse files
alaahongalaahong
authored
chore: reset test location and exclude spring-boot test (#554)
* chore: reset test location and exclude spring-boot test * refactor: adjust indentation for improved readability in FillTest.java * chore: update Mockito version to 4.11.0 for jdk 8
1 parent c06fa23 commit 5afa7e2

File tree

332 files changed

+759
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

332 files changed

+759
-384
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ jobs:
5555
restore-keys: |
5656
${{ runner.os }}-m2
5757
- name: Test with Maven
58-
run: ./mvnw test -B -Dmaven.test.skip=false
58+
run: ./mvnw test -B -Dmaven.test.skip=false -pl fastexcel
5959
- name: Publish Unit Test Results
6060
uses: EnricoMi/publish-unit-test-result-action@v2
6161
if: (!cancelled())
6262
with:
6363
files: "**/target/surefire-reports/*.xml"
6464
- name: Maven Build
65-
run: ./mvnw install -B -V
65+
run: ./mvnw install -B -V -pl fastexcel
6666
- name: Java Doc
6767
run: ./mvnw javadoc:javadoc

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
restore-keys: |
3232
${{ runner.os }}-m2
3333
- name: Test with Maven
34-
run: ./mvnw test -B -Dmaven.test.skip=false -Dsurefire.test.includes=cn/idev/excel/test/**/*.java
34+
run: ./mvnw test -B -Dmaven.test.skip=false
3535
- name: Publish Unit Test Results
3636
uses: EnricoMi/publish-unit-test-result-action@v2
3737
if: (!cancelled())

‎fastexcel-examples/pom.xml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>cn.idev.excel</groupId>
8+
<artifactId>fastexcel-parent</artifactId>
9+
<version>1.3.0</version>
10+
</parent>
11+
12+
<artifactId>fastexcel-examples</artifactId>
13+
14+
15+
<properties>
16+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17+
<gpg.skip>true</gpg.skip>
18+
<maven.javadoc.skip>true</maven.javadoc.skip>
19+
<maven.test.skip>true</maven.test.skip>
20+
<maven.deploy.skip>true</maven.deploy.skip>
21+
</properties>
22+
<dependencies>
23+
<dependency>
24+
<groupId>cn.idev.excel</groupId>
25+
<artifactId>fastexcel</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>com.alibaba.fastjson2</groupId>
30+
<artifactId>fastjson2</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-web</artifactId>
36+
<scope>test</scope>
37+
</dependency>
38+
<dependency>
39+
<groupId>org.junit.jupiter</groupId>
40+
<artifactId>junit-jupiter</artifactId>
41+
<scope>test</scope>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.mockito</groupId>
45+
<artifactId>mockito-core</artifactId>
46+
<scope>test</scope>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.mockito</groupId>
50+
<artifactId>mockito-junit-jupiter</artifactId>
51+
<scope>test</scope>
52+
</dependency>
53+
54+
<!-- logback -->
55+
<dependency>
56+
<groupId>org.slf4j</groupId>
57+
<artifactId>slf4j-simple</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.slf4j</groupId>
62+
<artifactId>jcl-over-slf4j</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.slf4j</groupId>
67+
<artifactId>log4j-over-slf4j</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>ch.qos.logback</groupId>
72+
<artifactId>logback-classic</artifactId>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.projectlombok</groupId>
77+
<artifactId>lombok</artifactId>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.mock-server</groupId>
82+
<artifactId>mockserver-netty</artifactId>
83+
<scope>test</scope>
84+
</dependency>
85+
</dependencies>
86+
<build>
87+
<plugins>
88+
<plugin>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-surefire-plugin</artifactId>
91+
<configuration>
92+
<testFailureIgnore>false</testFailureIgnore>
93+
</configuration>
94+
</plugin>
95+
<plugin>
96+
<groupId>org.jacoco</groupId>
97+
<artifactId>jacoco-maven-plugin</artifactId>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
</project>

fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillData.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/fill/FillData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.idev.excel.test.demo.fill;
1+
package cn.idev.excel.demo.fill;
22

33
import java.util.Date;
44
import lombok.EqualsAndHashCode;

fastexcel/src/test/java/cn/idev/excel/test/demo/fill/FillTest.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/fill/FillTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package cn.idev.excel.test.demo.fill;
1+
package cn.idev.excel.demo.fill;
22

33
import cn.idev.excel.ExcelWriter;
44
import cn.idev.excel.FastExcel;
55
import cn.idev.excel.enums.WriteDirectionEnum;
6-
import cn.idev.excel.test.util.TestFileUtil;
76
import cn.idev.excel.util.ListUtils;
87
import cn.idev.excel.util.MapUtils;
8+
import cn.idev.excel.util.TestFileUtil;
99
import cn.idev.excel.write.handler.SheetWriteHandler;
1010
import cn.idev.excel.write.handler.context.SheetWriteHandlerContext;
1111
import cn.idev.excel.write.metadata.WriteSheet;
@@ -23,7 +23,6 @@
2323
/**
2424
* Example of writing and filling data into Excel
2525
*
26-
*
2726
* @since 2.1.1
2827
*/
2928
public class FillTest {
@@ -247,7 +246,6 @@ public void compositeFill() {
247246
* This method demonstrates how to fill an Excel template where date fields
248247
* are already formatted in the template. The written data will automatically
249248
* follow the predefined date format in the template.
250-
*
251249
*/
252250
@Test
253251
public void dateFormatFill() {

fastexcel/src/test/java/cn/idev/excel/test/demo/rare/WriteTest.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/rare/WriteTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package cn.idev.excel.test.demo.rare;
1+
package cn.idev.excel.demo.rare;
22

33
import cn.idev.excel.ExcelWriter;
44
import cn.idev.excel.FastExcel;
5-
import cn.idev.excel.test.demo.write.DemoData;
6-
import cn.idev.excel.test.util.TestFileUtil;
5+
import cn.idev.excel.demo.read.DemoData;
76
import cn.idev.excel.util.FileUtils;
87
import cn.idev.excel.util.ListUtils;
8+
import cn.idev.excel.util.TestFileUtil;
99
import cn.idev.excel.write.handler.RowWriteHandler;
1010
import cn.idev.excel.write.handler.WorkbookWriteHandler;
1111
import cn.idev.excel.write.handler.context.RowWriteHandlerContext;

fastexcel/src/test/java/cn/idev/excel/test/demo/read/CellDataDemoHeadDataListener.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/read/CellDataDemoHeadDataListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.idev.excel.test.demo.read;
1+
package cn.idev.excel.demo.read;
22

33
import cn.idev.excel.context.AnalysisContext;
44
import cn.idev.excel.read.listener.ReadListener;

fastexcel/src/test/java/cn/idev/excel/test/demo/read/CellDataReadDemoData.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/read/CellDataReadDemoData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.idev.excel.test.demo.read;
1+
package cn.idev.excel.demo.read;
22

33
import cn.idev.excel.metadata.data.CellData;
44
import java.util.Date;

fastexcel/src/test/java/cn/idev/excel/test/demo/read/ConverterData.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/read/ConverterData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.idev.excel.test.demo.read;
1+
package cn.idev.excel.demo.read;
22

33
import cn.idev.excel.annotation.ExcelProperty;
44
import cn.idev.excel.annotation.format.DateTimeFormat;

fastexcel/src/test/java/cn/idev/excel/test/demo/read/ConverterDataListener.java renamed to fastexcel-examples/src/test/java/cn/idev/excel/demo/read/ConverterDataListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.idev.excel.test.demo.read;
1+
package cn.idev.excel.demo.read;
22

33
import cn.idev.excel.context.AnalysisContext;
44
import cn.idev.excel.read.listener.ReadListener;

0 commit comments

Comments
 (0)