Fixed some major sonar issues in yang-validation-tool

[yangtools.git] / code-generator / binding-generator-impl / src / test / java / org / opendaylight / yangtools / sal / binding / generator / impl / GeneratedTypesStringTest.java

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java
index 5aacf67c09729bdeed2d9b6c4e6dfa70b6feb021..fa7e0bfc59a9d679fd35ae50405d70083470f776 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesStringTest.java
@@ -7,12 +7,14 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -21,9 +23,8 @@ import org.opendaylight.yangtools.sal.binding.model.api.Constant;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
 import org.opendaylight.yangtools.sal.binding.model.api.ParameterizedType;
 import org.opendaylight.yangtools.sal.binding.model.api.Type;
-import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
+import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 public class GeneratedTypesStringTest {
@@ -31,20 +32,19 @@ public class GeneratedTypesStringTest {
     private final static List<File> testModels = new ArrayList<File>();
 
     @BeforeClass
-    public static void loadTestResources() {
+    public static void loadTestResources() throws URISyntaxException {
         final File listModelFile = new File(GeneratedTypesStringTest.class.getResource("/simple-string-demo.yang")
-                .getPath());
+                .toURI());
         testModels.add(listModelFile);
     }
 
     @Test
-    public void constantGenerationTest() {
-        final YangModelParser parser = new YangParserImpl();
-        final Set<Module> modules = parser.parseYangModels(testModels);
-        final SchemaContext context = parser.resolveSchemaContext(modules);
+    public void constantGenerationTest() throws IOException {
+        final YangContextParser parser = new YangParserImpl();
+        final SchemaContext context = parser.parseFiles(testModels);
 
         assertNotNull(context);
-        final BindingGenerator bindingGen = new BindingGeneratorImpl();
+        final BindingGenerator bindingGen = new BindingGeneratorImpl(true);
         final List<Type> genTypes = bindingGen.generateTypes(context);
 
         boolean typedefStringFound = false;
@@ -65,35 +65,41 @@ public class GeneratedTypesStringTest {
                     for (Constant con : constants) {
                         if (con.getName().equals("PATTERN_CONSTANTS")) {
                             constantRegExListFound = true;
-                        } else
+                        } else {
                             break;
+                        }
                         ParameterizedType pType;
                         if (con.getType() instanceof ParameterizedType) {
                             pType = (ParameterizedType) con.getType();
-                        } else
+                        } else {
                             break;
+                        }
 
                         Type[] types;
                         if (pType.getName().equals("List")) {
                             constantRegExListTypeContainer = true;
                             types = pType.getActualTypeArguments();
-                        } else
+                        } else {
                             break;
+                        }
 
                         if (types.length == 1) {
                             constantRegExListTypeOneGeneric = true;
-                        } else
+                        } else {
                             break;
+                        }
 
                         if (types[0].getName().equals("String")) {
                             constantRegExListTypeGeneric = true;
-                        } else
+                        } else {
                             break;
+                        }
 
                         if (con.getValue() instanceof List) {
                             constantRegExListValueOK = true;
-                        } else
+                        } else {
                             break;
+                        }
 
                         for (Object obj : (List<?>) con.getValue()) {
                             if (!(obj instanceof String)) {