Skip to content

Commit 4c84d1f

Browse files
committed
ClassUtilsTest: refactor style of new unit tests
Thanks to Johannes Schindelin for the suggestions.
1 parent 6a82017 commit 4c84d1f

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

src/test/java/org/scijava/util/ClassUtilsTest.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,25 +154,19 @@ public void testGetGenericType() {
154154
final Field field = ClassUtils.getField(Thing.class, "thing");
155155

156156
// Object
157-
final List<Class<?>> tTypes = ClassUtils.getTypes(field, Thing.class);
158-
assertEquals(1, tTypes.size());
159-
assertSame(Object.class, tTypes.get(0));
157+
assertAllTheSame(ClassUtils.getTypes(field, Thing.class), Object.class);
160158

161159
// N extends Number
162-
final List<Class<?>> nTypes = ClassUtils.getTypes(field, NumberThing.class);
163-
assertEquals(1, nTypes.size());
164-
assertEquals(Number.class, nTypes.get(0));
160+
assertAllTheSame(ClassUtils.getTypes(field, NumberThing.class),
161+
Number.class);
165162

166163
// Integer
167-
final List<Class<?>> iTypes = ClassUtils.getTypes(field, IntegerThing.class);
168-
assertEquals(1, iTypes.size());
169-
assertSame(Integer.class, iTypes.get(0));
164+
assertAllTheSame(ClassUtils.getTypes(field, IntegerThing.class),
165+
Integer.class);
170166

171167
// Serializable & Cloneable
172-
final List<Class<?>> cTypes = ClassUtils.getTypes(field, ComplexThing.class);
173-
assertEquals(2, cTypes.size());
174-
assertSame(Serializable.class, cTypes.get(0));
175-
assertSame(Cloneable.class, cTypes.get(1));
168+
assertAllTheSame(ClassUtils.getTypes(field, ComplexThing.class),
169+
Serializable.class, Cloneable.class);
176170
}
177171

178172
@Test
@@ -208,6 +202,8 @@ public void testClassInJar() throws IOException {
208202
jar.deleteOnExit();
209203
}
210204

205+
// -- Helper methods --
206+
211207
/**
212208
* Copies bytes from an {@link InputStream} to an {@link OutputStream}.
213209
*
@@ -229,6 +225,13 @@ private void copy(final InputStream in, final OutputStream out,
229225
if (closeOut) out.close();
230226
}
231227

228+
private <T> void assertAllTheSame(final List<T> list, T... values) {
229+
assertEquals(list.size(), values.length);
230+
for (int i = 0; i < values.length; i++) {
231+
assertSame(list.get(i), values[i]);
232+
}
233+
}
234+
232235
private void assertLoaded(final Class<?> c, final String name) {
233236
assertSame(c, ClassUtils.loadClass(name));
234237
}

0 commit comments

Comments
 (0)