Fixed incorrect path construction in JUnit tests.

Change-Id: I8d10bd6aa6cc84e3435a438f7d4b2aa94a463259
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java
index fa52b5de8ffcc519e53a1e3cf5c330062193b319..6611ac40e81af93fc2216dddbe852f184d11e061 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentRelativeXPathTest.java
@@ -7,9 +7,13 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -30,12 +34,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class AugmentRelativeXPathTest {
 
     private final static List<File> augmentModels = new ArrayList<>();
-    private final static String augmentFolderPath = AugmentedTypeTest.class
-            .getResource("/augment-relative-xpath-models").getPath();
+    private final static URL augmentFolderPath = AugmentedTypeTest.class
+            .getResource("/augment-relative-xpath-models");
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File augFolder = new File(augmentFolderPath);
+    public static void loadTestResources() throws URISyntaxException {
+        final File augFolder = new File(augmentFolderPath.toURI());
 
         for (final File fileEntry : augFolder.listFiles()) {
             if (fileEntry.isFile()) {

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java
index 01579f1b5dd53b4b5a3fd77772cfc9da32aaf14c..f2cf8ebc9ef4d5e73614b015f9cf3b137f5a4ebe 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/AugmentedTypeTest.java
@@ -7,9 +7,13 @@
  */\r
 package org.opendaylight.yangtools.sal.binding.generator.impl;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertNotNull;\r
+import static org.junit.Assert.assertTrue;\r
 \r
 import java.io.File;\r
+import java.net.URISyntaxException;\r
+import java.net.URL;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Set;\r
@@ -30,12 +34,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class AugmentedTypeTest {\r
 \r
     private final static List<File> augmentModels = new ArrayList<>();\r
-    private final static String augmentFolderPath = AugmentedTypeTest.class\r
-            .getResource("/augment-test-models").getPath();\r
+    private final static URL augmentFolderPath = AugmentedTypeTest.class\r
+            .getResource("/augment-test-models");\r
 \r
     @BeforeClass\r
-    public static void loadTestResources() {\r
-        final File augFolder = new File(augmentFolderPath);\r
+    public static void loadTestResources() throws URISyntaxException {\r
+        final File augFolder = new File(augmentFolderPath.toURI());\r
 \r
         for (final File fileEntry : augFolder.listFiles()) {\r
             if (fileEntry.isFile()) {\r

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java
index f5880d9ccc4b26029ee5f1bf7bbda3b7ae453c2a..06f2844a0023cdbd63f5666b112cc04485110df4 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BinaryTypeTest.java
@@ -7,9 +7,12 @@
 */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -25,12 +28,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 public class BinaryTypeTest {
     private final static List<File> yangModels = new ArrayList<>();
-    private final static String yangModelsFolder = AugmentedTypeTest.class
-            .getResource("/binary-type-test-models").getPath();
+    private final static URL yangModelsFolder = AugmentedTypeTest.class
+            .getResource("/binary-type-test-models");
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File augFolder = new File(yangModelsFolder);
+    public static void loadTestResources() throws URISyntaxException {
+        final File augFolder = new File(yangModelsFolder.toURI());
         for (final File fileEntry : augFolder.listFiles()) {
             if (fileEntry.isFile()) {
                 yangModels.add(fileEntry);

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java
index 9908fc4cf45b0c252b1061f3c832454588ba4524..a9be781252f36b24763494044e845b42fe0a3cee 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/BitAndUnionTOEnclosingTest.java
@@ -13,6 +13,7 @@ import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestU
 import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -55,8 +56,8 @@ public class BitAndUnionTOEnclosingTest {
     }
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File listModelFile = new File(ExtendedTypedefTest.class.getResource("/bit_and_union.yang").getPath());
+    public static void loadTestResources() throws URISyntaxException {
+        final File listModelFile = new File(ExtendedTypedefTest.class.getResource("/bit_and_union.yang").toURI());
         testModels.add(listModelFile);
         parseResources();
     }

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
index 048de43e7172392168cb1099a1be75430a4ca2ba..8e5b95f07c13745e6723f83a0b3be8b803be7c81 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ChoiceCaseGenTypesTest.java
@@ -7,11 +7,15 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsInterface;
 import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -30,12 +34,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class ChoiceCaseGenTypesTest {
 
     private final static List<File> yangModels = new ArrayList<>();
-    private final static String yangModelsFolder = AugmentedTypeTest.class.getResource("/choice-case-type-test-models")
-            .getPath();
+    private final static URL yangModelsFolder = AugmentedTypeTest.class.getResource("/choice-case-type-test-models")
+            ;
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File augFolder = new File(yangModelsFolder);
+    public static void loadTestResources() throws URISyntaxException {
+        final File augFolder = new File(yangModelsFolder.toURI());
         for (final File fileEntry : augFolder.listFiles()) {
             if (fileEntry.isFile()) {
                 yangModels.add(fileEntry);

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java
index 6717ebb4910b76237eec6942b9d1e046b6c566a5..93362b9c884aa689b254c857f4ebbf23ccb31733 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ControllerTest.java
@@ -8,9 +8,12 @@
 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.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -27,12 +30,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class ControllerTest {
 
     private final static List<File> controllerModels = new ArrayList<>();
-    private final static String controllerModelsFolderPath = ControllerTest.class
-            .getResource("/controller-models").getPath();
+    private final static URL controllerModelsFolderPath = ControllerTest.class
+            .getResource("/controller-models");
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File ctrlFolder = new File(controllerModelsFolderPath);
+    public static void loadTestResources() throws URISyntaxException {
+        final File ctrlFolder = new File(controllerModelsFolderPath.toURI());
 
         for (final File fileEntry : ctrlFolder.listFiles()) {
             if (fileEntry.isFile()) {

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java
index edb3ecb3946fd11059d22ea7da98494a43f356dc..09fe8914d7089860e9638dd95ef6f0b0cbdb1703 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/ExtendedTypedefTest.java
@@ -7,33 +7,38 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;\r
 \r
-import static org.junit.Assert.*;\r
-\r
-import java.io.File;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-import java.util.Set;\r
-\r
-import org.junit.BeforeClass;\r
-import org.junit.Test;\r
-import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;\r
-import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;\r
-import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;\r
-import org.opendaylight.yangtools.sal.binding.model.api.Type;\r
-import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes;\r
-import org.opendaylight.yangtools.yang.model.api.Module;\r
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;\r
-import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;\r
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;\r
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
+import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;
+import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
+import org.opendaylight.yangtools.sal.binding.model.api.Type;
+import org.opendaylight.yangtools.sal.binding.yang.types.BaseYangTypes;
+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.parser.impl.YangParserImpl;
 \r
 public class ExtendedTypedefTest {\r
 \r
     private final static List<File> testModels = new ArrayList<File>();\r
-    private final static String testFolderPath = AugmentedTypeTest.class.getResource("/typedef-of-typedef").getPath();\r
+    private final static URL testFolderPath = AugmentedTypeTest.class.getResource("/typedef-of-typedef");\r
 \r
     @BeforeClass\r
-    public static void loadTestResources() {\r
-        final File testFolder = new File(testFolderPath);\r
+    public static void loadTestResources() throws URISyntaxException {\r
+        final File testFolder = new File(testFolderPath.toURI());\r
 \r
         for (final File fileEntry : testFolder.listFiles()) {\r
             if (fileEntry.isFile()) {\r

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java
index 565c3b484933b6ce1eaac84fa31a079953b6248d..ce4983104b84295c72c2bbe20a1072d43998e31f 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenEnumResolvingTest.java
@@ -7,9 +7,13 @@
  */\r
 package org.opendaylight.yangtools.sal.binding.generator.impl;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertNotNull;\r
+import static org.junit.Assert.assertTrue;\r
 \r
 import java.io.File;\r
+import java.net.URI;\r
+import java.net.URISyntaxException;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
 import java.util.Set;\r
@@ -29,7 +33,7 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class GenEnumResolvingTest {\r
 \r
     private SchemaContext resolveSchemaContextFromFiles(\r
-            final String... yangFiles) {\r
+            final URI... yangFiles) {\r
         final YangModelParser parser = new YangParserImpl();\r
 \r
         final List<File> inputFiles = new ArrayList<File>();\r
@@ -42,13 +46,13 @@ public class GenEnumResolvingTest {
     }\r
 \r
     @Test\r
-    public void testLeafEnumResolving() {\r
-        final String ietfInterfacesPath = getClass().getResource(\r
-                "/enum-test-models/ietf-interfaces@2012-11-15.yang").getPath();\r
-        final String ifTypePath = getClass().getResource(\r
-                "/enum-test-models/iana-if-type@2012-06-05.yang").getPath();\r
-        final String yangTypesPath = getClass().getResource(\r
-                "/enum-test-models/ietf-yang-types@2010-09-24.yang").getPath();\r
+    public void testLeafEnumResolving() throws URISyntaxException {\r
+        final URI ietfInterfacesPath = getClass().getResource(\r
+                "/enum-test-models/ietf-interfaces@2012-11-15.yang").toURI();\r
+        final URI ifTypePath = getClass().getResource(\r
+                "/enum-test-models/iana-if-type@2012-06-05.yang").toURI();\r
+        final URI yangTypesPath = getClass().getResource(\r
+                "/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI();\r
 \r
         final SchemaContext context = resolveSchemaContextFromFiles(\r
                 ietfInterfacesPath, ifTypePath, yangTypesPath);\r
@@ -123,9 +127,9 @@ public class GenEnumResolvingTest {
     }\r
 \r
     @Test\r
-    public void testTypedefEnumResolving() {\r
-        final String ianaIfTypePath = getClass().getResource(\r
-                "/leafref-test-models/iana-if-type@2012-06-05.yang").getPath();\r
+    public void testTypedefEnumResolving() throws URISyntaxException {\r
+        final URI ianaIfTypePath = getClass().getResource(\r
+                "/leafref-test-models/iana-if-type@2012-06-05.yang").toURI();\r
 \r
         final SchemaContext context = resolveSchemaContextFromFiles(ianaIfTypePath);\r
         assertTrue(context != null);\r
@@ -143,19 +147,19 @@ public class GenEnumResolvingTest {
     }\r
 \r
     @Test\r
-    public void testLeafrefEnumResolving() {\r
-        final String ietfInterfacesPath = getClass().getResource(\r
-                "/enum-test-models/ietf-interfaces@2012-11-15.yang").getPath();\r
-        final String ifTypePath = getClass().getResource(\r
-                "/enum-test-models/iana-if-type@2012-06-05.yang").getPath();\r
-        final String yangTypesPath = getClass().getResource(\r
-                "/enum-test-models/ietf-yang-types@2010-09-24.yang").getPath();\r
-        final String topologyPath = getClass().getResource(\r
+    public void testLeafrefEnumResolving() throws URISyntaxException {\r
+        final URI ietfInterfacesPath = getClass().getResource(\r
+                "/enum-test-models/ietf-interfaces@2012-11-15.yang").toURI();\r
+        final URI ifTypePath = getClass().getResource(\r
+                "/enum-test-models/iana-if-type@2012-06-05.yang").toURI();\r
+        final URI yangTypesPath = getClass().getResource(\r
+                "/enum-test-models/ietf-yang-types@2010-09-24.yang").toURI();\r
+        final URI topologyPath = getClass().getResource(\r
                 "/enum-test-models/abstract-topology@2013-02-08.yang")\r
-                .getPath();\r
-        final String inetTypesPath = getClass().getResource(\r
+                .toURI();\r
+        final URI inetTypesPath = getClass().getResource(\r
                 "/enum-test-models/ietf-inet-types@2010-09-24.yang")\r
-                .getPath();\r
+                .toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(\r
                 ietfInterfacesPath, ifTypePath, yangTypesPath, topologyPath,\r
                 inetTypesPath);\r

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java
index bd6d46146c2e20a90957a6978b53ea4327d5dc69..3b8f5e9448cc39ee176494ec7908df26cf0fc7e7 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GenTypesSubSetTest.java
@@ -7,9 +7,13 @@
  */\r
 package org.opendaylight.yangtools.sal.binding.generator.impl;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertNotNull;\r
 \r
 import java.io.File;\r
+import java.net.URISyntaxException;\r
+import java.net.URL;\r
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import java.util.List;\r
@@ -27,12 +31,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class GenTypesSubSetTest {\r
 \r
     private final static List<File> yangModels = new ArrayList<>();\r
-    private final static String yangModelsFolder = AugmentedTypeTest.class\r
-            .getResource("/leafref-test-models").getPath();\r
+    private final static URL yangModelsFolder = AugmentedTypeTest.class\r
+            .getResource("/leafref-test-models");\r
 \r
     @BeforeClass\r
-    public static void loadTestResources() {\r
-        final File augFolder = new File(yangModelsFolder);\r
+    public static void loadTestResources() throws URISyntaxException {\r
+        final File augFolder = new File(yangModelsFolder.toURI());\r
 \r
         for (final File fileEntry : augFolder.listFiles()) {\r
             if (fileEntry.isFile()) {\r

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java
index f5f29eae2f4e10beb779cf0a82df474de6d52123..153ca3acdcfeb8b2c1ef5bfe4f6ccb450dfc31ae 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesBitsTest.java
@@ -7,12 +7,14 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-import java.io.File;
-import java.util.ArrayList;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
-import java.util.Set;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.generator.api.BindingGenerator;
@@ -22,30 +24,16 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;
 import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature;
 import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature.Parameter;
 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.parser.impl.YangParserImpl;
 
 public class GeneratedTypesBitsTest {
 
-    private SchemaContext resolveSchemaContextFromFiles(final String... yangFiles) {
-        final YangModelParser parser = new YangParserImpl();
-
-        final List<File> inputFiles = new ArrayList<File>();
-        for (int i = 0; i < yangFiles.length; ++i) {
-            inputFiles.add(new File(yangFiles[i]));
-        }
-
-        final Set<Module> modules = parser.parseYangModels(inputFiles);
-        return parser.resolveSchemaContext(modules);
-    }
 
     @Test
-    public void testGeneretedTypesBitsTest() {
-        final String yangTypesPath = getClass().getResource("/simple-bits-demo.yang").getPath();
+    public void testGeneretedTypesBitsTest() throws URISyntaxException {
+        final URI yangTypesPath = getClass().getResource("/simple-bits-demo.yang").toURI();
 
-        final SchemaContext context = resolveSchemaContextFromFiles(yangTypesPath);
+        final SchemaContext context = SupportTestUtil.resolveSchemaContextFromFiles(yangTypesPath);
         assertTrue(context != null);
 
         final BindingGenerator bindingGen = new BindingGeneratorImpl();

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
index dfabc90eb87126ea2498b367f164e818d0232d5b..378ccc708017f055209abf7be28cf6f9ef8a2362 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/IdentityrefTypeTest.java
@@ -11,6 +11,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -33,8 +35,8 @@ public class IdentityrefTypeTest {
     private static List<File> testModels = null;
 
     @Before
-    public void loadTestResources() {
-        String folderPath = IdentityrefTypeTest.class.getResource("/identityref.yang").getPath();
+    public void loadTestResources() throws URISyntaxException {
+        URI folderPath = IdentityrefTypeTest.class.getResource("/identityref.yang").toURI();
         File folderFile = new File(folderPath);
         testModels = new ArrayList<File>();
 

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
index bfd51620fe94e5bd475c61030394c98d8cde931d..3c94e40e41fee76a9b3b778e1d3e934210552ce4 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/RefineTest.java
@@ -12,12 +12,20 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -26,7 +34,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.parser.builder.api.DataSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.*;
+import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ConstraintsBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
+import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 import org.opendaylight.yangtools.yang.parser.util.RefineHolder;
 import org.opendaylight.yangtools.yang.parser.util.RefineUtils;
@@ -39,8 +52,8 @@ public class RefineTest {
 
     private static List<File> testModels = new ArrayList<>();
 
-    private void loadTestResources() {
-        final File listModelFile = new File(RefineTest.class.getResource("/refine.yang").getPath());
+    private void loadTestResources() throws URISyntaxException {
+        final File listModelFile = new File(RefineTest.class.getResource("/refine.yang").toURI());
         testModels.add(listModelFile);
     }
 
@@ -70,7 +83,7 @@ public class RefineTest {
     }
 
     @Test
-    public void usesInGroupingDependenciesTest() {
+    public void usesInGroupingDependenciesTest() throws URISyntaxException {
         loadTestResources();
         assertEquals("Incorrect number of test files.", 1, testModels.size());
 

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java
index db2a3ef285ff29adba0733a0b4dbea66db811434..1a767ea63b96637590337ff39f83fb922dba5e92 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/SupportTestUtil.java
@@ -10,7 +10,11 @@ package org.opendaylight.yangtools.sal.binding.generator.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedProperty;
 import org.opendaylight.yangtools.sal.binding.model.api.GeneratedTransferObject;
@@ -18,9 +22,25 @@ import org.opendaylight.yangtools.sal.binding.model.api.GeneratedType;
 import org.opendaylight.yangtools.sal.binding.model.api.MethodSignature;
 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.parser.impl.YangParserImpl;
 
 public class SupportTestUtil {
 
+    public static SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) {
+        final YangModelParser parser = new YangParserImpl();
+
+        final List<File> inputFiles = new ArrayList<File>();
+        for (int i = 0; i < yangFiles.length; ++i) {
+            inputFiles.add(new File(yangFiles[i]));
+        }
+
+        final Set<Module> modules = parser.parseYangModels(inputFiles);
+        return parser.resolveSchemaContext(modules);
+    }
+
     public static void containsMethods(final GeneratedType genType, final NameTypePattern... searchedSignsWhat) {
         final List<MethodSignature> searchedSignsIn = genType.getMethodDefinitions();
         containsMethods(searchedSignsIn, searchedSignsWhat);

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java
index f9b7fb8bbb5fb0955fd93b202e502b9c40c0c26d..8df0beee7b2417fc39c0c084ab9d1e9bcd96471e 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/TypeProviderIntegrationTest.java
@@ -10,16 +10,21 @@ package org.opendaylight.yangtools.sal.binding.generator.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Set;
 
-import org.junit.*;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 import org.opendaylight.yangtools.sal.binding.yang.types.TypeProviderImpl;
-import org.opendaylight.yangtools.yang.model.api.*;
-import org.opendaylight.yangtools.yang.model.parser.api.YangModelParser;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
 public class TypeProviderIntegrationTest {
     private final String PKG = "org.opendaylight.yang.gen.v1.urn.opendaylight.test.rev131008.";
@@ -28,11 +33,11 @@ public class TypeProviderIntegrationTest {
     private Module m;
 
     @BeforeClass
-    public static void setup() throws ParseException {
-        final String path1 = TypeProviderIntegrationTest.class.getResource("/type-provider/test.yang").getPath();
-        final String path2 = TypeProviderIntegrationTest.class.getResource(
-                "/type-provider/ietf-inet-types@2010-09-24.yang").getPath();
-        context = resolveSchemaContextFromFiles(path1, path2);
+    public static void setup() throws ParseException, URISyntaxException {
+        final URI path1 = TypeProviderIntegrationTest.class.getResource("/type-provider/test.yang").toURI();
+        final URI path2 = TypeProviderIntegrationTest.class.getResource(
+                "/type-provider/ietf-inet-types@2010-09-24.yang").toURI();
+        context = SupportTestUtil.resolveSchemaContextFromFiles(path1, path2);
         assertNotNull(context);
     }
 
@@ -291,17 +296,4 @@ public class TypeProviderIntegrationTest {
         assertEquals("ipv4Prefix", provider.getParamNameFromType(ipv4Pref));
         assertEquals("ipv6Prefix", provider.getParamNameFromType(ipv6Pref));
     }
-
-    private static SchemaContext resolveSchemaContextFromFiles(final String... yangFiles) {
-        final YangModelParser parser = new YangParserImpl();
-
-        final List<File> inputFiles = new ArrayList<File>();
-        for (int i = 0; i < yangFiles.length; ++i) {
-            inputFiles.add(new File(yangFiles[i]));
-        }
-
-        final Set<Module> modules = parser.parseYangModels(inputFiles);
-        return parser.resolveSchemaContext(modules);
-    }
-
-}
+}
\ No newline at end of file

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java
index b1ed97f1df4309186c465ad99288459e8382f170..daf8de55885ed19182b468aab6827c70f4e605b2 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UnionTypeDefTest.java
@@ -7,9 +7,12 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -25,12 +28,12 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 
 public class UnionTypeDefTest {
     private final static List<File> yangModels = new ArrayList<>();
-    private final static String yangModelsFolder = AugmentedTypeTest.class
-            .getResource("/union-test-models").getPath();
+    private final static URL yangModelsFolder = AugmentedTypeTest.class
+            .getResource("/union-test-models");
 
     @BeforeClass
-    public static void loadTestResources() {
-        final File augFolder = new File(yangModelsFolder);
+    public static void loadTestResources() throws URISyntaxException {
+        final File augFolder = new File(yangModelsFolder.toURI());
 
         for (final File fileEntry : augFolder.listFiles()) {
             if (fileEntry.isFile()) {

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java
index ca67d8054be31079da30dce771ea002834f3b9c1..42620a26a276936176107ce98e0733e5c84cd98d 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/UsesTest.java
@@ -7,10 +7,14 @@
  */
 package org.opendaylight.yangtools.sal.binding.generator.impl;
 
-import static org.junit.Assert.*;
-import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsInterface;
+import static org.opendaylight.yangtools.sal.binding.generator.impl.SupportTestUtil.containsMethods;
 
 import java.io.File;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -28,10 +32,14 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 public class UsesTest {
 
     private static List<File> loadTestResources(String testFile) {
+        try {
         final List<File> testModels = new ArrayList<File>();
-        final File listModelFile = new File(UsesTest.class.getResource(testFile).getPath());
+        final File listModelFile = new File(UsesTest.class.getResource(testFile).toURI());
         testModels.add(listModelFile);
         return testModels;
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException(e);
+        }
     }
 
     @Test