Drop unneeded generic type specifiers

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / impl / YangParserTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
index 760bee4bb05bb2999a51b5f46f7a443252d8a750..a8da2ba4f207063f67ed99938e789cb6a3ac189d 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/impl/YangParserTest.java
@@ -13,7 +13,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -30,17 +29,14 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode;
-import org.opendaylight.yangtools.yang.model.api.ChoiceNode;
+import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -150,7 +146,7 @@ public class YangParserTest {
         ConstraintDefinition constraints = ifEntry.getConstraints();
         assertNull(constraints.getWhenCondition());
         assertEquals(0, constraints.getMustConstraints().size());
-        assertFalse(constraints.isMandatory());
+        assertTrue(constraints.isMandatory());
         assertEquals(1, (int) constraints.getMinElements());
         assertEquals(11, (int) constraints.getMaxElements());
         // test AugmentationTarget args
@@ -635,7 +631,7 @@ public class YangParserTest {
     public void testChoice() {
         Module foo = TestUtils.findModule(modules, "foo");
         ContainerSchemaNode transfer = (ContainerSchemaNode) foo.getDataChildByName("transfer");
-        ChoiceNode how = (ChoiceNode) transfer.getDataChildByName("how");
+        ChoiceSchemaNode how = (ChoiceSchemaNode) transfer.getDataChildByName("how");
         Set<ChoiceCaseNode> cases = how.getCases();
         assertEquals(5, cases.size());
         ChoiceCaseNode input = null;
@@ -826,7 +822,7 @@ public class YangParserTest {
         File dependenciesDir = new File(getClass().getResource("/sorting-test").toURI());
         YangContextParser parser = new YangParserImpl();
         modules = parser.parseFile(yangFile, dependenciesDir).getModules();
-        SchemaContext ctx = new SchemaContextImpl(modules, Collections.<ModuleIdentifier, String> emptyMap());
+        SchemaContext ctx = new SchemaContextImpl(modules, Collections.emptyMap());
         checkOrder(modules);
         assertSetEquals(modules, ctx.getModules());
 
@@ -843,12 +839,12 @@ public class YangParserTest {
         }
         Set<Module> newModules = parser.parseFiles(testFiles).getModules();
         assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
+        ctx = new SchemaContextImpl(newModules, Collections.emptyMap());
         assertSetEquals(newModules, ctx.getModules());
         // ##########
         newModules = parser.parseFiles(testFiles, null).getModules();
         assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
+        ctx = new SchemaContextImpl(newModules, Collections.emptyMap());
         assertSetEquals(newModules, ctx.getModules());
         // ##########
         List<InputStream> streams = new ArrayList<>();
@@ -857,7 +853,7 @@ public class YangParserTest {
         }
         newModules = parser.parseSources(BuilderUtils.filesToByteSources(testFiles)).getModules();
         assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
+        ctx = new SchemaContextImpl(newModules, Collections.emptyMap());
         assertSetEquals(newModules, ctx.getModules());
         // ##########
         streams.clear();
@@ -866,27 +862,11 @@ public class YangParserTest {
         }
         newModules = parser.parseSources(BuilderUtils.filesToByteSources(testFiles), null).getModules();
         assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
-        assertSetEquals(newModules, ctx.getModules());
-        // ##########
-        Map<File, Module> mapped = parser.parseYangModelsMapped(testFiles);
-        newModules = new LinkedHashSet<>(mapped.values());
-        assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
-        assertSetEquals(newModules, ctx.getModules());
-        // ##########
-        streams.clear();
-        for (File f : testFiles) {
-            streams.add(new FileInputStream(f));
-        }
-        Map<InputStream, Module> mappedStreams = parser.parseYangModelsFromStreamsMapped(streams);
-        newModules = new LinkedHashSet<>(mappedStreams.values());
-        assertSetEquals(newModules, modules);
-        ctx = new SchemaContextImpl(newModules, Collections.<ModuleIdentifier, String> emptyMap());
+        ctx = new SchemaContextImpl(newModules, Collections.emptyMap());
         assertSetEquals(newModules, ctx.getModules());
     }
 
-    private void checkOrder(final Collection<Module> modules) {
+    private static void checkOrder(final Collection<Module> modules) {
         Iterator<Module> it = modules.iterator();
         Module m = it.next();
         assertEquals("m2", m.getName());
@@ -906,7 +886,7 @@ public class YangParserTest {
         assertEquals("m1", m.getName());
     }
 
-    private void assertSetEquals(final Set<Module> s1, final Set<Module> s2) {
+    private static void assertSetEquals(final Set<Module> s1, final Set<Module> s2) {
         assertEquals(s1, s2);
         Iterator<Module> it = s1.iterator();
         for (Module m : s2) {
@@ -950,7 +930,7 @@ public class YangParserTest {
         File yangSubmodul = new File(getClass().getResource("/yang-grammar-test/submodule-header-extension.yang")
                 .toURI());
 
-        List<File> yangs = new ArrayList<File>();
+        List<File> yangs = new ArrayList<>();
         yangs.add(yangModul);
         yangs.add(yangSubmodul);
 
@@ -968,7 +948,7 @@ public class YangParserTest {
         File yangModule2 = new File(getClass().getResource("/yang-grammar-test/stmtsep-in-statements2.yang").toURI());
         File yangSubModule = new File(getClass().getResource("/yang-grammar-test/stmtsep-in-statements-sub.yang").toURI());
 
-        List<File> yangs = new ArrayList<File>();
+        List<File> yangs = new ArrayList<>();
         yangs.add(yangModule1);
         yangs.add(yangModule2);
         yangs.add(yangSubModule);