From 67484e1a6887ee474d8477f9f1d3187d1e4481d9 Mon Sep 17 00:00:00 2001 From: yeshwanthsripathy Date: Mon, 30 Oct 2023 12:31:46 -0500 Subject: [PATCH] Fixed 2 flaky tests --- .../GenericSynthesizedAggregateAnnotationTest.java | 6 +++++- .../src/test/java/cn/hutool/core/util/ReflectUtilTest.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java index c59b9d6bd..5432ebb9f 100644 --- a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ReflectUtil; import org.junit.Assert; import org.junit.Test; +import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -11,6 +12,7 @@ import java.lang.annotation.Target; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; /** * 合成注解{@link GenericSynthesizedAggregateAnnotation}的测试用例 @@ -36,9 +38,11 @@ public class GenericSynthesizedAggregateAnnotationTest { Assert.assertEquals(grandParentAnnotation, syntheticMetaAnnotation.getAnnotation(GrandParentAnnotation.class)); Assert.assertEquals(parentAnnotation, syntheticMetaAnnotation.getAnnotation(ParentAnnotation.class)); Assert.assertEquals(childAnnotation, syntheticMetaAnnotation.getAnnotation(ChildAnnotation.class)); + Annotation[] synthesizedAnnotations = syntheticMetaAnnotation.getAnnotations(); + Arrays.sort(synthesizedAnnotations, Comparator.comparing(Annotation::toString)); Assert.assertEquals( Arrays.asList(childAnnotation, grandParentAnnotation, parentAnnotation), - Arrays.asList(syntheticMetaAnnotation.getAnnotations()) + Arrays.asList(synthesizedAnnotations) ); // 扩展方法 diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java index 28b0b88f4..e7f242213 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java @@ -15,6 +15,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; +import java.util.Comparator; import java.util.List; import java.util.Map; @@ -225,8 +226,10 @@ public class ReflectUtilTest { final Method[] methods = ReflectUtil.getMethods(TestInterface3.class); Assert.assertEquals(4, methods.length); + Arrays.sort(methods, Comparator.comparing(Method::toString)); // 接口里，调用getMethods和getPublicMethods效果相同 final Method[] publicMethods = ReflectUtil.getPublicMethods(TestInterface3.class); + Arrays.sort(publicMethods, Comparator.comparing(Method::toString)); Assert.assertArrayEquals(methods, publicMethods); }