Bug 5085: Clean-up test and retest JUnit tests

[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/test/codecs/StringCodecStringTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
similarity index 71%
rename from yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/StringCodecStringTest.java
rename to yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
index 42e461660e0aee576bcd517ea7500390943e1678..7810e6c0e4a5fec597d65580192734abcb54c212 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/test/codecs/StringCodecStringTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/codecs/StringCodecStringTest.java
@@ -1,17 +1,16 @@
 /*
- * Copyright (c) 2014 Brocade Communications Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yangtools.yang.data.impl.test.codecs;
+package org.opendaylight.yangtools.yang.data.impl.codecs;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import static org.opendaylight.yangtools.yang.data.impl.test.codecs.TypeDefinitionAwareCodecTestHelper.getCodec;
 import org.opendaylight.yangtools.yang.data.api.codec.StringCodec;
 import org.opendaylight.yangtools.yang.model.util.StringType;
 
@@ -25,7 +24,7 @@ public class StringCodecStringTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testSerialize() {
-        StringCodec<String> codec = getCodec( StringType.getInstance(), StringCodec.class);
+        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( StringType.getInstance(), StringCodec.class);
 
         assertEquals( "serialize", "foo", codec.serialize( "foo" ) );
         assertEquals( "serialize", "", codec.serialize( "" ) );
@@ -35,7 +34,7 @@ public class StringCodecStringTest {
     @SuppressWarnings("unchecked")
     @Test
     public void testDeserialize() {
-        StringCodec<String> codec = getCodec( StringType.getInstance(), StringCodec.class);
+        StringCodec<String> codec = TypeDefinitionAwareCodecTestHelper.getCodec( StringType.getInstance(), StringCodec.class);
 
         assertEquals( "deserialize", "bar", codec.deserialize( "bar" ) );
         assertEquals( "deserialize", "", codec.deserialize( "" ) );