Skip to content

Commit 8a900cf

Browse files
ctruedenctrueden
committed
TypesTest: align with revised Types naming
1 parent 76f2352 commit 8a900cf

File tree

1 file changed

+19
-20
lines changed

1 file changed

+19
-20
lines changed

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

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class Struct {
152152

153153
/** Tests {@link Types#typeOf(Field, Class)}. */
154154
@Test
155-
public void testFieldType() {
155+
public void testTypeOf() {
156156
final Field field = Classes.field(Thing.class, "thing");
157157

158158
// T
@@ -245,8 +245,8 @@ public <T extends Number> void testIsAssignableT() {
245245
assertTrue(Types.isAssignable(listNumber, listT));
246246
assertTrue(Types.isAssignable(listInteger, listT));
247247
assertTrue(Types.isAssignable(listExtendsNumber, listT));
248-
// List<? extends Number> l = new ArrayList<>();
249-
// List<Number> l2 = (List<Number>) l;
248+
// List<? extends Number> l = new ArrayList<>();
249+
// List<Number> l2 = (List<Number>) l;
250250
assertTrue(Types.isAssignable(listExtendsNumber, listNumber));
251251

252252
assertTrue(Types.isAssignable(listT, listRaw));
@@ -276,18 +276,17 @@ public <T extends Number> void testIsAssignableT() {
276276
final Type listInteger = new Nil<List<Integer>>() {}.type();
277277
final Type listExtendsNumber = new Nil<List<? extends Number>>() {}
278278
.type();
279-
// T list = (T) new ArrayList<N>();
279+
// T list = (T) new ArrayList<N>();
280280
assertTrue(Types.isAssignable(listN, t));
281-
// T list = (T) new ArrayList<Number>();
281+
// T list = (T) new ArrayList<Number>();
282282
assertTrue(Types.isAssignable(listNumber, t));
283-
// T list = (T) new ArrayList<Integer>();
283+
// T list = (T) new ArrayList<Integer>();
284284
assertTrue(Types.isAssignable(listInteger, t));
285-
// List<? extends Number> l = new ArrayList<Number>();
286-
// T list = (T) l;
285+
// List<? extends Number> l = new ArrayList<Number>();
286+
// T list = (T) l;
287287
assertTrue(Types.isAssignable(listExtendsNumber, t));
288-
// T list = (T) new ArrayList<S>();
288+
// T list = (T) new ArrayList<S>();
289289
assertFalse(Types.isAssignable(listS, t));
290-
291290
}
292291

293292
/** Tests {@link Types#isAssignable(Type, Type)} against {@link Object} */
@@ -323,7 +322,7 @@ public void testIsRecursive() {
323322

324323
/** Tests {@link Types#isApplicable(Type[], Type[])} for raw classes. */
325324
@Test
326-
public void testSatisfiesRaw() {
325+
public void testIsApplicableRaw() {
327326
// f(Number, Integer)
328327
final Type[] dest = { Number.class, Integer.class };
329328

@@ -341,7 +340,7 @@ public void testSatisfiesRaw() {
341340

342341
/** Tests {@link Types#isApplicable(Type[], Type[])} for single arguments. */
343342
@Test
344-
public <T extends Number, U extends BigInteger> void testSatisfiesSingle() {
343+
public <T extends Number, U extends BigInteger> void testIsApplicableSingle() {
345344
// <T extends Number> f(T)
346345
final Type t = new Nil<T>() {}.type();
347346
final Type u = new Nil<U>() {}.type();
@@ -433,7 +432,7 @@ public <T extends Number, U extends BigInteger> void testSatisfiesSingle() {
433432

434433
@Test
435434
public <T extends Number, U extends String, V extends BigInteger> void
436-
testSatisfiesGenericArrays()
435+
testIsApplicableGenericArrays()
437436
{
438437
// generic arrays
439438
final Type arrayT = new Nil<T[]>() {}.type();
@@ -488,7 +487,7 @@ public <T extends Number, U extends BigInteger> void testSatisfiesSingle() {
488487

489488
@Test
490489
public <S, T extends Thing<S>, U extends IntegerThing, V extends RecursiveThing<V>, W extends RecursiveThing<W> & Loop, X extends Thing<S> & Loop>
491-
void testSatisfiesTypeVariables()
490+
void testIsApplicableTypeVariables()
492491
{
493492
final Type t = new Nil<T>() {}.type();
494493
final Type u = new Nil<U>() {}.type();
@@ -560,7 +559,7 @@ void testSatisfiesTypeVariables()
560559
* parameter appears across multiple destination types.
561560
*/
562561
@Test
563-
public <T> void testSatisfiesMatchingT() {
562+
public <T> void testIsApplicableMatchingT() {
564563
// <T> f(List<T>, List<T>)
565564
final Type[] params = { //
566565
new Nil<List<T>>()
@@ -590,7 +589,7 @@ public <T> void testSatisfiesMatchingT() {
590589
}
591590

592591
@Test
593-
public <N, C> void testSatisfiesWildcards() {
592+
public <N, C> void testIsApplicableWildcards() {
594593
var n = new Nil<List<N>>() {};
595594
var c = new Nil<List<C>>() {};
596595
var nWildcard = new Nil<List<? extends Number>>() {};
@@ -609,7 +608,7 @@ public <N, C> void testSatisfiesWildcards() {
609608
}
610609

611610
@Test
612-
public <N> void testSatisfiesWildcardsInParameterizedType() {
611+
public <N> void testIsApplicableWildcardsInParameterizedType() {
613612
var n = new Nil<N>() {};
614613
var ln = new Nil<List<N>>() {};
615614
var lw = new Nil<List<? extends Number>>() {};
@@ -625,7 +624,7 @@ public <N> void testSatisfiesWildcardsInParameterizedType() {
625624

626625
@Test
627626
public <N extends Number, C extends List<String>> void
628-
testSatisfiesBoundedWildcards()
627+
testIsApplicableBoundedWildcards()
629628
{
630629
var n = new Nil<List<N>>() {};
631630
var c = new Nil<List<C>>() {};
@@ -654,7 +653,7 @@ public <N> void testSatisfiesWildcardsInParameterizedType() {
654653
* indirectly parameterized by implementing an parameterized interface.
655654
*/
656655
@Test
657-
public <I1, I2> void testSatisfiesIndirectTypeVariables() {
656+
public <I1, I2> void testIsApplicableIndirectTypeVariables() {
658657

659658
abstract class NestedThingImplOK1 implements NestedThing<Double, Double> {}
660659

@@ -669,7 +668,7 @@ abstract class NestedThingImplOK1 implements NestedThing<Double, Double> {}
669668
* variables are expected but the given ones are nested and bounded.
670669
*/
671670
@Test
672-
public <I1, I2> void testSatisfiesUnboundedTypeVariables() {
671+
public <I1, I2> void testIsApplicableUnboundedTypeVariables() {
673672

674673
abstract class NestedThingImplOK1 implements
675674
Function<Iterable<Double>, Consumer<Double>>

0 commit comments

Comments
 (0)