Bug 5085: Clean-up test and retest JUnit tests

[yangtools.git] / yang / yang-data-codec-gson / src / test / java / org / opendaylight / yangtools / yang / data / codec / gson / Bug4969Test.java

diff --git a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
similarity index 80%
rename from yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java
rename to yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
index babd4fb51f2cf5830c70f1fa8997d0c1ad6088f6..2a3a1d5a221e5852af66014bb8ba16a95ade4bb5 100644 (file)
--- a/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/retest/Bug4969Test.java
+++ b/yang/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/Bug4969Test.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2015 Cisco 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.codec.gson.retest;
+package org.opendaylight.yangtools.yang.data.codec.gson;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -16,7 +16,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URISyntaxException;
-import java.util.Arrays;
 import java.util.Set;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -26,11 +25,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.codec.gson.JsonParserStream;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 
@@ -39,16 +36,7 @@ public class Bug4969Test {
     @Test
     public void newParserLeafRefTest() throws SourceException, ReactorException, URISyntaxException, IOException {
         File sourceDir = new File(Bug4969Test.class.getResource("/bug-4969/yang").toURI());
-        SchemaContext context = RetestUtils.parseYangSources(sourceDir.listFiles());
-        assertNotNull(context);
-
-        verifyNormalizedNodeResult(context);
-    }
-
-    @Test
-    public void oldParserLeafRefTest() throws SourceException, ReactorException, URISyntaxException, IOException {
-        File sourceDir = new File(Bug4969Test.class.getResource("/bug-4969/yang").toURI());
-        SchemaContext context = YangParserImpl.getInstance().parseFiles(Arrays.asList(sourceDir.listFiles()));
+        SchemaContext context = TestUtils.parseYangSources(sourceDir.listFiles());
         assertNotNull(context);
 
         verifyNormalizedNodeResult(context);
@@ -107,16 +95,7 @@ public class Bug4969Test {
     @Test
     public void newParserLeafRefTest2() throws SourceException, ReactorException, URISyntaxException, IOException {
         File sourceDir = new File(Bug4969Test.class.getResource("/leafref/yang").toURI());
-        SchemaContext context = RetestUtils.parseYangSources(sourceDir.listFiles());
-        assertNotNull(context);
-
-        parseJsonToNormalizedNodes(context);
-    }
-
-    @Test
-    public void oldParserLeafRefTest2() throws SourceException, ReactorException, URISyntaxException, IOException {
-        File sourceDir = new File(Bug4969Test.class.getResource("/leafref/yang").toURI());
-        SchemaContext context = YangParserImpl.getInstance().parseFiles(Arrays.asList(sourceDir.listFiles()));
+        SchemaContext context = TestUtils.parseYangSources(sourceDir.listFiles());
         assertNotNull(context);
 
         parseJsonToNormalizedNodes(context);