Skip to content

Commit 37ff12b

Browse files
ctruedenctrueden
committed
TypesTest: clean up and improve code style
1 parent 4a2e238 commit 37ff12b

1 file changed

Lines changed: 39 additions & 75 deletions

File tree

‎scijava-types/src/test/java/org/scijava/types/TypesTest.java‎

Lines changed: 39 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -206,31 +206,28 @@ public void testIsAssignable() {
206206
/** Tests {@link Types#isAssignable(Type, Type)} from null to null. */
207207
@Test
208208
public void testIsAssignableNullToNull() {
209-
Assertions.assertThrows(NullPointerException.class, () -> {
210-
Types.isAssignable(null, null);
211-
});
209+
Assertions.assertThrows(NullPointerException.class,
210+
() -> Types.isAssignable(null, null));
212211
}
213212

214213
/** Tests {@link Types#isAssignable(Type, Type)} from Class to null. */
215214
@Test
216215
public void testIsAssignableClassToNull() {
217-
Assertions.assertThrows(NullPointerException.class, () -> {
218-
Types.isAssignable(Object.class, null);
219-
});
216+
Assertions.assertThrows(NullPointerException.class,
217+
() -> Types.isAssignable(Object.class, null));
220218
}
221219

222220
/** Tests {@link Types#isAssignable(Type, Type)} with type variable. */
223221
@Test
224222
public <T extends Number> void testIsAssignableT() {
225-
final Type t = new Nil<T>() {}.type();
226-
final Type listRaw = List.class;
227-
final Type listT = new Nil<List<T>>() {}.type();
228-
final Type listNumber = new Nil<List<Number>>() {}.type();
229-
final Type listInteger = new Nil<List<Integer>>() {}.type();
230-
final Type listExtendsNumber = new Nil<List<? extends Number>>() {}
231-
.type();
232-
final Type listListRaw = new Nil<List<List>>() {}.type();
233-
final Type listListInteger = new Nil<List<List<Integer>>>() {}.type();
223+
var t = new Nil<T>() {}.type();
224+
var listRaw = List.class;
225+
var listT = new Nil<List<T>>() {}.type();
226+
var listNumber = new Nil<List<Number>>() {}.type();
227+
var listInteger = new Nil<List<Integer>>() {}.type();
228+
var listExtendsNumber = new Nil<List<? extends Number>>() {}.type();
229+
var listListRaw = new Nil<List<List>>() {}.type();
230+
var listListInteger = new Nil<List<List<Integer>>>() {}.type();
234231

235232
assertTrue(Types.isAssignable(t, t));
236233
assertTrue(Types.isAssignable(listRaw, listRaw));
@@ -320,10 +317,8 @@ private static class RecursiveClass<T extends RecursiveClass<T>> {
320317
/** Tests {@link Types#isRecursive(Type)} */
321318
@Test
322319
public void testIsRecursive() {
323-
assertFalse(Types.isRecursive(Types.parameterizeRaw(new ArrayList<Number>()
324-
.getClass())));
325-
assertTrue(Types.isRecursive(Types.parameterizeRaw(new RecursiveClass<>()
326-
.getClass())));
320+
assertFalse(Types.isRecursive(Types.parameterizeRaw(ArrayList.class)));
321+
assertTrue(Types.isRecursive(Types.parameterizeRaw(RecursiveClass.class)));
327322
}
328323

329324
/** Tests {@link Types#isApplicable(Type[], Type[])} for raw classes. */
@@ -596,33 +591,31 @@ public <T> void testSatisfiesMatchingT() {
596591

597592
@Test
598593
public <N, C> void testSatisfiesWildcards() {
599-
Nil<List<N>> n = new Nil<List<N>>() {};
600-
Nil<List<C>> c = new Nil<List<C>>() {};
601-
Nil<List<? extends Number>> nWildcard =
602-
new Nil<List<? extends Number>>()
603-
{};
604-
605-
Type[] params = new Type[] { n.type() };
606-
Type[] argsOk = new Type[] { nWildcard.type() };
594+
var n = new Nil<List<N>>() {};
595+
var c = new Nil<List<C>>() {};
596+
var nWildcard = new Nil<List<? extends Number>>() {};
597+
598+
Type[] params = { n.type() };
599+
Type[] argsOk = { nWildcard.type() };
607600
assertEquals(-1, Types.isApplicable(argsOk, params));
608601

609602
params = new Type[] { n.type(), c.type() };
610603
argsOk = new Type[] { nWildcard.type(), nWildcard.type() };
611604
assertEquals(-1, Types.isApplicable(argsOk, params));
612605

613606
params = new Type[] { n.type(), n.type() };
614-
Type[] argsNotOk = new Type[] { nWildcard.type(), nWildcard.type() };
607+
Type[] argsNotOk = { nWildcard.type(), nWildcard.type() };
615608
assertNotEquals(-1, Types.isApplicable(argsNotOk, params));
616609
}
617610

618611
@Test
619612
public <N> void testSatisfiesWildcardsInParameterizedType() {
620-
Nil<N> n = new Nil<N>() {};
621-
Nil<List<N>> ln = new Nil<List<N>>() {};
622-
Nil<List<? extends Number>> lw = new Nil<List<? extends Number>>() {};
613+
var n = new Nil<N>() {};
614+
var ln = new Nil<List<N>>() {};
615+
var lw = new Nil<List<? extends Number>>() {};
623616

624-
Type[] params = new Type[] { n.type(), ln.type() };
625-
Type[] argsNotOk = new Type[] { Integer.class, lw.type() };
617+
Type[] params = { n.type(), ln.type() };
618+
Type[] argsNotOk = { Integer.class, lw.type() };
626619
assertNotEquals(-1, Types.isApplicable(argsNotOk, params));
627620

628621
params = new Type[] { ln.type(), n.type() };
@@ -634,31 +627,25 @@ public <N> void testSatisfiesWildcardsInParameterizedType() {
634627
public <N extends Number, C extends List<String>> void
635628
testSatisfiesBoundedWildcards()
636629
{
637-
Nil<List<N>> n = new Nil<List<N>>() {};
638-
Nil<List<C>> c = new Nil<List<C>>() {};
639-
Nil<List<? extends Number>> nNumberWildcard =
640-
new Nil<List<? extends Number>>()
641-
{};
642-
Nil<List<? extends List<String>>> nListWildcard =
643-
new Nil<List<? extends List<String>>>()
644-
{};
645-
646-
Type[] params = new Type[] { n.type() };
647-
Type[] argsOk = new Type[] { nNumberWildcard.type() };
630+
var n = new Nil<List<N>>() {};
631+
var c = new Nil<List<C>>() {};
632+
var nNumberWildcard = new Nil<List<? extends Number>>() {};
633+
var nListWildcard = new Nil<List<? extends List<String>>>() {};
634+
635+
Type[] params = { n.type() };
636+
Type[] argsOk = { nNumberWildcard.type() };
648637
assertEquals(-1, Types.isApplicable(argsOk, params));
649638

650639
params = new Type[] { n.type(), c.type() };
651640
argsOk = new Type[] { nNumberWildcard.type(), nListWildcard.type() };
652641
assertEquals(-1, Types.isApplicable(argsOk, params));
653642

654643
params = new Type[] { n.type(), c.type() };
655-
Type[] argsNotOk = new Type[] { nNumberWildcard.type(), nNumberWildcard
656-
.type() };
644+
Type[] argsNotOk = { nNumberWildcard.type(), nNumberWildcard.type() };
657645
assertNotEquals(-1, Types.isApplicable(argsNotOk, params));
658646

659647
params = new Type[] { n.type(), n.type() };
660-
argsNotOk = new Type[] { nNumberWildcard.type(), nNumberWildcard
661-
.type() };
648+
argsNotOk = new Type[] { nNumberWildcard.type(), nNumberWildcard.type() };
662649
assertNotEquals(-1, Types.isApplicable(argsNotOk, params));
663650
}
664651

@@ -748,39 +735,17 @@ public void testEnumValue() {
748735
/** Tests {@link Types#enumValue(String, Class)} for invalid value. */
749736
@Test
750737
public void testEnumValueNoConstant() {
751-
Assertions.assertThrows(IllegalArgumentException.class, () -> {
752-
Types.enumValue("NONE", Words.class);
753-
});
738+
Assertions.assertThrows(IllegalArgumentException.class,
739+
() -> Types.enumValue("NONE", Words.class));
754740
}
755741

756742
/** Tests {@link Types#enumValue(String, Class)} for non-enum class. */
757743
@Test
758744
public void testEnumValueNonEnum() {
759-
Assertions.assertThrows(IllegalArgumentException.class, () -> {
760-
Types.enumValue("HOOYAH", String.class);
761-
});
745+
Assertions.assertThrows(IllegalArgumentException.class,
746+
() -> Types.enumValue("HOOYAH", String.class));
762747
}
763748

764-
/** Tests {@link Types#parameterize(Class, Map)}. */
765-
@Test
766-
public void testParameterizeMap() {
767-
// TODO
768-
}
769-
770-
/** Tests {@link Types#parameterize(Class, Type...)}. */
771-
@Test
772-
public void testParameterizeTypes() {
773-
// TODO
774-
}
775-
776-
/** Tests {@link Types#parameterizeWithOwner()}. */
777-
@Test
778-
public void testParameterizeWithOwner() {
779-
// TODO
780-
}
781-
782-
// -- Helper classes --
783-
784749
// -- Helper methods --
785750

786751
/** Convenience method to get the {@link Type} of a field. */
@@ -804,5 +769,4 @@ private void assertAllTheSame(final List<?> list, final Object... values) {
804769
assertSame(list.get(i), values[i]);
805770
}
806771
}
807-
808772
}

0 commit comments

Comments
 (0)