Improve TypeDefinitionAwareCodecTestHelper.getCodec()

We can be using the passed class and assertThat() to improve type
checks and remove a @SuppressWarnings.

Change-Id: I5e90c98c0914152faa720293666462691e794611
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
index 81707428f2ed6c238451f1137e1bb7d9ab607363..fb5275b3bd41a4a89d23a71befb706a1603e7f6a 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codec/TypeDefinitionAwareCodecTestHelper.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.yangtools.yang.data.impl.codec;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -26,12 +26,10 @@ public final class TypeDefinitionAwareCodecTestHelper {
         throw new UnsupportedOperationException();
     }
 
-    @SuppressWarnings("unchecked")
     public static <T> T getCodec(final TypeDefinition<?> def, final Class<T> clazz) {
-        Object codec = TypeDefinitionAwareCodec.fromType(def);
-        assertNotNull(codec);
-        assertTrue(clazz.isAssignableFrom(codec.getClass()));
-        return (T)codec;
+        TypeDefinitionAwareCodec<?, ?> codec = TypeDefinitionAwareCodec.fromType(def);
+        assertThat(codec, instanceOf(clazz));
+        return clazz.cast(codec);
     }
 
     public static void deserializeWithExpectedIllegalArgEx(final Codec<String, ?, IllegalArgumentException> codec,