This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 4af794ebf4924c68f22acd5366119320fa989e8b Author: Gary Gregory <[email protected]> AuthorDate: Wed Dec 31 14:40:28 2025 -0500 Sort members --- .../commons/lang3/StringUtilsJoinBenchmark.java | 24 +++++----- .../commons/lang3/function/MethodFixtures.java | 8 ++-- .../commons/lang3/reflect/TypeUtilsTest.java | 54 +++++++++++----------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsJoinBenchmark.java b/src/test/java/org/apache/commons/lang3/StringUtilsJoinBenchmark.java index 68184544b..0cce201b4 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsJoinBenchmark.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsJoinBenchmark.java @@ -117,11 +117,6 @@ */ public class StringUtilsJoinBenchmark { - private static final int WARMUP_ITERATIONS = 3; - private static final int WARMUP_TIME = 1; - private static final int MEASUREMENT_ITERATIONS = 5; - private static final int MEASUREMENT_TIME = 1; - @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Thread) @@ -152,7 +147,6 @@ public String testJoinBoolean_3_21_0() { return StringUtils_3_21_0.join(array, ',', 0, 10); } } - @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Thread) @@ -184,7 +178,6 @@ public String testJoinByte_3_21_0() { return StringUtils_3_21_0.join(array, ',', 0, array.length); } } - @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Thread) @@ -216,7 +209,6 @@ public String testJoinChar_3_21_0() { return StringUtils_3_21_0.join(array, ',', 0, array.length); } } - @BenchmarkMode(Mode.AverageTime) @OutputTimeUnit(TimeUnit.NANOSECONDS) @State(Scope.Thread) @@ -271,13 +263,13 @@ public void setup() { } @Benchmark - public String testJoinFloat3_20_0() { - return StringUtils_3_20_0.join(array, ',', 0, array.length); + public String testJoinFloat_3_21_0() { + return StringUtils_3_21_0.join(array, ',', 0, array.length); } @Benchmark - public String testJoinFloat_3_21_0() { - return StringUtils_3_21_0.join(array, ',', 0, array.length); + public String testJoinFloat3_20_0() { + return StringUtils_3_20_0.join(array, ',', 0, array.length); } } @@ -639,6 +631,14 @@ public static String join(final short[] array, final char delimiter, final int s } } + private static final int WARMUP_ITERATIONS = 3; + + private static final int WARMUP_TIME = 1; + + private static final int MEASUREMENT_ITERATIONS = 5; + + private static final int MEASUREMENT_TIME = 1; + private static Random newRandom() { return new Random(235); } diff --git a/src/test/java/org/apache/commons/lang3/function/MethodFixtures.java b/src/test/java/org/apache/commons/lang3/function/MethodFixtures.java index 61568c554..56ebcd21f 100644 --- a/src/test/java/org/apache/commons/lang3/function/MethodFixtures.java +++ b/src/test/java/org/apache/commons/lang3/function/MethodFixtures.java @@ -118,10 +118,6 @@ public static String staticGetString() { private String[] valueArray; - public String getStringVarStringArgs(final String... strings) { - return "XYZ"; - } - @AnnotationTestFixture public String getString() { return "ABC"; @@ -169,6 +165,10 @@ public String getStringThrowsUnchecked() { throw new CustomUncheckedException("getStringThrowsUnchecked"); } + public String getStringVarStringArgs(final String... strings) { + return "XYZ"; + } + String getValue1() { return value1; } diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java index 565a8d78a..902984241 100644 --- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java @@ -207,6 +207,15 @@ public class Tester implements This<String, B> { // empty } + private interface TestIF<T> { + } + + private static class TestImpl<T> implements TestIF<T> { + } + + private static class TestImpl2<R> implements TestIF<Number> { + } + public class That<K, V> implements This<K, V> { // empty } @@ -664,6 +673,24 @@ void testIsArrayTypeClasses() { assertFalse(TypeUtils.isArrayType(String.class)); } + @Test + void testIsAssignable_ClassWithParameterizedType() { + final ParameterizedType topre1 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build()); + final Type to1 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre1).build()); + final Type from1 = TypeUtils.parameterize(Class.class, TestIF.class); + assertFalse(TypeUtils.isAssignable(from1, to1), "Class<TestIF> should not be assignable to Class<? extends TestIF<?>>"); + + final ParameterizedType topre2 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build()); + final Type to2 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre2).build()); + final Type from2 = TypeUtils.parameterize(Class.class, TestImpl.class); + assertFalse(TypeUtils.isAssignable(from2, to2), "Class<TestImpl> should not be assignable to Class<? extends TestIF<?>>"); + + final ParameterizedType topre3 = TypeUtils.parameterize(TestIF.class, Number.class); + final Type to3 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre3).build()); + final Type from3 = TypeUtils.parameterize(Class.class, TestImpl2.class); + assertFalse(TypeUtils.isAssignable(from3, to3), "Class<TestImpl2> should not be assignable to Class<? extends TestIF<Number>>"); + } + @Test void testIsAssignableClasses() { assertTrue(TypeUtils.isAssignable(char.class, double.class)); @@ -773,33 +800,6 @@ void testIsAssignableGenericArrayTypeToWildcardType() { () -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType)); } - @Test - void testIsAssignable_ClassWithParameterizedType() { - final ParameterizedType topre1 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build()); - final Type to1 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre1).build()); - final Type from1 = TypeUtils.parameterize(Class.class, TestIF.class); - assertFalse(TypeUtils.isAssignable(from1, to1), "Class<TestIF> should not be assignable to Class<? extends TestIF<?>>"); - - final ParameterizedType topre2 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build()); - final Type to2 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre2).build()); - final Type from2 = TypeUtils.parameterize(Class.class, TestImpl.class); - assertFalse(TypeUtils.isAssignable(from2, to2), "Class<TestImpl> should not be assignable to Class<? extends TestIF<?>>"); - - final ParameterizedType topre3 = TypeUtils.parameterize(TestIF.class, Number.class); - final Type to3 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre3).build()); - final Type from3 = TypeUtils.parameterize(Class.class, TestImpl2.class); - assertFalse(TypeUtils.isAssignable(from3, to3), "Class<TestImpl2> should not be assignable to Class<? extends TestIF<Number>>"); - } - - private interface TestIF<T> { - } - - private static class TestImpl<T> implements TestIF<T> { - } - - private static class TestImpl2<R> implements TestIF<Number> { - } - @Test void testIsAssignableGenericClassHierarchy() throws NoSuchFieldException { /*
