Split out yang-model-ri

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / codec / TypeDefinitionAwareCodecTestHelper.java

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..df048cff08c910fa1c349997fd9f4a891cadadc6 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,31 +7,30 @@
  */
 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.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.concepts.Codec;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
-import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
-import org.opendaylight.yangtools.yang.model.util.type.EnumerationTypeBuilder;
+import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair;
+import org.opendaylight.yangtools.yang.model.ri.type.BaseTypes;
+import org.opendaylight.yangtools.yang.model.ri.type.EnumerationTypeBuilder;
 
 public final class TypeDefinitionAwareCodecTestHelper {
     private TypeDefinitionAwareCodecTestHelper() {
-        throw new UnsupportedOperationException();
+        // Hidden on purpose
     }
 
-    @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,
@@ -45,12 +44,12 @@ public final class TypeDefinitionAwareCodecTestHelper {
     }
 
     public static EnumTypeDefinition toEnumTypeDefinition(final String... enums) {
-        final EnumerationTypeBuilder b = BaseTypes.enumerationTypeBuilder(mock(SchemaPath.class));
+        final EnumerationTypeBuilder b = BaseTypes.enumerationTypeBuilder(QName.create("foo", "foo"));
         int val = 0;
         for (String en : enums) {
-            EnumTypeDefinition.EnumPair mockEnum = mock(EnumTypeDefinition.EnumPair.class);
-            when(mockEnum.getName()).thenReturn(en);
-            when(mockEnum.getValue()).thenReturn(val);
+            EnumTypeDefinition.EnumPair mockEnum = mock(EnumPair.class);
+            doReturn(en).when(mockEnum).getName();
+            doReturn(val).when(mockEnum).getValue();
             b.addEnum(mockEnum);
             val++;
         }