BUG-9265: Switch empty type mapping from Void to Empty

[yangtools.git] / yang / yang-data-impl / src / test / java / org / opendaylight / yangtools / yang / data / impl / codecs / StringCodecStringTest.java

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
index 7810e6c0e4a5fec597d65580192734abcb54c212..115080b10ff9c73eeeed46da6c5f71b8d802750f 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
@@ -8,11 +8,11 @@
 
 package org.opendaylight.yangtools.yang.data.impl.codecs;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.codec.StringCodec;
-import org.opendaylight.yangtools.yang.model.util.StringType;
+import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 
 /**
  * Unit tests for StringCodecString.
@@ -24,20 +24,20 @@ public class StringCodecStringTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testSerialize() {
-        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( StringType.getInstance(), StringCodec.class);
+        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.stringType(),
+            StringCodec.class);
 
-        assertEquals( "serialize", "foo", codec.serialize( "foo" ) );
-        assertEquals( "serialize", "", codec.serialize( "" ) );
-        assertEquals( "serialize", "", codec.serialize( null ) );
+        assertEquals("serialize", "foo", codec.serialize("foo"));
+        assertEquals("serialize", "", codec.serialize(""));
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void testDeserialize() {
-        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( StringType.getInstance(), StringCodec.class);
+        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.stringType(),
+            StringCodec.class);
 
-        assertEquals( "deserialize", "bar", codec.deserialize( "bar" ) );
-        assertEquals( "deserialize", "", codec.deserialize( "" ) );
-        assertEquals( "deserialize", "", codec.deserialize( null ) );
+        assertEquals("deserialize", "bar", codec.deserialize("bar"));
+        assertEquals("deserialize", "", codec.deserialize(""));
     }
 }