Skip to content

Commit 4af794e

Browse files
garydgregorygarydgregory
committed
Sort members
1 parent 23524a8 commit 4af794e

File tree

3 files changed

+43
-43
lines changed

3 files changed

+43
-43
lines changed

‎src/test/java/org/apache/commons/lang3/StringUtilsJoinBenchmark.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,6 @@
117117
*/
118118
public class StringUtilsJoinBenchmark {
119119

120-
private static final int WARMUP_ITERATIONS = 3;
121-
private static final int WARMUP_TIME = 1;
122-
private static final int MEASUREMENT_ITERATIONS = 5;
123-
private static final int MEASUREMENT_TIME = 1;
124-
125120
@BenchmarkMode(Mode.AverageTime)
126121
@OutputTimeUnit(TimeUnit.NANOSECONDS)
127122
@State(Scope.Thread)
@@ -152,7 +147,6 @@ public String testJoinBoolean_3_21_0() {
152147
return StringUtils_3_21_0.join(array, ',', 0, 10);
153148
}
154149
}
155-
156150
@BenchmarkMode(Mode.AverageTime)
157151
@OutputTimeUnit(TimeUnit.NANOSECONDS)
158152
@State(Scope.Thread)
@@ -184,7 +178,6 @@ public String testJoinByte_3_21_0() {
184178
return StringUtils_3_21_0.join(array, ',', 0, array.length);
185179
}
186180
}
187-
188181
@BenchmarkMode(Mode.AverageTime)
189182
@OutputTimeUnit(TimeUnit.NANOSECONDS)
190183
@State(Scope.Thread)
@@ -216,7 +209,6 @@ public String testJoinChar_3_21_0() {
216209
return StringUtils_3_21_0.join(array, ',', 0, array.length);
217210
}
218211
}
219-
220212
@BenchmarkMode(Mode.AverageTime)
221213
@OutputTimeUnit(TimeUnit.NANOSECONDS)
222214
@State(Scope.Thread)
@@ -271,13 +263,13 @@ public void setup() {
271263
}
272264

273265
@Benchmark
274-
public String testJoinFloat3_20_0() {
275-
return StringUtils_3_20_0.join(array, ',', 0, array.length);
266+
public String testJoinFloat_3_21_0() {
267+
return StringUtils_3_21_0.join(array, ',', 0, array.length);
276268
}
277269

278270
@Benchmark
279-
public String testJoinFloat_3_21_0() {
280-
return StringUtils_3_21_0.join(array, ',', 0, array.length);
271+
public String testJoinFloat3_20_0() {
272+
return StringUtils_3_20_0.join(array, ',', 0, array.length);
281273
}
282274
}
283275

@@ -639,6 +631,14 @@ public static String join(final short[] array, final char delimiter, final int s
639631
}
640632
}
641633

634+
private static final int WARMUP_ITERATIONS = 3;
635+
636+
private static final int WARMUP_TIME = 1;
637+
638+
private static final int MEASUREMENT_ITERATIONS = 5;
639+
640+
private static final int MEASUREMENT_TIME = 1;
641+
642642
private static Random newRandom() {
643643
return new Random(235);
644644
}

‎src/test/java/org/apache/commons/lang3/function/MethodFixtures.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ public static String staticGetString() {
118118

119119
private String[] valueArray;
120120

121-
public String getStringVarStringArgs(final String... strings) {
122-
return "XYZ";
123-
}
124-
125121
@AnnotationTestFixture
126122
public String getString() {
127123
return "ABC";
@@ -169,6 +165,10 @@ public String getStringThrowsUnchecked() {
169165
throw new CustomUncheckedException("getStringThrowsUnchecked");
170166
}
171167

168+
public String getStringVarStringArgs(final String... strings) {
169+
return "XYZ";
170+
}
171+
172172
String getValue1() {
173173
return value1;
174174
}

‎src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,15 @@ public class Tester implements This<String, B> {
207207
// empty
208208
}
209209

210+
private interface TestIF<T> {
211+
}
212+
213+
private static class TestImpl<T> implements TestIF<T> {
214+
}
215+
216+
private static class TestImpl2<R> implements TestIF<Number> {
217+
}
218+
210219
public class That<K, V> implements This<K, V> {
211220
// empty
212221
}
@@ -664,6 +673,24 @@ void testIsArrayTypeClasses() {
664673
assertFalse(TypeUtils.isArrayType(String.class));
665674
}
666675

676+
@Test
677+
void testIsAssignable_ClassWithParameterizedType() {
678+
final ParameterizedType topre1 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build());
679+
final Type to1 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre1).build());
680+
final Type from1 = TypeUtils.parameterize(Class.class, TestIF.class);
681+
assertFalse(TypeUtils.isAssignable(from1, to1), "Class<TestIF> should not be assignable to Class<? extends TestIF<?>>");
682+
683+
final ParameterizedType topre2 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build());
684+
final Type to2 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre2).build());
685+
final Type from2 = TypeUtils.parameterize(Class.class, TestImpl.class);
686+
assertFalse(TypeUtils.isAssignable(from2, to2), "Class<TestImpl> should not be assignable to Class<? extends TestIF<?>>");
687+
688+
final ParameterizedType topre3 = TypeUtils.parameterize(TestIF.class, Number.class);
689+
final Type to3 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre3).build());
690+
final Type from3 = TypeUtils.parameterize(Class.class, TestImpl2.class);
691+
assertFalse(TypeUtils.isAssignable(from3, to3), "Class<TestImpl2> should not be assignable to Class<? extends TestIF<Number>>");
692+
}
693+
667694
@Test
668695
void testIsAssignableClasses() {
669696
assertTrue(TypeUtils.isAssignable(char.class, double.class));
@@ -773,33 +800,6 @@ void testIsAssignableGenericArrayTypeToWildcardType() {
773800
() -> String.format("TypeUtils.isAssignable(%s, %s)", testType, paramType));
774801
}
775802

776-
@Test
777-
void testIsAssignable_ClassWithParameterizedType() {
778-
final ParameterizedType topre1 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build());
779-
final Type to1 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre1).build());
780-
final Type from1 = TypeUtils.parameterize(Class.class, TestIF.class);
781-
assertFalse(TypeUtils.isAssignable(from1, to1), "Class<TestIF> should not be assignable to Class<? extends TestIF<?>>");
782-
783-
final ParameterizedType topre2 = TypeUtils.parameterize(TestIF.class, TypeUtils.wildcardType().build());
784-
final Type to2 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre2).build());
785-
final Type from2 = TypeUtils.parameterize(Class.class, TestImpl.class);
786-
assertFalse(TypeUtils.isAssignable(from2, to2), "Class<TestImpl> should not be assignable to Class<? extends TestIF<?>>");
787-
788-
final ParameterizedType topre3 = TypeUtils.parameterize(TestIF.class, Number.class);
789-
final Type to3 = TypeUtils.parameterize(Class.class, TypeUtils.wildcardType().withUpperBounds(topre3).build());
790-
final Type from3 = TypeUtils.parameterize(Class.class, TestImpl2.class);
791-
assertFalse(TypeUtils.isAssignable(from3, to3), "Class<TestImpl2> should not be assignable to Class<? extends TestIF<Number>>");
792-
}
793-
794-
private interface TestIF<T> {
795-
}
796-
797-
private static class TestImpl<T> implements TestIF<T> {
798-
}
799-
800-
private static class TestImpl2<R> implements TestIF<Number> {
801-
}
802-
803803
@Test
804804
void testIsAssignableGenericClassHierarchy() throws NoSuchFieldException {
805805
/*

0 commit comments

Comments
 (0)