From 52d3caaddbbad2f5305203b1ef9a0059a5813186 Mon Sep 17 00:00:00 2001 From: Elvys Soares Date: Wed, 29 Jul 2020 09:37:55 -0300 Subject: [PATCH 1/3] Removed assertion roulette (test smell) --- .../test/java/cn/hutool/extra/template/BeetlUtilTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java index c7d27f621..d2e2d029d 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java @@ -21,15 +21,16 @@ import java.io.IOException; public class BeetlUtilTest { @Test - public void renderStrTest() throws IOException { + public void renderTest() throws IOException { GroupTemplate groupTemplate = BeetlUtil.createGroupTemplate(new StringTemplateResourceLoader(), Configuration.defaultConfiguration()); Template template = BeetlUtil.getTemplate(groupTemplate, "hello,${name}"); String result = BeetlUtil.render(template, Dict.create().set("name", "hutool")); - Assert.assertEquals("hello,hutool", result); + } + @Test + public void renderFromStrTest() { String renderFromStr = BeetlUtil.renderFromStr("hello,${name}", Dict.create().set("name", "hutool")); Assert.assertEquals("hello,hutool", renderFromStr); - } } From c6cf5f825b96d1c862db6b65f341910edfb8ec31 Mon Sep 17 00:00:00 2001 From: Golden Looly Date: Thu, 30 Jul 2020 08:09:50 +0800 Subject: [PATCH 2/3] Revert "Test improvement: removed assertion roulette (test smell)" --- .../java/cn/hutool/extra/template/BeetlUtilTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java index d2e2d029d..c7d27f621 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java @@ -21,16 +21,15 @@ import java.io.IOException; public class BeetlUtilTest { @Test - public void renderTest() throws IOException { + public void renderStrTest() throws IOException { GroupTemplate groupTemplate = BeetlUtil.createGroupTemplate(new StringTemplateResourceLoader(), Configuration.defaultConfiguration()); Template template = BeetlUtil.getTemplate(groupTemplate, "hello,${name}"); String result = BeetlUtil.render(template, Dict.create().set("name", "hutool")); - Assert.assertEquals("hello,hutool", result); - } - @Test - public void renderFromStrTest() { + Assert.assertEquals("hello,hutool", result); + String renderFromStr = BeetlUtil.renderFromStr("hello,${name}", Dict.create().set("name", "hutool")); Assert.assertEquals("hello,hutool", renderFromStr); + } } From 370f24ae3d9bd2fd2b4109d36113a43f3047f8b3 Mon Sep 17 00:00:00 2001 From: easepan Date: Thu, 27 Aug 2020 15:27:37 +0800 Subject: [PATCH 3/3] fix: ignore invalid index while get a enum value by index --- hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java index 9fa54b2b3..fd33465bb 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/EnumUtil.java @@ -61,7 +61,7 @@ public class EnumUtil { */ public static > E getEnumAt(Class enumClass, int index) { final E[] enumConstants = enumClass.getEnumConstants(); - return index < enumConstants.length ? enumConstants[index] : null; + return index >= 0 && index < enumConstants.length ? enumConstants[index] : null; } /**