From 7615d30f8bf046140a48238bcf5f1f582431d542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 27 Jan 2022 10:46:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=9AListUtilTest.pageTest=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=90=8E=EF=BC=8C=E5=9B=A0PageUtil.firstPageNo?= =?UTF-8?q?=E5=80=BC=E5=8F=98=E6=88=902=E5=AF=BC=E8=87=B4=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hutool/core/collection/ListUtilTest.java | 19 +++++++++++-------- .../cn/hutool/core/util/PageUtilTest.java | 17 ++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java index 912df5904..5cecd5de3 100644 --- a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java @@ -19,7 +19,7 @@ import java.util.Map; public class ListUtilTest { @Test - public void splitTest(){ + public void splitTest() { List> lists = ListUtil.split(null, 3); Assert.assertEquals(ListUtil.empty(), lists); @@ -60,7 +60,7 @@ public class ListUtilTest { } @Test - public void splitAvgTest(){ + public void splitAvgTest() { List> lists = ListUtil.splitAvg(null, 3); Assert.assertEquals(ListUtil.empty(), lists); @@ -80,13 +80,13 @@ public class ListUtilTest { } @Test(expected = IllegalArgumentException.class) - public void splitAvgNotZero(){ + public void splitAvgNotZero() { // limit不能小于等于0 ListUtil.splitAvg(Arrays.asList(1, 2, 3, 4), 0); } @Test - public void editTest(){ + public void editTest() { List a = ListUtil.toLinkedList("1", "2", "3"); final List filter = (List) CollUtil.edit(a, str -> "edit" + str); Assert.assertEquals("edit1", filter.get(0)); @@ -104,7 +104,7 @@ public class ListUtilTest { } @Test - public void pageTest(){ + public void pageTest() { List a = ListUtil.toLinkedList(1, 2, 3,4,5); PageUtil.setFirstPageNo(1); @@ -167,10 +167,13 @@ public class ListUtilTest { Assert.assertArrayEquals(new int[]{}, pageListData.get(0).stream().mapToInt(Integer::valueOf).toArray()); Assert.assertArrayEquals(new int[]{3, 4}, pageListData.get(1).stream().mapToInt(Integer::valueOf).toArray()); Assert.assertArrayEquals(new int[]{5}, pageListData.get(2).stream().mapToInt(Integer::valueOf).toArray()); + + // 恢复默认值，避免影响其他测试用例 + PageUtil.setFirstPageNo(0); } @Test - public void subTest(){ + public void subTest() { final List of = ListUtil.of(1, 2, 3, 4); final List sub = ListUtil.sub(of, 2, 4); sub.remove(0); @@ -181,10 +184,10 @@ public class ListUtilTest { } @Test - public void sortByPropertyTest(){ + public void sortByPropertyTest() { @Data @AllArgsConstructor - class TestBean{ + class TestBean { private int order; private String name; } diff --git a/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java index 46e6e606b..f382b8711 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java @@ -5,32 +5,31 @@ import org.junit.Test; /** * 分页单元测试 - * @author Looly * + * @author Looly */ public class PageUtilTest { - + @Test - public void transToStartEndTest(){ - PageUtil.setFirstPageNo(0); + public void transToStartEndTest() { int[] startEnd1 = PageUtil.transToStartEnd(0, 10); Assert.assertEquals(0, startEnd1[0]); Assert.assertEquals(10, startEnd1[1]); - + int[] startEnd2 = PageUtil.transToStartEnd(1, 10); Assert.assertEquals(10, startEnd2[0]); Assert.assertEquals(20, startEnd2[1]); } - + @Test - public void totalPage(){ + public void totalPage() { int totalPage = PageUtil.totalPage(20, 3); Assert.assertEquals(7, totalPage); } - + @Test public void rainbowTest() { int[] rainbow = PageUtil.rainbow(5, 20, 6); - Assert.assertArrayEquals(new int[] {3, 4, 5, 6, 7, 8}, rainbow); + Assert.assertArrayEquals(new int[]{3, 4, 5, 6, 7, 8}, rainbow); } } From e2d71ee5609c863bf2ad082c7bd72826f2a4684a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 27 Jan 2022 10:58:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java | 4 ++-- .../src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java index dd1ec960a..674ff8a9b 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java @@ -212,9 +212,9 @@ public class LocalDateTimeUtilTest { public void weekOfYearTest2(){ LocalDate date1 = LocalDate.of(2022, 1, 31); final int weekOfYear1 = LocalDateTimeUtil.weekOfYear(date1); - Assert.assertEquals(weekOfYear1, 52); + Assert.assertEquals(weekOfYear1, 5); final int weekOfYear2 = LocalDateTimeUtil.weekOfYear(date1.atStartOfDay()); - Assert.assertEquals(weekOfYear2, 52); + Assert.assertEquals(weekOfYear2, 5); } } diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java index 0564af9ac..e79c9b784 100644 --- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java @@ -2,6 +2,7 @@ package cn.hutool.core.text.csv; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.CharsetUtil; +import org.junit.Ignore; import org.junit.Test; public class CsvWriterTest { From 9b5b72b1e39b0fb7e34dd75c36a861cfe0be4c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 27 Jan 2022 11:01:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=A2=84=E6=9C=9F=E5=80=BC=E5=92=8C=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=80=BC=E5=8F=82=E6=95=B0=E5=8F=8D=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/date/LocalDateTimeUtilTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java index 674ff8a9b..57d6eb717 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java @@ -202,19 +202,19 @@ public class LocalDateTimeUtilTest { public void weekOfYearTest(){ LocalDate date1 = LocalDate.of(2021, 12, 31); final int weekOfYear1 = LocalDateTimeUtil.weekOfYear(date1); - Assert.assertEquals(weekOfYear1, 52); + Assert.assertEquals(52, weekOfYear1); final int weekOfYear2 = LocalDateTimeUtil.weekOfYear(date1.atStartOfDay()); - Assert.assertEquals(weekOfYear2, 52); + Assert.assertEquals(52, weekOfYear2); } @Test public void weekOfYearTest2(){ LocalDate date1 = LocalDate.of(2022, 1, 31); final int weekOfYear1 = LocalDateTimeUtil.weekOfYear(date1); - Assert.assertEquals(weekOfYear1, 5); + Assert.assertEquals(5, weekOfYear1); final int weekOfYear2 = LocalDateTimeUtil.weekOfYear(date1.atStartOfDay()); - Assert.assertEquals(weekOfYear2, 5); + Assert.assertEquals(5, weekOfYear2); } }