BUG-865: remove unused model.util types

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

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java
index 143052ddf3225ad5f0d2e1afbc296518a5061440..66f7ba0c6945bfcc5c464b940dd38eff5334307e 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/BooleanCodecStringTest.java
@@ -8,12 +8,10 @@
 
 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.BooleanCodec;
-import org.opendaylight.yangtools.yang.model.util.BooleanType;
+import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
 
 /**
  * Unit tests for BooleanCodecString.
@@ -25,23 +23,23 @@ public class BooleanCodecStringTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testSerialize() {
-        BooleanCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( BooleanType.getInstance(), BooleanCodec.class);
+        BooleanCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class);
 
-        assertEquals( "serialize", "", codec.serialize( null ) );
-        assertEquals( "serialize", "true", codec.serialize( true ) );
-        assertEquals( "serialize", "false", codec.serialize( false ) );
+        assertEquals("serialize", "", codec.serialize(null));
+        assertEquals("serialize", "true", codec.serialize(true));
+        assertEquals("serialize", "false", codec.serialize(false));
     }
 
     @SuppressWarnings("unchecked")
     @Test
     public void testDeserialize() {
-        BooleanCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( BooleanType.getInstance(), BooleanCodec.class);
+        BooleanCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec(BaseTypes.booleanType(), BooleanCodec.class);
 
-        assertEquals( "deserialize", Boolean.TRUE, codec.deserialize( "true" ) );
-        assertEquals( "deserialize", Boolean.TRUE, codec.deserialize( "TRUE" ) );
-        assertEquals( "deserialize", Boolean.FALSE, codec.deserialize( "FALSE" ) );
-        assertEquals( "deserialize", Boolean.FALSE, codec.deserialize( "false" ) );
-        assertEquals( "deserialize", null, codec.deserialize( null ) );
+        assertEquals("deserialize", Boolean.TRUE, codec.deserialize("true"));
+        assertEquals("deserialize", Boolean.TRUE, codec.deserialize("TRUE"));
+        assertEquals("deserialize", Boolean.FALSE, codec.deserialize("FALSE"));
+        assertEquals("deserialize", Boolean.FALSE, codec.deserialize("false"));
+        assertEquals("deserialize", null, codec.deserialize(null));
         TypeDefinitionAwareCodecTestHelper.deserializeWithExpectedIllegalArgEx(codec, "foo");
         TypeDefinitionAwareCodecTestHelper.deserializeWithExpectedIllegalArgEx(codec, "");
     }