From 454fc23ddeb4024ccf51d00f03cdf161c419494d Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 6 Apr 2022 10:06:52 +0800 Subject: [PATCH 01/11] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b95e559..20a1ef78 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ EasyExcel [钉钉3群(已满): 33797247](https://qr.dingtalk.com/action/joingroup?code=v1,k1,3UGlEScTGQaHpW2cIRo+gkxJ9EVZ5fz26M6nW3uFP30=&_dt_no_comment=1&origin=11) [钉钉4群(已满): 33491624](https://qr.dingtalk.com/action/joingroup?code=v1,k1,V14Pb65Too70rQkEaJ9ohb6lZBZbtp6jIL/q9EWh9vA=&_dt_no_comment=1&origin=11) [钉钉5群(已满): 32134498](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingb9fa1325d9dccc3ecac589edd02f1650&5233a=71a83&cbdbhh=qwertyuiop) -[钉钉6群: 34707941](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingcf68008a1d443ac012d5427bdb061b7a&6ae36c3d-0c80-4=22398493-6c2a-4&cbdbhh=qwertyuiop) +[钉钉6群(已满): 34707941](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingcf68008a1d443ac012d5427bdb061b7a&6ae36c3d-0c80-4=22398493-6c2a-4&cbdbhh=qwertyuiop) +[钉钉7群: 35235427](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=ding532b9018c06c7fc8660273c4b78e6440&167fb=ed003&cbdbhh=qwertyuiop) [官方网站: https://yuque.com/easyexcel](https://www.yuque.com/easyexcel/doc/easyexcel) [常见问题](https://www.yuque.com/easyexcel/faq) From 34bce2ae9736df0a5cefe82abed03c165b3c0815 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 6 Apr 2022 10:08:31 +0800 Subject: [PATCH 02/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20a1ef78..4c0f299f 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ EasyExcel [钉钉3群(已满): 33797247](https://qr.dingtalk.com/action/joingroup?code=v1,k1,3UGlEScTGQaHpW2cIRo+gkxJ9EVZ5fz26M6nW3uFP30=&_dt_no_comment=1&origin=11) [钉钉4群(已满): 33491624](https://qr.dingtalk.com/action/joingroup?code=v1,k1,V14Pb65Too70rQkEaJ9ohb6lZBZbtp6jIL/q9EWh9vA=&_dt_no_comment=1&origin=11) [钉钉5群(已满): 32134498](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingb9fa1325d9dccc3ecac589edd02f1650&5233a=71a83&cbdbhh=qwertyuiop) -[钉钉6群(已满): 34707941](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingcf68008a1d443ac012d5427bdb061b7a&6ae36c3d-0c80-4=22398493-6c2a-4&cbdbhh=qwertyuiop) -[钉钉7群: 35235427](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=ding532b9018c06c7fc8660273c4b78e6440&167fb=ed003&cbdbhh=qwertyuiop) +[钉钉6群(已满): 34707941](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=dingcf68008a1d443ac012d5427bdb061b7a&6ae36c3d-0c80-4=22398493-6c2a-4&cbdbhh=qwertyuiop) +[钉钉7群: 35235427](https://h5.dingtalk.com/circle/healthCheckin.html?dtaction=os&corpId=ding532b9018c06c7fc8660273c4b78e6440&167fb=ed003&cbdbhh=qwertyuiop) [官方网站: https://yuque.com/easyexcel](https://www.yuque.com/easyexcel/doc/easyexcel) [常见问题](https://www.yuque.com/easyexcel/faq) From 578784e9608dc596fd47d9ecc1d952df47a60c03 Mon Sep 17 00:00:00 2001 From: khw <11910710@mail.sustech.edu.cn> Date: Sun, 24 Apr 2022 21:53:31 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86int=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E6=95=B4=E6=95=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/excel/util/NumberUtils.java | 13 +++++++ .../test/temp/issue2443/Issue2443.java | 15 ++++++++ .../test/temp/issue2443/Issue2443Test.java | 36 ++++++++++++++++++ src/test/resources/temp/issue2443/date1.xlsx | Bin 0 -> 10195 bytes src/test/resources/temp/issue2443/date2.xlsx | Bin 0 -> 10213 bytes 5 files changed, 64 insertions(+) create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java create mode 100644 src/test/resources/temp/issue2443/date1.xlsx create mode 100644 src/test/resources/temp/issue2443/date2.xlsx diff --git a/src/main/java/com/alibaba/excel/util/NumberUtils.java b/src/main/java/com/alibaba/excel/util/NumberUtils.java index c467762c..a5f1c512 100644 --- a/src/main/java/com/alibaba/excel/util/NumberUtils.java +++ b/src/main/java/com/alibaba/excel/util/NumberUtils.java @@ -103,6 +103,19 @@ public class NumberUtils { */ public static Integer parseInteger(String string, ExcelContentProperty contentProperty) throws ParseException { if (!hasFormat(contentProperty)) { + // CS304 Issue link: https://github.com/alibaba/easyexcel/issues/2443 + int stringLength = string.length(); + if(stringLength>0){ + int pointer = stringLength; + for(int i=0;i(dataList -> { + for (Issue2443 issueData : dataList) { + log.info("读取到一条数据{}", JSON.toJSONString(issueData)); + } + })).sheet().doRead(); + } + //CS304 (manually written) Issue link: https://github.com/alibaba/easyexcel/issues/2443 + @Test + public void IssueTest2() { + String fileName = TestFileUtil.getPath() + "temp/issue2443" + File.separator + "date2.xlsx"; + EasyExcel.read(fileName, Issue2443.class, new PageReadListener(dataList -> { + for (Issue2443 issueData : dataList) { + log.info("读取到一条数据{}", JSON.toJSONString(issueData)); + } + })).sheet().doRead(); + } +} diff --git a/src/test/resources/temp/issue2443/date1.xlsx b/src/test/resources/temp/issue2443/date1.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..92ef811d9e90289f076a5aefdc30e266ed7bd0cd GIT binary patch literal 10195 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 CIG+9h literal 0 HcmV?d00001 diff --git a/src/test/resources/temp/issue2443/date2.xlsx b/src/test/resources/temp/issue2443/date2.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..c6feb3251b27aa297c7636f90a562b116de71316 GIT binary patch literal 10213 zcmeHtbx@qk(l_qzA!rtN4+NLR-CY8UyK8U{?(XhRf~RFkt_nOp|2^OzJ{Z{;%G=x6IxxyVkYPRi z0QZwDv6}aa8ypPG90Cjs?eAm;wzdqeR+bsDU6PQ@SilRvd$d{`Rx4n>ks=hj3rhX& zE90el-xMS9OyRwz=CQyP;^y%Vg%j2h>114r3({L2Qp7J)3X42^#m&;=drHP;P7&x53aDFsbN>z{r zC9cw>#eE7cin_raz25qPWHiqmH|N&%Je?zZ?A7XbD^tG0bxn6uOr<&TqJpmIh05NX zNzlP~=*3ol)0Y-oc$2OulZ^eU^9DY&IBU|7#a<2)dnm&s+ngFGZ(XB_uZ*2>e75~) zc7Rb&XrDa3<;42BK5wm<`sGrOqRtEd5HD|x6X-t`4ZmzZr~aU5qX$K!|6S3BHuj)L zO-DRvx`&CN@5t}y0jNo5B~epu`Po6=6_FF1*!%aj9LN&JO=%?UA+UO#b(btGo=B6< zWrXg>$@do!~?+hrP60-&()zA^tzQGnC~kTs4F(+Q?HC&$k~Ah z*_%^U`d03TmJqI(vv!@cki-2V8-mm@K6b~?#?tLvRzVDtto>GS8;4X0_c&u2OLQ+X$JzBnkD^GW0o z{aO)uST&&ftuCX&rD%N5c#!f3mgB^CD}<$?W~yPl{%F;5AE-Ej+7NmY-Ph6%nwGPL z?yz01C`xF>qSw1Fzyl4jCj36!J?X?xfKSOl=+V5{px&!QI{5i9^RA(xZS%fs2j3g@Y*wc_y@0+--ie zRx!r;P>?#xDwH5%zQEX-U13RrOaO*PY~#cmucZ6}PFs|B1MBuK#?H-~r`H7u>tKBd zQz~q7ERxx4r8tX?x%}P>dLz^|kxuM!rT$@e&{9=uS^V@Kpv(i5PIQrNOQ6f>4lq@- z-9K?w#BBRGU!f3$(qx>bY2`DOQ=DKH14=R*77+t?pQ#-94hT2*KRP2cU}UeB-&hCUOgM*Hf|W< zIrW}rrfh43KZ>N0MH;G7v~BX(Q}*a5$SVUi`-;U?CN>D* z-cDgc$^dOnd)+0OiCEsiZyyY%ayGg_z%K|!Qe;CZnoOR$2I zU%oBO*TsB|DgFbWdLm}ck@t8pxWs zH>YE z&}>&gQGSML4(OY`V<;m92xS^H7*vQq+mlj=S?ks@DsT&dy+8@>J;)p12ltdWm1-Zd zAMKo;p_)(l(SNbnD>e!tF)tp0BY6kqyR2%nj0LzB-Ubf=`XQ4ag)T&(1D;?n0z!n#MKlfeR zL|A6*A`op1(S)Gi(vh_6pe`&9yrL3%%or}fm{#JnRQ#pw7EpzaM%M1V`(_UPRS|Yn z@8`P`eI!cev_p?5*JOOX)YvUdIJVD|>nU%uU}t=$L%X|=Fta%^%2vsBw_EB-T{79n zh6E>JzB5kA>z%UenJ?S^Kq}p%uG|JWJ1KKL3k%EGUnx7wsP#27UDI=O{+N;_m!CXV zu#0Wtk%|T zYm|yl4qF41+(G>5RQ?Zmv;Kd)|6j-ZpPkubZ2jQv98E!1peM2Qy=j;UDVyoWOhh7#F6go=u8L4a<279XPvtvXV;SO89E_}1HEv+*1 zYh+{}1Uv+VT918vB+{TT*0OR8O_9v*A@t^5k{ldz4pe=8fGQ3q-al?{Z?7%3Rtvb% zg>OW}ht>+!c=b-uLcRF%?Z(cm&sw&odC0IMgOg8^+1jXMmI@*+mRmx;sEEJt)AyqL zVmFDHAUU0sn2*|{p1B1dYGC~V7=Yaxrf)`d3_cbyGhts)`yR^x--D_TJ-Uq#Um+`d zi~sKIv`nmH!3)fLNwhDo$48+&pXfMc+YIG{hG}(=oeE%GxiLlHCYhaA|K&QYm%W%< zh(U>d?vBbxzt&uHbHJBLpftU@miia=EJvO9`kcBPJV2&_6xEi7zQBs~c5o*4s6EG5 z2eRx%CSWrcf=aYfF~$`ws#YL2M3Ng$xfY!gHFJh`0dJ7(rfAtz=}ScoIt9qus0OYd znxKZpcl#^I1FL%umzoxJi@Hw7Fh(b34wr|4edZr~pUV%J@?;8I1Ut7-eo5B5yt#`a92P>*f>y< zqsb6)#|VOKULs%XKBmfbBNExBT;kWe<(;Hs45W(+IgqU!z2!(>UR0h~BTx~6I)~%t zBg@<5rLpM0dXm2-SV7q;?**2CSDNZVBVJJ2$&YGFhc)xQy%=_FvfFQNWR=J^Hx}HP zX(z-G8_@|e41~nM3_K$s##GE*q?aUYIh5D49TY=Y%q^E7ZU#wPOy=*W!07L-xgV?HGkA@G>^H~RTN)A=?;s*owVeOGf z!^RoZK*xlK#vyND`Bz+XT5J?on{O_KZ2e&(#p}SvSuqt>hlc~WPv+BV(J2at1SDK& zoJ7_-Xy)GvEjAJ?B^(qs!KbNfoLUl7PlwyycVn~#Ql2pQmM1UgE~#w0V9(urQriZ; z^E`KQQw__J+za|}K3DiH5{F|6Fr+Rg^Xwgs%n`i-B)+qOd=;ySTrBa2STrIh3P?y; zTsX^VlCCK+<-j&H%CROjUKz4z>K%dH04Yw!)US$j_^53iwM8G_^99cgk=D$873OZu z4X#@gmF*M9PG+_0GX-LDQr9IQQY(xd$Rw*Y$Wv~rvgfAcZrcv4OjB@d*)zFS;v;QN z2aLi9@qAOUo4fZk_0YKus!h0An)p=YVc#8gLcQWNa|dwJ z^ccqbd?~P|U`AY-8&vBKx~&`$25^Lan>wP8cY)(@c9VAltB8x z$JCcrH#sQVugv@#{XqL&BbSL;a(z%-{#+h72G%(M8$rl9hc0ECJ4l^{+@BlY`_Lm*&|lysSFfi7jYj*$9KmG^H*wlX zcDz=wjBwm6KQ6Nks&PxHj!mM8hm8U{FSA9RxrQoOUAO9(_~acjkaI)Tf_6H+Z}_`3 z=kaQ5A5-#65qNDf(p%JXei~0vX}mq;hEEsSjV~^5g)sfAeT(@_o}=a?<`WVKtQo;t zF_|e&*PHF-S0q|Zn=I^XdPd=CNjYP9XHCqwIc(NC*q_ivWN6ORG!SZ;nji0vV+H0Y zI7c%_GV>>6dylO8&#!FLU(V`x$Jf^*o36?I8PsU2Mazgj_&g3dFfim_PR_y6%@XAB z7|Bd&TiDD`KfB}8zxUOz_QErk$}QG1=L!d5QjOt2$AUvPl4g?+Q3%8kNkE?mLCj8! zSOp{DP0(v8=<9^j-Bi13y(|~}lJ8BSxGr~#=cB;VacJO zv62v#V54yZwsEU*YRFhag|2DuyX8f8#ocjX&A4&`3EN`kj%($Vs$981TjTA4jTQ9Q zP{T#e`f_=2Z0j*q)SlyQ^Aapa)C%8cmhNJSh|6cZ-ugkuyR&J72iG9ewj{br#a|OU@2#C*KS8sd4rZUiYm|XI^3*I`ro(QsI*= zQRQL^$~E4eSeHYq<+H8qD6IGT9ToVZkR8#O4l;@3I=F!c*cguR+-y`mR6QL)n1(FB z)xhK==4v)Aw&qe_-EbrZiZwRg=n_${n7&OB6K$LQhum82w&@&>Bzg*AYON~lcC$QI zFtuks4Ek+ED`)Lxe1Tm+p;Z^QJxZcXXKf0uk`F~f?}T1wZK!6gd@SzU0{x1_vWA^i z(2Dm!DCpeE?s?T0oCGc&BzXM~hTO6|V->37cyN`LHiRh#rdO5V#8}sNn}g_YeYEjh z^IWCY+qqnbFE=HCJsLw4Xs(fq!ny>G$0311k@|;@(TiT!fd}X1hKMk$PCU~zb|@xJ z3})etx9>{>IPfo$UOul-Ez>A@nf5VJw?bd|-CULLt!l$;sl|%uvz}(p8zv4tnI8(3 z?2x)rqfSPM>QmgGHq+wO zaU+(5h<6N`C4ZN!k`^-Ri7dLtcJ_g%m@uRAE2(W&b3h){Ic!Uu0vJKmk5MW?zjR^% z6p1ipElaigxh+^o?8;RTYBVVUqxp*oIv<+t1gQCMK{t_3Trcy3%s6IWxK3NzW6ahL z!iz&-jU_wN(0;CaZKTDjVYp6K+dBYn^fo4L0Dq03kD?gEWw`ntC^a;O|BS2ueXxVqRtumwX? z$G_W;tu03Wqxq9ne9tUceQ4PE>bRDAalVbjI||~)Ch2}YTi8TIt-3_wIi32N`M@Zg z*$Cc4%Fny5-kzDdy*#h%Ws$0*DπAa3gYJxI>4+}B}S&Ki#bRbPHEAsj+m0_tp_ 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 bQhpYT<)xq>qnHOLfe9A(ux1{> Date: Sun, 24 Apr 2022 23:03:19 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86javadoc?= =?UTF-8?q?=E5=92=8C=E5=AF=B9method=E7=9A=84=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/excel/util/NumberUtils.java | 8 +++---- .../test/temp/issue2443/Issue2443Test.java | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/excel/util/NumberUtils.java b/src/main/java/com/alibaba/excel/util/NumberUtils.java index a5f1c512..d52a3299 100644 --- a/src/main/java/com/alibaba/excel/util/NumberUtils.java +++ b/src/main/java/com/alibaba/excel/util/NumberUtils.java @@ -95,11 +95,11 @@ public class NumberUtils { } /** - * parse + * parse Integer from string * - * @param string - * @param contentProperty - * @return + * @param string An integer read in string format + * @param contentProperty Properties of the content read in + * @return An integer converted from a string */ public static Integer parseInteger(String string, ExcelContentProperty contentProperty) throws ParseException { if (!hasFormat(contentProperty)) { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java index 4695f293..57484b74 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java @@ -1,14 +1,17 @@ package com.alibaba.easyexcel.test.temp.issue2443; import com.alibaba.easyexcel.test.util.TestFileUtil; +import com.alibaba.excel.metadata.property.ExcelContentProperty; +import com.alibaba.excel.util.NumberUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.read.listener.PageReadListener; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.junit.Ignore; import org.junit.Test; - +import static org.junit.Assert.*; import java.io.File; +import java.text.ParseException; @Ignore @Slf4j @@ -33,4 +36,21 @@ public class Issue2443Test { } })).sheet().doRead(); } + + @Test + public void parseIntegerTest1() throws ParseException { + String string = "1.00"; + ExcelContentProperty contentProperty = null; + int Int = NumberUtils.parseInteger(string,contentProperty); + assertEquals(1, Int); + } + + @Test + public void parseIntegerTest2() throws ParseException { + String string = "2.00"; + ExcelContentProperty contentProperty = null; + int Int = NumberUtils.parseInteger(string,contentProperty); + assertEquals(2, Int); + } + } From 4340aca34197322613a4a1466b3f446363824f36 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 19:47:54 +0800 Subject: [PATCH 05/11] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D03=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=97=A0=E6=B3=95=E8=AF=BB=E5=8F=96=E5=88=B0=E5=85=AC?= =?UTF-8?q?=E5=BC=8F=E6=A0=BC=E5=BC=8F=E7=9A=84bug=20[Issue=20#2444](https?= =?UTF-8?q?://github.com/alibaba/easyexcel/issues/2444)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/analysis/v03/handlers/FormulaRecordHandler.java | 1 + update.md | 1 + 2 files changed, 2 insertions(+) diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v03/handlers/FormulaRecordHandler.java b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v03/handlers/FormulaRecordHandler.java index f5d7ff0a..09188cb2 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v03/handlers/FormulaRecordHandler.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/analysis/v03/handlers/FormulaRecordHandler.java @@ -64,6 +64,7 @@ public class FormulaRecordHandler extends AbstractXlsRecordHandler implements Ig dataFormatData.setFormat(BuiltinFormats.getBuiltinFormat(dataFormatData.getIndex(), xlsReadContext.xlsReadWorkbookHolder().getFormatTrackingHSSFListener().getFormatString(frec), xlsReadContext.readSheetHolder().getGlobalConfiguration().getLocale())); + tempCellData.setDataFormatData(dataFormatData); cellMap.put((int)frec.getColumn(), tempCellData); break; case ERROR: diff --git a/update.md b/update.md index 5d576965..db937596 100644 --- a/update.md +++ b/update.md @@ -5,6 +5,7 @@ * 修复CSV不关闭流的bug [Issue #2309](https://github.com/alibaba/easyexcel/issues/2309) * 修复`filed`拼接错误 [Issue #2390](https://github.com/alibaba/easyexcel/issues/2390) * 修复`BigIntegerStringConverter`无效的bug [Issue #2325](https://github.com/alibaba/easyexcel/issues/2325) +* 修复03版本无法读取到公式格式的bug [Issue #2444](https://github.com/alibaba/easyexcel/issues/2444) # 3.0.5 From 7147d1d9d25517009901557a37e99a07cfab3882 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 20:13:19 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyexcel-test/README.md | 3 ++ easyexcel-test/pom.xml | 24 ++++++++++++++ .../easyexcel/test/core/StyleTestUtils.java | 0 .../test/core/annotation/AnnotationData.java | 0 .../annotation/AnnotationDataListener.java | 0 .../core/annotation/AnnotationDataTest.java | 0 .../AnnotationIndexAndNameData.java | 0 .../AnnotationIndexAndNameDataListener.java | 0 .../AnnotationIndexAndNameDataTest.java | 0 .../core/annotation/AnnotationStyleData.java | 0 .../core/celldata/CellDataDataListener.java | 0 .../test/core/celldata/CellDataDataTest.java | 0 .../test/core/celldata/CellDataReadData.java | 0 .../test/core/celldata/CellDataWriteData.java | 0 .../core/converter/ConverterDataListener.java | 0 .../core/converter/ConverterDataTest.java | 8 ++--- .../core/converter/ConverterReadData.java | 0 .../test/core/converter/ConverterTest.java | 0 .../core/converter/ConverterWriteData.java | 0 .../test/core/converter/ImageData.java | 0 .../core/converter/ReadAllConverterData.java | 0 .../ReadAllConverterDataListener.java | 0 .../test/core/dataformat/DateFormatData.java | 0 .../test/core/dataformat/DateFormatTest.java | 4 +-- .../test/core/encrypt/EncryptData.java | 0 .../core/encrypt/EncryptDataListener.java | 0 .../test/core/encrypt/EncryptDataTest.java | 0 .../test/core/exception/ExceptionData.java | 0 .../core/exception/ExceptionDataListener.java | 0 .../core/exception/ExceptionDataTest.java | 0 .../exception/ExceptionThrowDataListener.java | 0 .../ExcludeOrIncludeData.java | 0 .../ExcludeOrIncludeDataTest.java | 0 .../easyexcel/test/core/extra/ExtraData.java | 0 .../test/core/extra/ExtraDataListener.java | 0 .../test/core/extra/ExtraDataTest.java | 4 +-- .../easyexcel/test/core/fill/FillData.java | 0 .../test/core/fill/FillDataTest.java | 22 ++++++------- .../fill/annotation/FillAnnotationData.java | 0 .../annotation/FillAnnotationDataTest.java | 6 ++-- .../fill/style/FillStyleAnnotatedData.java | 0 .../fill/style/FillStyleAnnotatedTest.java | 4 +-- .../test/core/fill/style/FillStyleData.java | 0 .../core/fill/style/FillStyleDataTest.java | 4 +-- .../test/core/handler/WriteHandler.java | 0 .../test/core/handler/WriteHandlerData.java | 0 .../test/core/handler/WriteHandlerTest.java | 0 .../test/core/head/ComplexDataListener.java | 0 .../test/core/head/ComplexHeadData.java | 0 .../test/core/head/ComplexHeadDataTest.java | 0 .../test/core/head/ListHeadDataListener.java | 0 .../test/core/head/ListHeadDataTest.java | 0 .../easyexcel/test/core/head/NoHeadData.java | 0 .../test/core/head/NoHeadDataListener.java | 0 .../test/core/head/NoHeadDataTest.java | 0 .../easyexcel/test/core/large/LargeData.java | 0 .../test/core/large/LargeDataListener.java | 0 .../test/core/large/LargeDataTest.java | 10 +++--- .../multiplesheets/MultipleSheetsData.java | 0 .../MultipleSheetsDataTest.java | 4 +-- .../MultipleSheetsListener.java | 0 .../test/core/nomodel/NoModelDataTest.java | 0 .../test/core/noncamel/UnCamelData.java | 0 .../core/noncamel/UnCamelDataListener.java | 0 .../test/core/noncamel/UnCamelDataTest.java | 0 .../test/core/parameter/ParameterData.java | 0 .../core/parameter/ParameterDataListener.java | 0 .../core/parameter/ParameterDataTest.java | 0 .../test/core/repetition/RepetitionData.java | 0 .../repetition/RepetitionDataListener.java | 0 .../core/repetition/RepetitionDataTest.java | 0 .../test/core/simple/SimpleData.java | 0 .../test/core/simple/SimpleDataListener.java | 0 .../simple/SimpleDataSheetNameListener.java | 0 .../test/core/simple/SimpleDataTest.java | 4 +-- .../easyexcel/test/core/skip/SkipData.java | 0 .../test/core/skip/SkipDataTest.java | 0 .../easyexcel/test/core/sort/SortData.java | 0 .../test/core/sort/SortDataListener.java | 0 .../test/core/sort/SortDataTest.java | 0 .../easyexcel/test/core/style/StyleData.java | 0 .../test/core/style/StyleDataListener.java | 0 .../test/core/style/StyleDataTest.java | 0 .../test/core/template/TemplateData.java | 0 .../core/template/TemplateDataListener.java | 0 .../test/core/template/TemplateDataTest.java | 4 +-- .../easyexcel/test/demo/fill/FillData.java | 0 .../easyexcel/test/demo/fill/FillTest.java | 12 +++---- .../read/CellDataDemoHeadDataListener.java | 0 .../test/demo/read/CellDataReadDemoData.java | 0 .../test/demo/read/ConverterData.java | 0 .../test/demo/read/ConverterDataListener.java | 0 .../read/CustomStringStringConverter.java | 0 .../easyexcel/test/demo/read/DemoDAO.java | 0 .../easyexcel/test/demo/read/DemoData.java | 0 .../test/demo/read/DemoDataListener.java | 0 .../test/demo/read/DemoExceptionListener.java | 0 .../test/demo/read/DemoExtraData.java | 0 .../test/demo/read/DemoExtraListener.java | 0 .../test/demo/read/DemoHeadDataListener.java | 0 .../test/demo/read/ExceptionDemoData.java | 0 .../test/demo/read/IndexOrNameData.java | 0 .../demo/read/IndexOrNameDataListener.java | 0 .../test/demo/read/NoModelDataListener.java | 0 .../easyexcel/test/demo/read/ReadTest.java | 30 +++++++++--------- .../easyexcel/test/demo/web/DownloadData.java | 0 .../test/demo/web/EasyexcelApplication.java | 0 .../easyexcel/test/demo/web/UploadDAO.java | 0 .../easyexcel/test/demo/web/UploadData.java | 0 .../test/demo/web/UploadDataListener.java | 0 .../easyexcel/test/demo/web/WebTest.java | 0 .../test/demo/write/CommentWriteHandler.java | 0 .../test/demo/write/ComplexHeadData.java | 0 .../test/demo/write/ConverterData.java | 0 .../demo/write/CustomCellWriteHandler.java | 0 .../demo/write/CustomSheetWriteHandler.java | 0 .../write/CustomStringStringConverter.java | 0 .../easyexcel/test/demo/write/DemoData.java | 0 .../test/demo/write/DemoMergeData.java | 0 .../test/demo/write/DemoStyleData.java | 0 .../demo/write/ImageDataWithAnnotation.java | 0 .../test/demo/write/ImageDemoData.java | 0 .../easyexcel/test/demo/write/IndexData.java | 0 .../write/LongestMatchColumnWidthData.java | 0 .../test/demo/write/WidthAndHeightData.java | 0 .../test/demo/write/WriteCellDemoData.java | 0 .../easyexcel/test/demo/write/WriteTest.java | 4 +-- .../alibaba/easyexcel/test/temp/CamlData.java | 0 .../easyexcel/test/temp/FillTempTest.java | 0 .../easyexcel/test/temp/Lock2Test.java | 0 .../alibaba/easyexcel/test/temp/LockData.java | 0 .../easyexcel/test/temp/LockDataListener.java | 0 .../alibaba/easyexcel/test/temp/LockTest.java | 0 .../easyexcel/test/temp/StyleData.java | 0 .../easyexcel/test/temp/StyleTest.java | 0 .../easyexcel/test/temp/TempFillData.java | 0 .../easyexcel/test/temp/WriteLargeTest.java | 4 +-- .../easyexcel/test/temp/WriteV33Test.java | 0 .../easyexcel/test/temp/WriteV34Test.java | 0 .../easyexcel/test/temp/Xls03Test.java | 0 .../easyexcel/test/temp/bug/DataType.java | 0 .../easyexcel/test/temp/bug/ExcelCreat.java | 0 .../easyexcel/test/temp/bug/HeadType.java | 0 .../easyexcel/test/temp/cache/CacheTest.java | 0 .../easyexcel/test/temp/csv/CsvData.java | 0 .../test/temp/csv/CsvDataListeer.java | 0 .../easyexcel/test/temp/csv/CsvReadTest.java | 0 .../easyexcel/test/temp/data/DataType.java | 0 .../easyexcel/test/temp/data/HeadType.java | 0 .../test/temp/dataformat/DataFormatData.java | 0 .../test/temp/dataformat/DataFormatTest.java | 2 +- .../test/temp/dataformat/DataFormatter1.java | 0 .../easyexcel/test/temp/fill/FillData2.java | 0 .../test/temp/fill/FillTempTest.java | 10 +++--- .../test/temp/issue1662/Data1662.java | 0 .../test/temp/issue1662/Issue1662Test.java | 0 .../test/temp/issue1663/FillData.java | 0 .../test/temp/issue1663/FillTest.java | 4 +-- .../test/temp/issue2443/Issue2443.java | 0 .../test/temp/issue2443/Issue2443Test.java | 0 .../easyexcel/test/temp/large/LargeData.java | 0 .../test/temp/large/LargeDataListener.java | 0 .../temp/large/NoModelLargeDataListener.java | 0 .../test/temp/large/TempLargeDataTest.java | 8 ++--- .../easyexcel/test/temp/poi/Poi2Test.java | 0 .../easyexcel/test/temp/poi/Poi3Test.java | 2 +- .../test/temp/poi/PoiEncryptTest.java | 0 .../test/temp/poi/PoiFormatTest.java | 0 .../easyexcel/test/temp/poi/PoiTest.java | 18 +++++------ .../easyexcel/test/temp/poi/PoiWriteTest.java | 0 .../easyexcel/test/temp/poi/TestCell.java | 0 .../easyexcel/test/temp/read/CommentTest.java | 0 .../easyexcel/test/temp/read/HDListener.java | 0 .../test/temp/read/HeadListener.java | 0 .../test/temp/read/HeadReadData.java | 0 .../test/temp/read/HeadReadTest.java | 0 .../test/temp/read/TestListener.java | 0 .../easyexcel/test/temp/simple/DemoData1.java | 0 .../easyexcel/test/temp/simple/DemoData2.java | 0 .../test/temp/simple/HgListener.java | 0 .../easyexcel/test/temp/simple/HgTest.java | 0 .../easyexcel/test/temp/simple/JsonData.java | 0 .../test/temp/simple/RepeatListener.java | 0 .../test/temp/simple/RepeatTest.java | 0 .../easyexcel/test/temp/simple/Wirte.java | 0 .../test/temp/simple/WriteCellHandler.java | 0 .../easyexcel/test/temp/simple/WriteData.java | 0 .../test/temp/simple/WriteHandler.java | 0 .../test/temp/write/TempWriteData.java | 0 .../test/temp/write/TempWriteTest.java | 0 .../easyexcel/test/util/TestFileUtil.java | 0 .../test/resources/converter/converter03.xls | Bin .../test/resources/converter/converter07.xlsx | Bin .../test/resources/converter/converterCsv.csv | 0 .../test/resources/converter/img.jpg | Bin .../test/resources/dataformat/dataformat.xls | Bin .../test/resources/dataformat/dataformat.xlsx | Bin .../test/resources/demo/cellDataDemo.xlsx | Bin .../test/resources/demo/demo.xlsx | Bin .../test/resources/demo/extra.xlsx | Bin .../test/resources/demo/fill/complex.xlsx | Bin .../demo/fill/complexFillWithTable.xlsx | Bin .../test/resources/demo/fill/composite.xlsx | Bin .../test/resources/demo/fill/horizontal.xlsx | Bin .../test/resources/demo/fill/list.xlsx | Bin .../test/resources/demo/fill/simple.xlsx | Bin .../test/resources/extra/extra.xls | Bin .../test/resources/extra/extra.xlsx | Bin .../test/resources/fill/annotation.xls | Bin .../test/resources/fill/annotation.xlsx | Bin .../test/resources/fill/byName.xls | Bin .../test/resources/fill/byName.xlsx | Bin .../test/resources/fill/complex.xls | Bin .../test/resources/fill/complex.xlsx | Bin .../test/resources/fill/composite.xls | Bin .../test/resources/fill/composite.xlsx | Bin .../test/resources/fill/horizontal.xls | Bin .../test/resources/fill/horizontal.xlsx | Bin .../test/resources/fill/simple.csv | 0 .../test/resources/fill/simple.xls | Bin .../test/resources/fill/simple.xlsx | Bin .../test/resources/fill/style.xls | Bin .../test/resources/fill/style.xlsx | Bin .../test/resources/large/fill.xlsx | Bin .../test/resources/large/large07.xlsx | Bin .../test/resources/logback.xml | 0 .../multiplesheets/multiplesheets.xls | Bin .../multiplesheets/multiplesheets.xlsx | Bin .../test/resources/simple/simple07.xlsx | Bin .../resources/temp/issue1663/template.xlsx | Bin .../test/resources/temp/issue2443/date1.xlsx | Bin .../test/resources/temp/issue2443/date2.xlsx | Bin .../test/resources/template/template03.xls | Bin .../test/resources/template/template07.xlsx | Bin pom.xml | 1 + .../easyexcel/test/demo/fill/FillTest.java | 2 +- .../easyexcel/test/demo/read/ReadTest.java | 2 +- .../easyexcel/test/demo/web/WebTest.java | 2 +- .../easyexcel/test/demo/write/WriteTest.java | 2 +- 239 files changed, 116 insertions(+), 88 deletions(-) create mode 100644 easyexcel-test/README.md create mode 100644 easyexcel-test/pom.xml rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java (90%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java (91%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java (81%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java (85%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java (92%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java (98%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java (98%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java (90%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java (86%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java (92%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java (86%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java (92%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java (87%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java (99%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/CamlData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/LockData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/LockTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/StyleData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java (93%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java (98%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java (93%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java (88%) rename {src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java (100%) rename {src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java (94%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java (95%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java (92%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/converter/converter03.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/converter/converter07.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/converter/converterCsv.csv (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/converter/img.jpg (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/dataformat/dataformat.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/dataformat/dataformat.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/cellDataDemo.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/demo.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/extra.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/complex.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/complexFillWithTable.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/composite.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/horizontal.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/list.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/demo/fill/simple.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/extra/extra.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/extra/extra.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/annotation.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/annotation.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/byName.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/byName.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/complex.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/complex.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/composite.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/composite.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/horizontal.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/horizontal.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/simple.csv (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/simple.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/simple.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/style.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/fill/style.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/large/fill.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/large/large07.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/logback.xml (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/multiplesheets/multiplesheets.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/multiplesheets/multiplesheets.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/simple/simple07.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/temp/issue1663/template.xlsx (100%) rename {src => easyexcel-test}/test/resources/temp/issue2443/date1.xlsx (100%) rename {src => easyexcel-test}/test/resources/temp/issue2443/date2.xlsx (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/template/template03.xls (100%) rename {easyexcel-core/src => easyexcel-test}/test/resources/template/template07.xlsx (100%) diff --git a/easyexcel-test/README.md b/easyexcel-test/README.md new file mode 100644 index 00000000..299588a0 --- /dev/null +++ b/easyexcel-test/README.md @@ -0,0 +1,3 @@ +# easyexcel-test + +测试案例 \ No newline at end of file diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml new file mode 100644 index 00000000..d0304619 --- /dev/null +++ b/easyexcel-test/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + + com.alibaba + easyexcel-parent + ${revision} + ../pom.xml + + + jar + easyexcel-test + + + + org.springframework + spring-core + + + + diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java similarity index 90% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java index b2943522..e7418601 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java @@ -61,17 +61,17 @@ public class ConverterDataTest { @Test public void t11ReadAllConverter07() { - readAllConverter("converter" + File.separator + "converter07.xlsx"); + readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converter07.xlsx"); } @Test public void t12ReadAllConverter03() { - readAllConverter("converter" + File.separator + "converter03.xls"); + readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converter03.xls"); } @Test public void t13ReadAllConverterCsv() { - readAllConverter("converter" + File.separator + "converterCsv.csv"); + readAllConverter("easyexcel-test/test/resources/converter" + File.separator + "converterCsv.csv"); } @Test @@ -90,7 +90,7 @@ public class ConverterDataTest { List list = new ArrayList<>(); ImageData imageData = new ImageData(); list.add(imageData); - String imagePath = TestFileUtil.getPath() + "converter" + File.separator + "img.jpg"; + String imagePath = TestFileUtil.getPath() + "easyexcel-test/test/resources/converter" + File.separator + "img.jpg"; imageData.setByteArray(FileUtils.readFileToByteArray(new File(imagePath))); imageData.setFile(new File(imagePath)); imageData.setString(imagePath); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java similarity index 91% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java index 27494f29..7bd7bf8c 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java @@ -26,8 +26,8 @@ public class DateFormatTest { @BeforeClass public static void init() { - file07 = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xlsx"); - file03 = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xls"); + file07 = TestFileUtil.readFile("easyexcel-test/test/resources/dataformat" + File.separator + "dataformat.xlsx"); + file03 = TestFileUtil.readFile("easyexcel-test/test/resources/dataformat" + File.separator + "dataformat.xls"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java similarity index 81% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java index cf7418d5..5f80abc1 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java @@ -22,8 +22,8 @@ public class ExtraDataTest { @BeforeClass public static void init() { - file03 = TestFileUtil.readFile("extra" + File.separator + "extra.xls"); - file07 = TestFileUtil.readFile("extra" + File.separator + "extra.xlsx"); + file03 = TestFileUtil.readFile("easyexcel-test/test/resources/extra" + File.separator + "extra.xls"); + file07 = TestFileUtil.readFile("easyexcel-test/test/resources/extra" + File.separator + "extra.xlsx"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java similarity index 85% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java index e85d63a6..e43dea10 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java @@ -56,25 +56,25 @@ public class FillDataTest { file07 = TestFileUtil.createNewFile("fill07.xlsx"); file03 = TestFileUtil.createNewFile("fill03.xls"); fileCsv = TestFileUtil.createNewFile("fill.csv"); - simpleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "simple.xlsx"); - simpleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "simple.xls"); - simpleTemplateCsv = TestFileUtil.readFile("fill" + File.separator + "simple.csv"); + simpleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"); + simpleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.xls"); + simpleTemplateCsv = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "simple.csv"); fileComplex07 = TestFileUtil.createNewFile("fillComplex07.xlsx"); - complexFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "complex.xlsx"); + complexFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "complex.xlsx"); fileComplex03 = TestFileUtil.createNewFile("fillComplex03.xls"); - complexFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "complex.xls"); + complexFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "complex.xls"); fileHorizontal07 = TestFileUtil.createNewFile("fillHorizontal07.xlsx"); - horizontalFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "horizontal.xlsx"); + horizontalFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "horizontal.xlsx"); fileHorizontal03 = TestFileUtil.createNewFile("fillHorizontal03.xls"); - horizontalFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "horizontal.xls"); + horizontalFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "horizontal.xls"); byName07 = TestFileUtil.createNewFile("byName07.xlsx"); - byNameTemplate07 = TestFileUtil.readFile("fill" + File.separator + "byName.xlsx"); + byNameTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "byName.xlsx"); byName03 = TestFileUtil.createNewFile("byName03.xls"); - byNameTemplate03 = TestFileUtil.readFile("fill" + File.separator + "byName.xls"); + byNameTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "byName.xls"); fileComposite07 = TestFileUtil.createNewFile("fileComposite07.xlsx"); - compositeFillTemplate07 = TestFileUtil.readFile("fill" + File.separator + "composite.xlsx"); + compositeFillTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "composite.xlsx"); fileComposite03 = TestFileUtil.createNewFile("fileComposite03.xls"); - compositeFillTemplate03 = TestFileUtil.readFile("fill" + File.separator + "composite.xls"); + compositeFillTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "composite.xls"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java similarity index 92% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java index d2159e71..371dc48f 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java @@ -46,8 +46,8 @@ public class FillAnnotationDataTest { public static void init() { file07 = TestFileUtil.createNewFile("fillAnnotation07.xlsx"); file03 = TestFileUtil.createNewFile("fillAnnotation03.xls"); - fileTemplate07 = TestFileUtil.readFile("fill" + File.separator + "annotation.xlsx"); - fileTemplate03 = TestFileUtil.readFile("fill" + File.separator + "annotation.xls"); + fileTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "annotation.xlsx"); + fileTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "annotation.xls"); } @Test @@ -112,7 +112,7 @@ public class FillAnnotationDataTest { data.setNumber(99.99); data.setString1("string1"); data.setString2("string2"); - data.setImage(TestFileUtil.getPath() + "converter" + File.separator + "img.jpg"); + data.setImage(TestFileUtil.getPath() + "easyexcel-test/test/resources/converter" + File.separator + "img.jpg"); list.add(data); list.add(data); list.add(data); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java similarity index 98% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java index 13367904..596dd33a 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java @@ -46,8 +46,8 @@ public class FillStyleAnnotatedTest { public static void init() { FillStyleAnnotated07 = TestFileUtil.createNewFile("FillStyleAnnotated07.xlsx"); FillStyleAnnotated03 = TestFileUtil.createNewFile("FillStyleAnnotated03.xls"); - fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx"); - fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls"); + fileStyleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xlsx"); + fileStyleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xls"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java similarity index 98% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java index 210a5b9f..149d9963 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java @@ -49,8 +49,8 @@ public class FillStyleDataTest { fileStyle03 = TestFileUtil.createNewFile("fileStyle03.xls"); fileStyleHandler07 = TestFileUtil.createNewFile("fileStyleHandler07.xlsx"); fileStyleHandler03 = TestFileUtil.createNewFile("fileStyleHandler03.xls"); - fileStyleTemplate07 = TestFileUtil.readFile("fill" + File.separator + "style.xlsx"); - fileStyleTemplate03 = TestFileUtil.readFile("fill" + File.separator + "style.xls"); + fileStyleTemplate07 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xlsx"); + fileStyleTemplate03 = TestFileUtil.readFile("easyexcel-test/test/resources/fill" + File.separator + "style.xls"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java similarity index 90% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java index c7f202e5..24ab53b5 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java @@ -40,17 +40,17 @@ public class LargeDataTest { @BeforeClass public static void init() { fileFill07 = TestFileUtil.createNewFile("largefill07.xlsx"); - fileWrite07 = TestFileUtil.createNewFile("large" + File.separator + "fileWrite07.xlsx"); - fileWriteTemp07 = TestFileUtil.createNewFile("large" + File.separator + "fileWriteTemp07.xlsx"); - fileWritePoi07 = TestFileUtil.createNewFile("large" + File.separator + "fileWritePoi07.xlsx"); - template07 = TestFileUtil.readFile("large" + File.separator + "fill.xlsx"); + fileWrite07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWrite07.xlsx"); + fileWriteTemp07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWriteTemp07.xlsx"); + fileWritePoi07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWritePoi07.xlsx"); + template07 = TestFileUtil.readFile("easyexcel-test/test/resources/large" + File.separator + "fill.xlsx"); fileCsv = TestFileUtil.createNewFile("largefileCsv.csv"); } @Test public void t01Read() throws Exception { long start = System.currentTimeMillis(); - EasyExcel.read(TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx", LargeData.class, + EasyExcel.read(TestFileUtil.getPath() + "easyexcel-test/test/resources/large" + File.separator + "large07.xlsx", LargeData.class, new LargeDataListener()).headRowNumber(2).sheet().doRead(); LOGGER.info("Large data total time spent:{}", System.currentTimeMillis() - start); } diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java similarity index 86% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java index c69e3ae4..1ff9ce94 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java @@ -26,8 +26,8 @@ public class MultipleSheetsDataTest { @BeforeClass public static void init() { - file07 = TestFileUtil.readFile("multiplesheets" + File.separator + "multiplesheets.xlsx"); - file03 = TestFileUtil.readFile("multiplesheets" + File.separator + "multiplesheets.xls"); + file07 = TestFileUtil.readFile("easyexcel-test/test/resources/multiplesheets" + File.separator + "multiplesheets.xlsx"); + file03 = TestFileUtil.readFile("easyexcel-test/test/resources/multiplesheets" + File.separator + "multiplesheets.xls"); } @Test diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java similarity index 92% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java index 36e90a0f..b44381cc 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java @@ -92,8 +92,8 @@ public class SimpleDataTest { @Test public void t21SheetNameRead07() { - EasyExcel.read(TestFileUtil.readFile("simple" + File.separator + "simple07.xlsx"), SimpleData.class, - new SimpleDataSheetNameListener()).sheet("simple").doRead(); + EasyExcel.read(TestFileUtil.readFile("easyexcel-test/test/resources/simple" + File.separator + "simple07.xlsx"), SimpleData.class, + new SimpleDataSheetNameListener()).sheet("easyexcel-test/test/resources/simple").doRead(); } private void synchronousRead(File file) { diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java similarity index 86% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java index d6ebd0aa..3cc041b8 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java @@ -41,14 +41,14 @@ public class TemplateDataTest { private void readAndWrite07(File file) { EasyExcel.write(file, TemplateData.class) - .withTemplate(TestFileUtil.readFile("template" + File.separator + "template07.xlsx")).sheet() + .withTemplate(TestFileUtil.readFile("easyexcel-test/test/resources/template" + File.separator + "template07.xlsx")).sheet() .doWrite(data()); EasyExcel.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(3).sheet().doRead(); } private void readAndWrite03(File file) { EasyExcel.write(file, TemplateData.class) - .withTemplate(TestFileUtil.readFile("template" + File.separator + "template03.xls")).sheet() + .withTemplate(TestFileUtil.readFile("easyexcel-test/test/resources/template" + File.separator + "template03.xls")).sheet() .doWrite(data()); EasyExcel.read(file, TemplateData.class, new TemplateDataListener()).headRowNumber(3).sheet().doRead(); } diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java similarity index 92% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java index d0f90fe9..c16a2725 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java @@ -36,7 +36,7 @@ public class FillTest { public void simpleFill() { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "simple.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "simple.xlsx"; // 方案1 根据对象填充 String fileName = TestFileUtil.getPath() + "simpleFill" + System.currentTimeMillis() + ".xlsx"; @@ -65,7 +65,7 @@ public class FillTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // 填充list 的时候还要注意 模板中{.} 多了个点 表示list String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "list.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "list.xlsx"; // 方案1 一下子全部放到内存里面 并填充 String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; @@ -103,7 +103,7 @@ public class FillTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complex.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complex.xlsx"; String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -135,7 +135,7 @@ public class FillTest { // {} 代表普通变量 {.} 代表是list的变量 // 这里模板 删除了list以后的数据,也就是统计的这一行 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx"; String fileName = TestFileUtil.getPath() + "complexFillWithTable" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -176,7 +176,7 @@ public class FillTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "horizontal.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "horizontal.xlsx"; String fileName = TestFileUtil.getPath() + "horizontalFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -203,7 +203,7 @@ public class FillTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 {前缀.} 前缀可以区分不同的list String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "composite.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "composite.xlsx"; String fileName = TestFileUtil.getPath() + "compositeFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java similarity index 87% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java index a97d2c1e..bf56f274 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java @@ -45,7 +45,7 @@ public class ReadTest { public void simpleRead() { // 写法1:JDK8+ ,不用额外写一个DemoDataListener // since: 3.0.0-beta1 - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭 // 这里每次会读取3000条数据 然后返回过来 直接调用使用数据就行 EasyExcel.read(fileName, DemoData.class, new PageReadListener(dataList -> { @@ -56,7 +56,7 @@ public class ReadTest { // 写法2: // 匿名内部类 不用额外写一个DemoDataListener - fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭 EasyExcel.read(fileName, DemoData.class, new ReadListener() { /** @@ -94,12 +94,12 @@ public class ReadTest { // 有个很重要的点 DemoDataListener 不能被spring管理,要每次读取excel都要new,然后里面用到spring可以构造方法传进去 // 写法3: - fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet 文件流会自动关闭 EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet().doRead(); // 写法4: - fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 一个文件一个reader ExcelReader excelReader = null; try { @@ -128,7 +128,7 @@ public class ReadTest { */ @Test public void indexOrNameRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里默认读取第一个sheet EasyExcel.read(fileName, IndexOrNameData.class, new IndexOrNameDataListener()).sheet().doRead(); } @@ -144,13 +144,13 @@ public class ReadTest { */ @Test public void repeatedRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 读取全部sheet // 这里需要注意 DemoDataListener的doAfterAllAnalysed 会在每个sheet读取完毕后调用一次。然后所有sheet都会往同一个DemoDataListener里面写 EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).doReadAll(); // 读取部分sheet - fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; ExcelReader excelReader = null; try { excelReader = EasyExcel.read(fileName).build(); @@ -183,7 +183,7 @@ public class ReadTest { */ @Test public void converterRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, ConverterData.class, new ConverterDataListener()) // 这里注意 我们也可以registerConverter来指定自定义转换器, 但是这个转换变成全局了, 所有java为string,excel为string的都会用这个转换器。 @@ -206,7 +206,7 @@ public class ReadTest { */ @Test public void complexHeaderRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, DemoData.class, new DemoDataListener()).sheet() // 这里可以设置1,因为头就是一行。如果多行头,可以设置其他值。不传入也可以,因为默认会根据DemoData 来解析,他没有指定头,也就是默认1行 @@ -225,7 +225,7 @@ public class ReadTest { */ @Test public void headerRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, DemoData.class, new DemoHeadDataListener()).sheet().doRead(); } @@ -246,7 +246,7 @@ public class ReadTest { */ @Test public void extraRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "extra.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "extra.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, DemoExtraData.class, new DemoExtraListener()) // 需要读取批注 默认不读取 @@ -271,7 +271,7 @@ public class ReadTest { */ @Test public void cellDataRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "cellDataDemo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "cellDataDemo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, CellDataReadDemoData.class, new CellDataDemoHeadDataListener()).sheet().doRead(); } @@ -288,7 +288,7 @@ public class ReadTest { */ @Test public void exceptionRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet EasyExcel.read(fileName, ExceptionDemoData.class, new DemoExceptionListener()).sheet().doRead(); } @@ -298,7 +298,7 @@ public class ReadTest { */ @Test public void synchronousRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 需要指定读用哪个class去读,然后读取第一个sheet 同步读取会自动finish List list = EasyExcel.read(fileName).head(DemoData.class).sheet().doReadSync(); for (DemoData data : list) { @@ -318,7 +318,7 @@ public class ReadTest { */ @Test public void noModelRead() { - String fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; // 这里 只要,然后读取第一个sheet 同步读取会自动finish EasyExcel.read(fileName, new NoModelDataListener()).sheet().doRead(); } diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java similarity index 99% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java index 41372f6a..462511c3 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java @@ -267,7 +267,7 @@ public class WriteTest { public void imageWrite() throws Exception { String fileName = TestFileUtil.getPath() + "imageWrite" + System.currentTimeMillis() + ".xlsx"; - String imagePath = TestFileUtil.getPath() + "converter" + File.separator + "img.jpg"; + String imagePath = TestFileUtil.getPath() + "easyexcel-test/test/resources/converter" + File.separator + "img.jpg"; try (InputStream inputStream = FileUtils.openInputStream(new File(imagePath))) { List list = ListUtils.newArrayList(); ImageDemoData imageDemoData = new ImageDemoData(); @@ -419,7 +419,7 @@ public class WriteTest { */ @Test public void templateWrite() { - String templateFileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx"; + String templateFileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "demo.xlsx"; String fileName = TestFileUtil.getPath() + "templateWrite" + System.currentTimeMillis() + ".xlsx"; // 这里 需要指定写用哪个class去写,然后写到第一个sheet,名字为模板 然后文件流会自动关闭 EasyExcel.write(fileName, DemoData.class).withTemplate(templateFileName).sheet().doWrite(data()); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/CamlData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/CamlData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java similarity index 93% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java index 23f623b6..34ff7a3a 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java @@ -33,7 +33,7 @@ public class WriteLargeTest { @Test public void test() throws Exception { // 方法2 如果写到不同的sheet 同一个对象 - String fileName = TestFileUtil.getPath() + "large" + System.currentTimeMillis() + ".xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/large" + System.currentTimeMillis() + ".xlsx"; // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 背景设置为红色 @@ -69,7 +69,7 @@ public class WriteLargeTest { @Test public void test2() throws Exception { // 方法2 如果写到不同的sheet 同一个对象 - String fileName = TestFileUtil.getPath() + "large" + System.currentTimeMillis() + ".xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/large" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName, LargeData.class).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java similarity index 98% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java index 4440f350..01046ce4 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java @@ -132,7 +132,7 @@ public class DataFormatTest { @Test public void test355() throws IOException, InvalidFormatException { - File file = TestFileUtil.readFile("dataformat" + File.separator + "dataformat.xlsx"); + File file = TestFileUtil.readFile("easyexcel-test/test/resources/dataformat" + File.separator + "dataformat.xlsx"); XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file); Sheet xssfSheet = xssfWorkbook.getSheetAt(0); DataFormatter d = new DataFormatter(Locale.CHINA); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java similarity index 93% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java index 2c201863..a538ab88 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java @@ -64,7 +64,7 @@ public class FillTempTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // 填充list 的时候还要注意 模板中{.} 多了个点 表示list String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "list.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "list.xlsx"; // 方案1 一下子全部放到内存里面 并填充 String fileName = TestFileUtil.getPath() + "listFill" + System.currentTimeMillis() + ".xlsx"; @@ -91,7 +91,7 @@ public class FillTempTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complex.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complex.xlsx"; String fileName = TestFileUtil.getPath() + "complexFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -123,7 +123,7 @@ public class FillTempTest { // {} 代表普通变量 {.} 代表是list的变量 // 这里模板 删除了list以后的数据,也就是统计的这一行 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "complexFillWithTable.xlsx"; String fileName = TestFileUtil.getPath() + "complexFillWithTable" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -164,7 +164,7 @@ public class FillTempTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "horizontal.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "horizontal.xlsx"; String fileName = TestFileUtil.getPath() + "horizontalFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); @@ -191,7 +191,7 @@ public class FillTempTest { // 模板注意 用{} 来表示你要用的变量 如果本来就有"{","}" 特殊字符 用"\{","\}"代替 // {} 代表普通变量 {.} 代表是list的变量 {前缀.} 前缀可以区分不同的list String templateFileName = - TestFileUtil.getPath() + "demo" + File.separator + "fill" + File.separator + "composite.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/demo" + File.separator + "fill" + File.separator + "composite.xlsx"; String fileName = TestFileUtil.getPath() + "compositeFill" + System.currentTimeMillis() + ".xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java similarity index 88% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java index 7f89621c..aa4de2b9 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java @@ -23,9 +23,9 @@ public class FillTest { @Test public void TestFillNullPoint(){ String templateFileName = - TestFileUtil.getPath() + "temp/issue1663" + File.separator + "template.xlsx"; + TestFileUtil.getPath() + "easyexcel-test/test/resources/temp/issue1663" + File.separator + "template.xlsx"; - String fileName = TestFileUtil.getPath() + "temp/issue1663" + File.separator + "issue1663.xlsx"; + String fileName = TestFileUtil.getPath() + "easyexcel-test/test/resources/temp/issue1663" + File.separator + "issue1663.xlsx"; ExcelWriter excelWriter = EasyExcel.write(fileName).withTemplate(templateFileName).build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.VERTICAL).build(); diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java similarity index 100% rename from src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java similarity index 100% rename from src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java similarity index 94% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java index 934b62f5..8a6b8625 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java @@ -45,10 +45,10 @@ public class TempLargeDataTest { @BeforeClass public static void init() { fileFill07 = TestFileUtil.createNewFile("largefill07.xlsx"); - fileWrite07 = TestFileUtil.createNewFile("large" + File.separator + "fileWrite07.xlsx"); - fileWriteTemp07 = TestFileUtil.createNewFile("large" + File.separator + "fileWriteTemp07.xlsx"); - fileWritePoi07 = TestFileUtil.createNewFile("large" + File.separator + "fileWritePoi07.xlsx"); - template07 = TestFileUtil.readFile("large" + File.separator + "fill.xlsx"); + fileWrite07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWrite07.xlsx"); + fileWriteTemp07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWriteTemp07.xlsx"); + fileWritePoi07 = TestFileUtil.createNewFile("easyexcel-test/test/resources/large" + File.separator + "fileWritePoi07.xlsx"); + template07 = TestFileUtil.readFile("easyexcel-test/test/resources/large" + File.separator + "fill.xlsx"); fileCsv = TestFileUtil.createNewFile("largefileCsv.csv"); } diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java similarity index 95% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java index 1ea737c0..35f552b4 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java @@ -41,7 +41,7 @@ public class Poi3Test { @Test public void Encryption() throws Exception { - String file = TestFileUtil.getPath() + "large" + File.separator + "large07.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/large" + File.separator + "large07.xlsx"; POIFSFileSystem fs = new POIFSFileSystem(); EncryptionInfo info = new EncryptionInfo(EncryptionMode.agile); Encryptor enc = info.getEncryptor(); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java similarity index 92% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java index e27136d4..e83f7a7d 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java +++ b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java @@ -176,7 +176,7 @@ public class PoiTest { @Test public void lastRowNum233() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; Workbook xx = new XSSFWorkbook(file); System.out.println(new File(file).exists()); @@ -231,7 +231,7 @@ public class PoiTest { @Test public void lastRowNum2333() throws IOException, InvalidFormatException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; XSSFWorkbook xssfWorkbook = new XSSFWorkbook(new File(file)); SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook(xssfWorkbook); Sheet xssfSheet = xssfWorkbook.getSheetAt(0); @@ -248,14 +248,14 @@ public class PoiTest { @Test public void testread() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; SXSSFWorkbook xssfWorkbook = new SXSSFWorkbook(new XSSFWorkbook(file)); Sheet xssfSheet = xssfWorkbook.getXSSFWorkbook().getSheetAt(0); // // Cell cell = xssfSheet.getRow(0).createCell(9); - String file1 = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file1 = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; SXSSFWorkbook xssfWorkbook1 = new SXSSFWorkbook(new XSSFWorkbook(file1)); Sheet xssfSheet1 = xssfWorkbook1.getXSSFWorkbook().getSheetAt(0); @@ -268,13 +268,13 @@ public class PoiTest { @Test public void testreadRead() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; FileUtils.readFileToByteArray(new File(file)); } @Test public void lastRowNum2332222() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; SXSSFWorkbook xssfWorkbook = new SXSSFWorkbook(new XSSFWorkbook(file)); Sheet xssfSheet = xssfWorkbook.getXSSFWorkbook().getSheetAt(0); @@ -287,7 +287,7 @@ public class PoiTest { @Test public void lastRowNum23443() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; SXSSFWorkbook xssfWorkbook = new SXSSFWorkbook(new XSSFWorkbook(file)); Sheet xssfSheet = xssfWorkbook.getSheetAt(0); @@ -298,7 +298,7 @@ public class PoiTest { @Test public void lastRowNum2() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; SXSSFWorkbook xssfWorkbook = new SXSSFWorkbook(new XSSFWorkbook(file)); Sheet xssfSheet = xssfWorkbook.getXSSFWorkbook().getSheetAt(0); LOGGER.info("一共行数:{}", xssfSheet.getPhysicalNumberOfRows()); @@ -309,7 +309,7 @@ public class PoiTest { @Test public void lastRowNumXSSF2() throws IOException { - String file = TestFileUtil.getPath() + "fill" + File.separator + "simple.xlsx"; + String file = TestFileUtil.getPath() + "easyexcel-test/test/resources/fill" + File.separator + "simple.xlsx"; XSSFWorkbook xssfWorkbook = new XSSFWorkbook(file); LOGGER.info("一共:{}个sheet", xssfWorkbook.getNumberOfSheets()); XSSFSheet xssfSheet = xssfWorkbook.getSheetAt(0); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java b/easyexcel-test/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java similarity index 100% rename from easyexcel-core/src/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java rename to easyexcel-test/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java diff --git a/easyexcel-core/src/test/resources/converter/converter03.xls b/easyexcel-test/test/resources/converter/converter03.xls similarity index 100% rename from easyexcel-core/src/test/resources/converter/converter03.xls rename to easyexcel-test/test/resources/converter/converter03.xls diff --git a/easyexcel-core/src/test/resources/converter/converter07.xlsx b/easyexcel-test/test/resources/converter/converter07.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/converter/converter07.xlsx rename to easyexcel-test/test/resources/converter/converter07.xlsx diff --git a/easyexcel-core/src/test/resources/converter/converterCsv.csv b/easyexcel-test/test/resources/converter/converterCsv.csv similarity index 100% rename from easyexcel-core/src/test/resources/converter/converterCsv.csv rename to easyexcel-test/test/resources/converter/converterCsv.csv diff --git a/easyexcel-core/src/test/resources/converter/img.jpg b/easyexcel-test/test/resources/converter/img.jpg similarity index 100% rename from easyexcel-core/src/test/resources/converter/img.jpg rename to easyexcel-test/test/resources/converter/img.jpg diff --git a/easyexcel-core/src/test/resources/dataformat/dataformat.xls b/easyexcel-test/test/resources/dataformat/dataformat.xls similarity index 100% rename from easyexcel-core/src/test/resources/dataformat/dataformat.xls rename to easyexcel-test/test/resources/dataformat/dataformat.xls diff --git a/easyexcel-core/src/test/resources/dataformat/dataformat.xlsx b/easyexcel-test/test/resources/dataformat/dataformat.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/dataformat/dataformat.xlsx rename to easyexcel-test/test/resources/dataformat/dataformat.xlsx diff --git a/easyexcel-core/src/test/resources/demo/cellDataDemo.xlsx b/easyexcel-test/test/resources/demo/cellDataDemo.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/cellDataDemo.xlsx rename to easyexcel-test/test/resources/demo/cellDataDemo.xlsx diff --git a/easyexcel-core/src/test/resources/demo/demo.xlsx b/easyexcel-test/test/resources/demo/demo.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/demo.xlsx rename to easyexcel-test/test/resources/demo/demo.xlsx diff --git a/easyexcel-core/src/test/resources/demo/extra.xlsx b/easyexcel-test/test/resources/demo/extra.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/extra.xlsx rename to easyexcel-test/test/resources/demo/extra.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/complex.xlsx b/easyexcel-test/test/resources/demo/fill/complex.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/complex.xlsx rename to easyexcel-test/test/resources/demo/fill/complex.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/complexFillWithTable.xlsx b/easyexcel-test/test/resources/demo/fill/complexFillWithTable.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/complexFillWithTable.xlsx rename to easyexcel-test/test/resources/demo/fill/complexFillWithTable.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/composite.xlsx b/easyexcel-test/test/resources/demo/fill/composite.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/composite.xlsx rename to easyexcel-test/test/resources/demo/fill/composite.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/horizontal.xlsx b/easyexcel-test/test/resources/demo/fill/horizontal.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/horizontal.xlsx rename to easyexcel-test/test/resources/demo/fill/horizontal.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/list.xlsx b/easyexcel-test/test/resources/demo/fill/list.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/list.xlsx rename to easyexcel-test/test/resources/demo/fill/list.xlsx diff --git a/easyexcel-core/src/test/resources/demo/fill/simple.xlsx b/easyexcel-test/test/resources/demo/fill/simple.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/demo/fill/simple.xlsx rename to easyexcel-test/test/resources/demo/fill/simple.xlsx diff --git a/easyexcel-core/src/test/resources/extra/extra.xls b/easyexcel-test/test/resources/extra/extra.xls similarity index 100% rename from easyexcel-core/src/test/resources/extra/extra.xls rename to easyexcel-test/test/resources/extra/extra.xls diff --git a/easyexcel-core/src/test/resources/extra/extra.xlsx b/easyexcel-test/test/resources/extra/extra.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/extra/extra.xlsx rename to easyexcel-test/test/resources/extra/extra.xlsx diff --git a/easyexcel-core/src/test/resources/fill/annotation.xls b/easyexcel-test/test/resources/fill/annotation.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/annotation.xls rename to easyexcel-test/test/resources/fill/annotation.xls diff --git a/easyexcel-core/src/test/resources/fill/annotation.xlsx b/easyexcel-test/test/resources/fill/annotation.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/annotation.xlsx rename to easyexcel-test/test/resources/fill/annotation.xlsx diff --git a/easyexcel-core/src/test/resources/fill/byName.xls b/easyexcel-test/test/resources/fill/byName.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/byName.xls rename to easyexcel-test/test/resources/fill/byName.xls diff --git a/easyexcel-core/src/test/resources/fill/byName.xlsx b/easyexcel-test/test/resources/fill/byName.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/byName.xlsx rename to easyexcel-test/test/resources/fill/byName.xlsx diff --git a/easyexcel-core/src/test/resources/fill/complex.xls b/easyexcel-test/test/resources/fill/complex.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/complex.xls rename to easyexcel-test/test/resources/fill/complex.xls diff --git a/easyexcel-core/src/test/resources/fill/complex.xlsx b/easyexcel-test/test/resources/fill/complex.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/complex.xlsx rename to easyexcel-test/test/resources/fill/complex.xlsx diff --git a/easyexcel-core/src/test/resources/fill/composite.xls b/easyexcel-test/test/resources/fill/composite.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/composite.xls rename to easyexcel-test/test/resources/fill/composite.xls diff --git a/easyexcel-core/src/test/resources/fill/composite.xlsx b/easyexcel-test/test/resources/fill/composite.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/composite.xlsx rename to easyexcel-test/test/resources/fill/composite.xlsx diff --git a/easyexcel-core/src/test/resources/fill/horizontal.xls b/easyexcel-test/test/resources/fill/horizontal.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/horizontal.xls rename to easyexcel-test/test/resources/fill/horizontal.xls diff --git a/easyexcel-core/src/test/resources/fill/horizontal.xlsx b/easyexcel-test/test/resources/fill/horizontal.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/horizontal.xlsx rename to easyexcel-test/test/resources/fill/horizontal.xlsx diff --git a/easyexcel-core/src/test/resources/fill/simple.csv b/easyexcel-test/test/resources/fill/simple.csv similarity index 100% rename from easyexcel-core/src/test/resources/fill/simple.csv rename to easyexcel-test/test/resources/fill/simple.csv diff --git a/easyexcel-core/src/test/resources/fill/simple.xls b/easyexcel-test/test/resources/fill/simple.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/simple.xls rename to easyexcel-test/test/resources/fill/simple.xls diff --git a/easyexcel-core/src/test/resources/fill/simple.xlsx b/easyexcel-test/test/resources/fill/simple.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/simple.xlsx rename to easyexcel-test/test/resources/fill/simple.xlsx diff --git a/easyexcel-core/src/test/resources/fill/style.xls b/easyexcel-test/test/resources/fill/style.xls similarity index 100% rename from easyexcel-core/src/test/resources/fill/style.xls rename to easyexcel-test/test/resources/fill/style.xls diff --git a/easyexcel-core/src/test/resources/fill/style.xlsx b/easyexcel-test/test/resources/fill/style.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/fill/style.xlsx rename to easyexcel-test/test/resources/fill/style.xlsx diff --git a/easyexcel-core/src/test/resources/large/fill.xlsx b/easyexcel-test/test/resources/large/fill.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/large/fill.xlsx rename to easyexcel-test/test/resources/large/fill.xlsx diff --git a/easyexcel-core/src/test/resources/large/large07.xlsx b/easyexcel-test/test/resources/large/large07.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/large/large07.xlsx rename to easyexcel-test/test/resources/large/large07.xlsx diff --git a/easyexcel-core/src/test/resources/logback.xml b/easyexcel-test/test/resources/logback.xml similarity index 100% rename from easyexcel-core/src/test/resources/logback.xml rename to easyexcel-test/test/resources/logback.xml diff --git a/easyexcel-core/src/test/resources/multiplesheets/multiplesheets.xls b/easyexcel-test/test/resources/multiplesheets/multiplesheets.xls similarity index 100% rename from easyexcel-core/src/test/resources/multiplesheets/multiplesheets.xls rename to easyexcel-test/test/resources/multiplesheets/multiplesheets.xls diff --git a/easyexcel-core/src/test/resources/multiplesheets/multiplesheets.xlsx b/easyexcel-test/test/resources/multiplesheets/multiplesheets.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/multiplesheets/multiplesheets.xlsx rename to easyexcel-test/test/resources/multiplesheets/multiplesheets.xlsx diff --git a/easyexcel-core/src/test/resources/simple/simple07.xlsx b/easyexcel-test/test/resources/simple/simple07.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/simple/simple07.xlsx rename to easyexcel-test/test/resources/simple/simple07.xlsx diff --git a/easyexcel-core/src/test/resources/temp/issue1663/template.xlsx b/easyexcel-test/test/resources/temp/issue1663/template.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/temp/issue1663/template.xlsx rename to easyexcel-test/test/resources/temp/issue1663/template.xlsx diff --git a/src/test/resources/temp/issue2443/date1.xlsx b/easyexcel-test/test/resources/temp/issue2443/date1.xlsx similarity index 100% rename from src/test/resources/temp/issue2443/date1.xlsx rename to easyexcel-test/test/resources/temp/issue2443/date1.xlsx diff --git a/src/test/resources/temp/issue2443/date2.xlsx b/easyexcel-test/test/resources/temp/issue2443/date2.xlsx similarity index 100% rename from src/test/resources/temp/issue2443/date2.xlsx rename to easyexcel-test/test/resources/temp/issue2443/date2.xlsx diff --git a/easyexcel-core/src/test/resources/template/template03.xls b/easyexcel-test/test/resources/template/template03.xls similarity index 100% rename from easyexcel-core/src/test/resources/template/template03.xls rename to easyexcel-test/test/resources/template/template03.xls diff --git a/easyexcel-core/src/test/resources/template/template07.xlsx b/easyexcel-test/test/resources/template/template07.xlsx similarity index 100% rename from easyexcel-core/src/test/resources/template/template07.xlsx rename to easyexcel-test/test/resources/template/template07.xlsx diff --git a/pom.xml b/pom.xml index e8a7f9c0..da5b443b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ easyexcel-core easyexcel-support + easyexcel-test easyexcel diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java index a83f64a5..29c707d3 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java @@ -1,3 +1,3 @@ /** - * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java + * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java */ diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java index 5c7e8068..b8d7bffc 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java @@ -1,3 +1,3 @@ /** - * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java + * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java */ diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java index 3c234d83..c21cd0b2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java @@ -1,3 +1,3 @@ /** - * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java + * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java */ diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java index 340d228f..f152846a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java @@ -1,3 +1,3 @@ /** - * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java + * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java */ From 2d5db89f859ea9310f1cab298ba6816b6012bbc4 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 20:18:34 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyexcel-test/pom.xml | 4 ++-- .../alibaba/easyexcel/test/core/StyleTestUtils.java | 0 .../test/core/annotation/AnnotationData.java | 0 .../core/annotation/AnnotationDataListener.java | 0 .../test/core/annotation/AnnotationDataTest.java | 0 .../core/annotation/AnnotationIndexAndNameData.java | 0 .../AnnotationIndexAndNameDataListener.java | 0 .../annotation/AnnotationIndexAndNameDataTest.java | 0 .../test/core/annotation/AnnotationStyleData.java | 0 .../test/core/celldata/CellDataDataListener.java | 0 .../test/core/celldata/CellDataDataTest.java | 0 .../test/core/celldata/CellDataReadData.java | 0 .../test/core/celldata/CellDataWriteData.java | 0 .../test/core/converter/ConverterDataListener.java | 0 .../test/core/converter/ConverterDataTest.java | 0 .../test/core/converter/ConverterReadData.java | 0 .../test/core/converter/ConverterTest.java | 0 .../test/core/converter/ConverterWriteData.java | 0 .../easyexcel/test/core/converter/ImageData.java | 0 .../test/core/converter/ReadAllConverterData.java | 0 .../converter/ReadAllConverterDataListener.java | 0 .../test/core/dataformat/DateFormatData.java | 0 .../test/core/dataformat/DateFormatTest.java | 0 .../easyexcel/test/core/encrypt/EncryptData.java | 0 .../test/core/encrypt/EncryptDataListener.java | 0 .../test/core/encrypt/EncryptDataTest.java | 0 .../test/core/exception/ExceptionData.java | 0 .../test/core/exception/ExceptionDataListener.java | 0 .../test/core/exception/ExceptionDataTest.java | 0 .../core/exception/ExceptionThrowDataListener.java | 0 .../core/excludeorinclude/ExcludeOrIncludeData.java | 0 .../excludeorinclude/ExcludeOrIncludeDataTest.java | 0 .../easyexcel/test/core/extra/ExtraData.java | 0 .../test/core/extra/ExtraDataListener.java | 0 .../easyexcel/test/core/extra/ExtraDataTest.java | 0 .../alibaba/easyexcel/test/core/fill/FillData.java | 0 .../easyexcel/test/core/fill/FillDataTest.java | 0 .../core/fill/annotation/FillAnnotationData.java | 0 .../fill/annotation/FillAnnotationDataTest.java | 2 -- .../core/fill/style/FillStyleAnnotatedData.java | 0 .../core/fill/style/FillStyleAnnotatedTest.java | 0 .../test/core/fill/style/FillStyleData.java | 0 .../test/core/fill/style/FillStyleDataTest.java | 0 .../easyexcel/test/core/handler/WriteHandler.java | 0 .../test/core/handler/WriteHandlerData.java | 0 .../test/core/handler/WriteHandlerTest.java | 0 .../test/core/head/ComplexDataListener.java | 0 .../easyexcel/test/core/head/ComplexHeadData.java | 0 .../test/core/head/ComplexHeadDataTest.java | 0 .../test/core/head/ListHeadDataListener.java | 0 .../easyexcel/test/core/head/ListHeadDataTest.java | 0 .../easyexcel/test/core/head/NoHeadData.java | 0 .../test/core/head/NoHeadDataListener.java | 0 .../easyexcel/test/core/head/NoHeadDataTest.java | 0 .../easyexcel/test/core/large/LargeData.java | 0 .../test/core/large/LargeDataListener.java | 0 .../easyexcel/test/core/large/LargeDataTest.java | 0 .../core/multiplesheets/MultipleSheetsData.java | 0 .../core/multiplesheets/MultipleSheetsDataTest.java | 0 .../core/multiplesheets/MultipleSheetsListener.java | 0 .../test/core/nomodel/NoModelDataTest.java | 0 .../easyexcel/test/core/noncamel/UnCamelData.java | 0 .../test/core/noncamel/UnCamelDataListener.java | 0 .../test/core/noncamel/UnCamelDataTest.java | 0 .../test/core/parameter/ParameterData.java | 0 .../test/core/parameter/ParameterDataListener.java | 0 .../test/core/parameter/ParameterDataTest.java | 0 .../test/core/repetition/RepetitionData.java | 0 .../core/repetition/RepetitionDataListener.java | 0 .../test/core/repetition/RepetitionDataTest.java | 0 .../easyexcel/test/core/simple/SimpleData.java | 0 .../test/core/simple/SimpleDataListener.java | 0 .../core/simple/SimpleDataSheetNameListener.java | 0 .../easyexcel/test/core/simple/SimpleDataTest.java | 2 -- .../alibaba/easyexcel/test/core/skip/SkipData.java | 0 .../easyexcel/test/core/skip/SkipDataTest.java | 0 .../alibaba/easyexcel/test/core/sort/SortData.java | 0 .../easyexcel/test/core/sort/SortDataListener.java | 0 .../easyexcel/test/core/sort/SortDataTest.java | 0 .../easyexcel/test/core/style/StyleData.java | 0 .../test/core/style/StyleDataListener.java | 0 .../easyexcel/test/core/style/StyleDataTest.java | 0 .../easyexcel/test/core/template/TemplateData.java | 0 .../test/core/template/TemplateDataListener.java | 0 .../test/core/template/TemplateDataTest.java | 0 .../alibaba/easyexcel/test/demo/fill/FillData.java | 0 .../alibaba/easyexcel/test/demo/fill/FillTest.java | 0 .../demo/read/CellDataDemoHeadDataListener.java | 0 .../test/demo/read/CellDataReadDemoData.java | 0 .../easyexcel/test/demo/read/ConverterData.java | 0 .../test/demo/read/ConverterDataListener.java | 0 .../test/demo/read/CustomStringStringConverter.java | 0 .../alibaba/easyexcel/test/demo/read/DemoDAO.java | 0 .../alibaba/easyexcel/test/demo/read/DemoData.java | 0 .../easyexcel/test/demo/read/DemoDataListener.java | 0 .../test/demo/read/DemoExceptionListener.java | 0 .../easyexcel/test/demo/read/DemoExtraData.java | 0 .../easyexcel/test/demo/read/DemoExtraListener.java | 0 .../test/demo/read/DemoHeadDataListener.java | 0 .../easyexcel/test/demo/read/ExceptionDemoData.java | 0 .../easyexcel/test/demo/read/IndexOrNameData.java | 0 .../test/demo/read/IndexOrNameDataListener.java | 0 .../test/demo/read/NoModelDataListener.java | 0 .../alibaba/easyexcel/test/demo/read/ReadTest.java | 0 .../easyexcel/test/demo/web/DownloadData.java | 0 .../test/demo/web/EasyexcelApplication.java | 0 .../alibaba/easyexcel/test/demo/web/UploadDAO.java | 0 .../alibaba/easyexcel/test/demo/web/UploadData.java | 0 .../easyexcel/test/demo/web/UploadDataListener.java | 0 .../alibaba/easyexcel/test/demo/web/WebTest.java | 0 .../test/demo/write/CommentWriteHandler.java | 0 .../easyexcel/test/demo/write/ComplexHeadData.java | 0 .../easyexcel/test/demo/write/ConverterData.java | 0 .../test/demo/write/CustomCellWriteHandler.java | 0 .../test/demo/write/CustomSheetWriteHandler.java | 0 .../demo/write/CustomStringStringConverter.java | 0 .../alibaba/easyexcel/test/demo/write/DemoData.java | 0 .../easyexcel/test/demo/write/DemoMergeData.java | 0 .../easyexcel/test/demo/write/DemoStyleData.java | 0 .../test/demo/write/ImageDataWithAnnotation.java | 0 .../easyexcel/test/demo/write/ImageDemoData.java | 0 .../easyexcel/test/demo/write/IndexData.java | 0 .../demo/write/LongestMatchColumnWidthData.java | 0 .../test/demo/write/WidthAndHeightData.java | 0 .../test/demo/write/WriteCellDemoData.java | 0 .../easyexcel/test/demo/write/WriteTest.java | 0 .../com/alibaba/easyexcel/test/temp/CamlData.java | 0 .../alibaba/easyexcel/test/temp/FillTempTest.java | 0 .../com/alibaba/easyexcel/test/temp/Lock2Test.java | 0 .../com/alibaba/easyexcel/test/temp/LockData.java | 0 .../easyexcel/test/temp/LockDataListener.java | 0 .../com/alibaba/easyexcel/test/temp/LockTest.java | 0 .../com/alibaba/easyexcel/test/temp/StyleData.java | 0 .../com/alibaba/easyexcel/test/temp/StyleTest.java | 0 .../alibaba/easyexcel/test/temp/TempFillData.java | 0 .../alibaba/easyexcel/test/temp/WriteLargeTest.java | 0 .../alibaba/easyexcel/test/temp/WriteV33Test.java | 0 .../alibaba/easyexcel/test/temp/WriteV34Test.java | 0 .../com/alibaba/easyexcel/test/temp/Xls03Test.java | 0 .../alibaba/easyexcel/test/temp/bug/DataType.java | 0 .../alibaba/easyexcel/test/temp/bug/ExcelCreat.java | 0 .../alibaba/easyexcel/test/temp/bug/HeadType.java | 0 .../easyexcel/test/temp/cache/CacheTest.java | 6 ------ .../alibaba/easyexcel/test/temp/csv/CsvData.java | 0 .../easyexcel/test/temp/csv/CsvDataListeer.java | 0 .../easyexcel/test/temp/csv/CsvReadTest.java | 0 .../alibaba/easyexcel/test/temp/data/DataType.java | 0 .../alibaba/easyexcel/test/temp/data/HeadType.java | 0 .../test/temp/dataformat/DataFormatData.java | 0 .../test/temp/dataformat/DataFormatTest.java | 0 .../test/temp/dataformat/DataFormatter1.java | 0 .../alibaba/easyexcel/test/temp/fill/FillData2.java | 0 .../easyexcel/test/temp/fill/FillTempTest.java | 0 .../easyexcel/test/temp/issue1662/Data1662.java | 0 .../test/temp/issue1662/Issue1662Test.java | 0 .../easyexcel/test/temp/issue1663/FillData.java | 0 .../easyexcel/test/temp/issue1663/FillTest.java | 0 .../easyexcel/test/temp/issue2443/Issue2443.java | 0 .../test/temp/issue2443/Issue2443Test.java | 0 .../easyexcel/test/temp/large/LargeData.java | 0 .../test/temp/large/LargeDataListener.java | 0 .../test/temp/large/NoModelLargeDataListener.java | 1 - .../test/temp/large/TempLargeDataTest.java | 0 .../alibaba/easyexcel/test/temp/poi/Poi2Test.java | 0 .../alibaba/easyexcel/test/temp/poi/Poi3Test.java | 11 ----------- .../easyexcel/test/temp/poi/PoiEncryptTest.java | 0 .../easyexcel/test/temp/poi/PoiFormatTest.java | 7 ------- .../alibaba/easyexcel/test/temp/poi/PoiTest.java | 0 .../easyexcel/test/temp/poi/PoiWriteTest.java | 0 .../alibaba/easyexcel/test/temp/poi/TestCell.java | 0 .../easyexcel/test/temp/read/CommentTest.java | 0 .../easyexcel/test/temp/read/HDListener.java | 0 .../easyexcel/test/temp/read/HeadListener.java | 0 .../easyexcel/test/temp/read/HeadReadData.java | 0 .../easyexcel/test/temp/read/HeadReadTest.java | 0 .../easyexcel/test/temp/read/TestListener.java | 0 .../easyexcel/test/temp/simple/DemoData1.java | 0 .../easyexcel/test/temp/simple/DemoData2.java | 0 .../easyexcel/test/temp/simple/HgListener.java | 0 .../alibaba/easyexcel/test/temp/simple/HgTest.java | 0 .../easyexcel/test/temp/simple/JsonData.java | 0 .../easyexcel/test/temp/simple/RepeatListener.java | 0 .../easyexcel/test/temp/simple/RepeatTest.java | 0 .../alibaba/easyexcel/test/temp/simple/Wirte.java | 0 .../test/temp/simple/WriteCellHandler.java | 0 .../easyexcel/test/temp/simple/WriteData.java | 0 .../easyexcel/test/temp/simple/WriteHandler.java | 0 .../easyexcel/test/temp/write/TempWriteData.java | 0 .../easyexcel/test/temp/write/TempWriteTest.java | 0 .../alibaba/easyexcel/test/util/TestFileUtil.java | 0 .../test/resources/converter/converter03.xls | Bin .../test/resources/converter/converter07.xlsx | Bin .../test/resources/converter/converterCsv.csv | 0 .../{ => src}/test/resources/converter/img.jpg | Bin .../test/resources/dataformat/dataformat.xls | Bin .../test/resources/dataformat/dataformat.xlsx | Bin .../{ => src}/test/resources/demo/cellDataDemo.xlsx | Bin .../{ => src}/test/resources/demo/demo.xlsx | Bin .../{ => src}/test/resources/demo/extra.xlsx | Bin .../{ => src}/test/resources/demo/fill/complex.xlsx | Bin .../resources/demo/fill/complexFillWithTable.xlsx | Bin .../test/resources/demo/fill/composite.xlsx | Bin .../test/resources/demo/fill/horizontal.xlsx | Bin .../{ => src}/test/resources/demo/fill/list.xlsx | Bin .../{ => src}/test/resources/demo/fill/simple.xlsx | Bin .../{ => src}/test/resources/extra/extra.xls | Bin .../{ => src}/test/resources/extra/extra.xlsx | Bin .../{ => src}/test/resources/fill/annotation.xls | Bin .../{ => src}/test/resources/fill/annotation.xlsx | Bin .../{ => src}/test/resources/fill/byName.xls | Bin .../{ => src}/test/resources/fill/byName.xlsx | Bin .../{ => src}/test/resources/fill/complex.xls | Bin .../{ => src}/test/resources/fill/complex.xlsx | Bin .../{ => src}/test/resources/fill/composite.xls | Bin .../{ => src}/test/resources/fill/composite.xlsx | Bin .../{ => src}/test/resources/fill/horizontal.xls | Bin .../{ => src}/test/resources/fill/horizontal.xlsx | Bin .../{ => src}/test/resources/fill/simple.csv | 0 .../{ => src}/test/resources/fill/simple.xls | Bin .../{ => src}/test/resources/fill/simple.xlsx | Bin .../{ => src}/test/resources/fill/style.xls | Bin .../{ => src}/test/resources/fill/style.xlsx | Bin .../{ => src}/test/resources/large/fill.xlsx | Bin .../{ => src}/test/resources/large/large07.xlsx | Bin easyexcel-test/{ => src}/test/resources/logback.xml | 0 .../resources/multiplesheets/multiplesheets.xls | Bin .../resources/multiplesheets/multiplesheets.xlsx | Bin .../{ => src}/test/resources/simple/simple07.xlsx | Bin .../test/resources/temp/issue1663/template.xlsx | Bin .../test/resources/temp/issue2443/date1.xlsx | Bin .../test/resources/temp/issue2443/date2.xlsx | Bin .../test/resources/template/template03.xls | Bin .../test/resources/template/template07.xlsx | Bin 233 files changed, 2 insertions(+), 31 deletions(-) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java (98%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java (98%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/CamlData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/LockData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/LockTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/StyleData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java (86%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java (95%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java (79%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java (87%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java (100%) rename easyexcel-test/{ => src}/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java (100%) rename easyexcel-test/{ => src}/test/resources/converter/converter03.xls (100%) rename easyexcel-test/{ => src}/test/resources/converter/converter07.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/converter/converterCsv.csv (100%) rename easyexcel-test/{ => src}/test/resources/converter/img.jpg (100%) rename easyexcel-test/{ => src}/test/resources/dataformat/dataformat.xls (100%) rename easyexcel-test/{ => src}/test/resources/dataformat/dataformat.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/cellDataDemo.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/demo.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/extra.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/complex.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/complexFillWithTable.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/composite.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/horizontal.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/list.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/demo/fill/simple.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/extra/extra.xls (100%) rename easyexcel-test/{ => src}/test/resources/extra/extra.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/annotation.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/annotation.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/byName.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/byName.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/complex.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/complex.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/composite.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/composite.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/horizontal.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/horizontal.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/simple.csv (100%) rename easyexcel-test/{ => src}/test/resources/fill/simple.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/simple.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/fill/style.xls (100%) rename easyexcel-test/{ => src}/test/resources/fill/style.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/large/fill.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/large/large07.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/logback.xml (100%) rename easyexcel-test/{ => src}/test/resources/multiplesheets/multiplesheets.xls (100%) rename easyexcel-test/{ => src}/test/resources/multiplesheets/multiplesheets.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/simple/simple07.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/temp/issue1663/template.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/temp/issue2443/date1.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/temp/issue2443/date2.xlsx (100%) rename easyexcel-test/{ => src}/test/resources/template/template03.xls (100%) rename easyexcel-test/{ => src}/test/resources/template/template07.xlsx (100%) diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml index d0304619..4a752ebc 100644 --- a/easyexcel-test/pom.xml +++ b/easyexcel-test/pom.xml @@ -16,8 +16,8 @@ - org.springframework - spring-core + com.alibaba + easyexcel-core diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/StyleTestUtils.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationStyleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionThrowDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/FillDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java similarity index 98% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java index 371dc48f..4be041f5 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java @@ -14,13 +14,11 @@ import org.apache.poi.hssf.usermodel.HSSFPicture; import org.apache.poi.hssf.usermodel.HSSFShape; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.PictureData; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.xssf.usermodel.XSSFAnchor; import org.apache.poi.xssf.usermodel.XSSFPicture; import org.apache.poi.xssf.usermodel.XSSFShape; import org.apache.poi.xssf.usermodel.XSSFSheet; diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/ListHeadDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/large/LargeDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/nomodel/NoModelDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataSheetNameListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java similarity index 98% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java index b44381cc..e6b56380 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleDataTest.java @@ -2,9 +2,7 @@ package com.alibaba.easyexcel.test.core.simple; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/sort/SortDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/style/StyleDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataDemoHeadDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/CustomStringStringConverter.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDAO.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExceptionListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoHeadDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/NoModelDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/EasyexcelApplication.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDAO.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomCellWriteHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomSheetWriteHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/CustomStringStringConverter.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/CamlData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/CamlData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/FillTempTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/LockTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/StyleTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteLargeTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV33Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/WriteV34Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/Xls03Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java similarity index 86% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java index 43edce59..adcef54a 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/cache/CacheTest.java @@ -4,12 +4,6 @@ import java.io.File; import java.util.HashMap; import java.util.UUID; -import org.apache.poi.xssf.streaming.SXSSFRow; -import org.apache.poi.xssf.streaming.SXSSFSheet; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.ehcache.Cache; import org.ehcache.PersistentCacheManager; import org.ehcache.config.builders.CacheConfigurationBuilder; diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvDataListeer.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvReadTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatter1.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillTempTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Issue1662Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/issue2443/Issue2443Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeDataListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java similarity index 95% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java index 715dc4f4..aff72adf 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/NoModelLargeDataListener.java @@ -2,7 +2,6 @@ package com.alibaba.easyexcel.test.temp.large; import java.util.Map; -import org.apache.poi.ss.formula.functions.Index; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/large/TempLargeDataTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi2Test.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java similarity index 79% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java index 35f552b4..4f7a3431 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/Poi3Test.java @@ -6,23 +6,12 @@ import java.io.OutputStream; import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; import org.apache.poi.poifs.crypt.EncryptionInfo; import org.apache.poi.poifs.crypt.EncryptionMode; import org.apache.poi.poifs.crypt.Encryptor; import org.apache.poi.poifs.filesystem.POIFSFileSystem; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellCopyPolicy; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.streaming.SXSSFRow; -import org.apache.poi.xssf.streaming.SXSSFSheet; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.XSSFRow; -import org.apache.poi.xssf.usermodel.XSSFSheet; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiEncryptTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java similarity index 87% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java index a9e2ce36..b20004a9 100644 --- a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java +++ b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiFormatTest.java @@ -1,18 +1,13 @@ package com.alibaba.easyexcel.test.temp.poi; -import java.io.File; import java.io.IOException; import java.util.Locale; -import org.apache.poi.hssf.usermodel.HSSFDataFormatter; import org.apache.poi.ss.usermodel.DataFormatter; -import org.apache.poi.ss.usermodel.DateUtil; -import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFCell; -import org.apache.poi.xssf.usermodel.XSSFDataFormat; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -21,8 +16,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.easyexcel.test.util.TestFileUtil; - /** * 测试poi * diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/PoiWriteTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/CommentTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HDListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/read/TestListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatListener.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/RepeatTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/Wirte.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteCellHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteHandler.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteData.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/temp/write/TempWriteTest.java diff --git a/easyexcel-test/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java b/easyexcel-test/src/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java similarity index 100% rename from easyexcel-test/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java rename to easyexcel-test/src/test/java/com/alibaba/easyexcel/test/util/TestFileUtil.java diff --git a/easyexcel-test/test/resources/converter/converter03.xls b/easyexcel-test/src/test/resources/converter/converter03.xls similarity index 100% rename from easyexcel-test/test/resources/converter/converter03.xls rename to easyexcel-test/src/test/resources/converter/converter03.xls diff --git a/easyexcel-test/test/resources/converter/converter07.xlsx b/easyexcel-test/src/test/resources/converter/converter07.xlsx similarity index 100% rename from easyexcel-test/test/resources/converter/converter07.xlsx rename to easyexcel-test/src/test/resources/converter/converter07.xlsx diff --git a/easyexcel-test/test/resources/converter/converterCsv.csv b/easyexcel-test/src/test/resources/converter/converterCsv.csv similarity index 100% rename from easyexcel-test/test/resources/converter/converterCsv.csv rename to easyexcel-test/src/test/resources/converter/converterCsv.csv diff --git a/easyexcel-test/test/resources/converter/img.jpg b/easyexcel-test/src/test/resources/converter/img.jpg similarity index 100% rename from easyexcel-test/test/resources/converter/img.jpg rename to easyexcel-test/src/test/resources/converter/img.jpg diff --git a/easyexcel-test/test/resources/dataformat/dataformat.xls b/easyexcel-test/src/test/resources/dataformat/dataformat.xls similarity index 100% rename from easyexcel-test/test/resources/dataformat/dataformat.xls rename to easyexcel-test/src/test/resources/dataformat/dataformat.xls diff --git a/easyexcel-test/test/resources/dataformat/dataformat.xlsx b/easyexcel-test/src/test/resources/dataformat/dataformat.xlsx similarity index 100% rename from easyexcel-test/test/resources/dataformat/dataformat.xlsx rename to easyexcel-test/src/test/resources/dataformat/dataformat.xlsx diff --git a/easyexcel-test/test/resources/demo/cellDataDemo.xlsx b/easyexcel-test/src/test/resources/demo/cellDataDemo.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/cellDataDemo.xlsx rename to easyexcel-test/src/test/resources/demo/cellDataDemo.xlsx diff --git a/easyexcel-test/test/resources/demo/demo.xlsx b/easyexcel-test/src/test/resources/demo/demo.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/demo.xlsx rename to easyexcel-test/src/test/resources/demo/demo.xlsx diff --git a/easyexcel-test/test/resources/demo/extra.xlsx b/easyexcel-test/src/test/resources/demo/extra.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/extra.xlsx rename to easyexcel-test/src/test/resources/demo/extra.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/complex.xlsx b/easyexcel-test/src/test/resources/demo/fill/complex.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/complex.xlsx rename to easyexcel-test/src/test/resources/demo/fill/complex.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/complexFillWithTable.xlsx b/easyexcel-test/src/test/resources/demo/fill/complexFillWithTable.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/complexFillWithTable.xlsx rename to easyexcel-test/src/test/resources/demo/fill/complexFillWithTable.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/composite.xlsx b/easyexcel-test/src/test/resources/demo/fill/composite.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/composite.xlsx rename to easyexcel-test/src/test/resources/demo/fill/composite.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/horizontal.xlsx b/easyexcel-test/src/test/resources/demo/fill/horizontal.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/horizontal.xlsx rename to easyexcel-test/src/test/resources/demo/fill/horizontal.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/list.xlsx b/easyexcel-test/src/test/resources/demo/fill/list.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/list.xlsx rename to easyexcel-test/src/test/resources/demo/fill/list.xlsx diff --git a/easyexcel-test/test/resources/demo/fill/simple.xlsx b/easyexcel-test/src/test/resources/demo/fill/simple.xlsx similarity index 100% rename from easyexcel-test/test/resources/demo/fill/simple.xlsx rename to easyexcel-test/src/test/resources/demo/fill/simple.xlsx diff --git a/easyexcel-test/test/resources/extra/extra.xls b/easyexcel-test/src/test/resources/extra/extra.xls similarity index 100% rename from easyexcel-test/test/resources/extra/extra.xls rename to easyexcel-test/src/test/resources/extra/extra.xls diff --git a/easyexcel-test/test/resources/extra/extra.xlsx b/easyexcel-test/src/test/resources/extra/extra.xlsx similarity index 100% rename from easyexcel-test/test/resources/extra/extra.xlsx rename to easyexcel-test/src/test/resources/extra/extra.xlsx diff --git a/easyexcel-test/test/resources/fill/annotation.xls b/easyexcel-test/src/test/resources/fill/annotation.xls similarity index 100% rename from easyexcel-test/test/resources/fill/annotation.xls rename to easyexcel-test/src/test/resources/fill/annotation.xls diff --git a/easyexcel-test/test/resources/fill/annotation.xlsx b/easyexcel-test/src/test/resources/fill/annotation.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/annotation.xlsx rename to easyexcel-test/src/test/resources/fill/annotation.xlsx diff --git a/easyexcel-test/test/resources/fill/byName.xls b/easyexcel-test/src/test/resources/fill/byName.xls similarity index 100% rename from easyexcel-test/test/resources/fill/byName.xls rename to easyexcel-test/src/test/resources/fill/byName.xls diff --git a/easyexcel-test/test/resources/fill/byName.xlsx b/easyexcel-test/src/test/resources/fill/byName.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/byName.xlsx rename to easyexcel-test/src/test/resources/fill/byName.xlsx diff --git a/easyexcel-test/test/resources/fill/complex.xls b/easyexcel-test/src/test/resources/fill/complex.xls similarity index 100% rename from easyexcel-test/test/resources/fill/complex.xls rename to easyexcel-test/src/test/resources/fill/complex.xls diff --git a/easyexcel-test/test/resources/fill/complex.xlsx b/easyexcel-test/src/test/resources/fill/complex.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/complex.xlsx rename to easyexcel-test/src/test/resources/fill/complex.xlsx diff --git a/easyexcel-test/test/resources/fill/composite.xls b/easyexcel-test/src/test/resources/fill/composite.xls similarity index 100% rename from easyexcel-test/test/resources/fill/composite.xls rename to easyexcel-test/src/test/resources/fill/composite.xls diff --git a/easyexcel-test/test/resources/fill/composite.xlsx b/easyexcel-test/src/test/resources/fill/composite.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/composite.xlsx rename to easyexcel-test/src/test/resources/fill/composite.xlsx diff --git a/easyexcel-test/test/resources/fill/horizontal.xls b/easyexcel-test/src/test/resources/fill/horizontal.xls similarity index 100% rename from easyexcel-test/test/resources/fill/horizontal.xls rename to easyexcel-test/src/test/resources/fill/horizontal.xls diff --git a/easyexcel-test/test/resources/fill/horizontal.xlsx b/easyexcel-test/src/test/resources/fill/horizontal.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/horizontal.xlsx rename to easyexcel-test/src/test/resources/fill/horizontal.xlsx diff --git a/easyexcel-test/test/resources/fill/simple.csv b/easyexcel-test/src/test/resources/fill/simple.csv similarity index 100% rename from easyexcel-test/test/resources/fill/simple.csv rename to easyexcel-test/src/test/resources/fill/simple.csv diff --git a/easyexcel-test/test/resources/fill/simple.xls b/easyexcel-test/src/test/resources/fill/simple.xls similarity index 100% rename from easyexcel-test/test/resources/fill/simple.xls rename to easyexcel-test/src/test/resources/fill/simple.xls diff --git a/easyexcel-test/test/resources/fill/simple.xlsx b/easyexcel-test/src/test/resources/fill/simple.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/simple.xlsx rename to easyexcel-test/src/test/resources/fill/simple.xlsx diff --git a/easyexcel-test/test/resources/fill/style.xls b/easyexcel-test/src/test/resources/fill/style.xls similarity index 100% rename from easyexcel-test/test/resources/fill/style.xls rename to easyexcel-test/src/test/resources/fill/style.xls diff --git a/easyexcel-test/test/resources/fill/style.xlsx b/easyexcel-test/src/test/resources/fill/style.xlsx similarity index 100% rename from easyexcel-test/test/resources/fill/style.xlsx rename to easyexcel-test/src/test/resources/fill/style.xlsx diff --git a/easyexcel-test/test/resources/large/fill.xlsx b/easyexcel-test/src/test/resources/large/fill.xlsx similarity index 100% rename from easyexcel-test/test/resources/large/fill.xlsx rename to easyexcel-test/src/test/resources/large/fill.xlsx diff --git a/easyexcel-test/test/resources/large/large07.xlsx b/easyexcel-test/src/test/resources/large/large07.xlsx similarity index 100% rename from easyexcel-test/test/resources/large/large07.xlsx rename to easyexcel-test/src/test/resources/large/large07.xlsx diff --git a/easyexcel-test/test/resources/logback.xml b/easyexcel-test/src/test/resources/logback.xml similarity index 100% rename from easyexcel-test/test/resources/logback.xml rename to easyexcel-test/src/test/resources/logback.xml diff --git a/easyexcel-test/test/resources/multiplesheets/multiplesheets.xls b/easyexcel-test/src/test/resources/multiplesheets/multiplesheets.xls similarity index 100% rename from easyexcel-test/test/resources/multiplesheets/multiplesheets.xls rename to easyexcel-test/src/test/resources/multiplesheets/multiplesheets.xls diff --git a/easyexcel-test/test/resources/multiplesheets/multiplesheets.xlsx b/easyexcel-test/src/test/resources/multiplesheets/multiplesheets.xlsx similarity index 100% rename from easyexcel-test/test/resources/multiplesheets/multiplesheets.xlsx rename to easyexcel-test/src/test/resources/multiplesheets/multiplesheets.xlsx diff --git a/easyexcel-test/test/resources/simple/simple07.xlsx b/easyexcel-test/src/test/resources/simple/simple07.xlsx similarity index 100% rename from easyexcel-test/test/resources/simple/simple07.xlsx rename to easyexcel-test/src/test/resources/simple/simple07.xlsx diff --git a/easyexcel-test/test/resources/temp/issue1663/template.xlsx b/easyexcel-test/src/test/resources/temp/issue1663/template.xlsx similarity index 100% rename from easyexcel-test/test/resources/temp/issue1663/template.xlsx rename to easyexcel-test/src/test/resources/temp/issue1663/template.xlsx diff --git a/easyexcel-test/test/resources/temp/issue2443/date1.xlsx b/easyexcel-test/src/test/resources/temp/issue2443/date1.xlsx similarity index 100% rename from easyexcel-test/test/resources/temp/issue2443/date1.xlsx rename to easyexcel-test/src/test/resources/temp/issue2443/date1.xlsx diff --git a/easyexcel-test/test/resources/temp/issue2443/date2.xlsx b/easyexcel-test/src/test/resources/temp/issue2443/date2.xlsx similarity index 100% rename from easyexcel-test/test/resources/temp/issue2443/date2.xlsx rename to easyexcel-test/src/test/resources/temp/issue2443/date2.xlsx diff --git a/easyexcel-test/test/resources/template/template03.xls b/easyexcel-test/src/test/resources/template/template03.xls similarity index 100% rename from easyexcel-test/test/resources/template/template03.xls rename to easyexcel-test/src/test/resources/template/template03.xls diff --git a/easyexcel-test/test/resources/template/template07.xlsx b/easyexcel-test/src/test/resources/template/template07.xlsx similarity index 100% rename from easyexcel-test/test/resources/template/template07.xlsx rename to easyexcel-test/src/test/resources/template/template07.xlsx From 5eb1e38fb323118e89ade573619ea5b8197f6d60 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 20:22:45 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9da457d..41f76926 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,6 @@ jobs: - name: Chmod run: chmod +x mvnw - name: Maven Build - run: ./mvnw install -B -V -Dmaven.test.skip=true + run: ./mvnw install -B -V -Dmaven.test.skip=false - name: Java Doc run: ./mvnw javadoc:javadoc From 346a1a8c56d07748419a477b772fb95c6b848891 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 20:36:21 +0800 Subject: [PATCH 09/11] =?UTF-8?q?*=20=E6=8F=90=E9=AB=98=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=85=BC=E5=AE=B9=E6=80=A7=20[Issue=20#2443]?= =?UTF-8?q?(https://github.com/alibaba/easyexcel/issues/2443)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/alibaba/excel/util/NumberUtils.java | 27 +++++-------------- update.md | 1 + 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/NumberUtils.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/NumberUtils.java index d52a3299..4646c396 100644 --- a/easyexcel-core/src/main/java/com/alibaba/excel/util/NumberUtils.java +++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/NumberUtils.java @@ -75,7 +75,7 @@ public class NumberUtils { */ public static Short parseShort(String string, ExcelContentProperty contentProperty) throws ParseException { if (!hasFormat(contentProperty)) { - return Short.valueOf(string); + return new BigDecimal(string).shortValue(); } return parse(string, contentProperty).shortValue(); } @@ -89,7 +89,7 @@ public class NumberUtils { */ public static Long parseLong(String string, ExcelContentProperty contentProperty) throws ParseException { if (!hasFormat(contentProperty)) { - return Long.valueOf(string); + return new BigDecimal(string).longValue(); } return parse(string, contentProperty).longValue(); } @@ -97,26 +97,13 @@ public class NumberUtils { /** * parse Integer from string * - * @param string An integer read in string format + * @param string An integer read in string format * @param contentProperty Properties of the content read in * @return An integer converted from a string */ public static Integer parseInteger(String string, ExcelContentProperty contentProperty) throws ParseException { if (!hasFormat(contentProperty)) { - // CS304 Issue link: https://github.com/alibaba/easyexcel/issues/2443 - int stringLength = string.length(); - if(stringLength>0){ - int pointer = stringLength; - for(int i=0;i Date: Fri, 6 May 2022 20:48:03 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyexcel-test/pom.xml | 36 ++++++++++++++++++++++++++++++++++++ pom.xml | 33 --------------------------------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml index 4a752ebc..57e58def 100644 --- a/easyexcel-test/pom.xml +++ b/easyexcel-test/pom.xml @@ -18,7 +18,43 @@ com.alibaba easyexcel-core + test + + + ch.qos.logback + logback-classic + test + + + com.alibaba + fastjson + test + + + org.springframework.boot + spring-boot-starter-web + test + + + junit + junit + test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + com/alibaba/easyexcel/test/core/**/*.java + + true + + + + + diff --git a/pom.xml b/pom.xml index da5b443b..ca9a601c 100644 --- a/pom.xml +++ b/pom.xml @@ -166,28 +166,6 @@ lombok provided - - - - ch.qos.logback - logback-classic - test - - - com.alibaba - fastjson - test - - - org.springframework.boot - spring-boot-starter-web - test - - - junit - junit - test - @@ -349,17 +327,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - com/alibaba/easyexcel/test/core/**/*.java - - true - - - org.apache.maven.plugins maven-shade-plugin From 51e1c282e5a59e26b4ba45e27cbc308740ec1fbd Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 6 May 2022 20:50:08 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8E=92=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyexcel-test/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/easyexcel-test/pom.xml b/easyexcel-test/pom.xml index 57e58def..e1f265e1 100644 --- a/easyexcel-test/pom.xml +++ b/easyexcel-test/pom.xml @@ -14,6 +14,10 @@ jar easyexcel-test + + true + + com.alibaba