Fixed incorrect path construction in JUnit tests.

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

diff --git a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java
index 913d0b6a2d797212e9da126ce3dcbfacd97e0e7b..d23beef44c28045995be20078a56fc01f222bd7e 100644 (file)
--- a/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java
+++ b/code-generator/binding-generator-impl/src/test/java/org/opendaylight/yangtools/sal/binding/generator/impl/GeneratedTypesTest.java
@@ -10,6 +10,8 @@ package org.opendaylight.yangtools.sal.binding.generator.impl;
 import static org.junit.Assert.*;\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
@@ -28,7 +30,7 @@ import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
 \r
 public class GeneratedTypesTest {\r
 \r
-    private SchemaContext resolveSchemaContextFromFiles(final String... yangFiles) {\r
+    private SchemaContext resolveSchemaContextFromFiles(final URI... yangFiles) {\r
         final YangModelParser parser = new YangParserImpl();\r
 \r
         final List<File> inputFiles = new ArrayList<File>();\r
@@ -41,9 +43,9 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testMultipleModulesResolving() {\r
-        final String topologyPath = getClass().getResource("/abstract-topology.yang").getPath();\r
-        final String typesPath = getClass().getResource("/ietf-inet-types@2010-09-24.yang").getPath();\r
+    public void testMultipleModulesResolving() throws URISyntaxException {\r
+        final URI topologyPath = getClass().getResource("/abstract-topology.yang").toURI();\r
+        final URI typesPath = getClass().getResource("/ietf-inet-types@2010-09-24.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(topologyPath, typesPath);\r
         assertNotNull(context);\r
 \r
@@ -55,17 +57,15 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testLeafrefResolving() {\r
-        final String topologyPath = getClass().getResource("/leafref-test-models/abstract-topology@2013-02-08.yang")\r
-                .getPath();\r
-        final String interfacesPath = getClass().getResource("/leafref-test-models/ietf-interfaces@2012-11-15.yang")\r
-                .getPath();\r
-        // final String ifTypePath = getClass().getResource(\r
-        // "/leafref-test-models/iana-if-type@2012-06-05.yang").getPath();\r
-        final String inetTypesPath = getClass().getResource("/leafref-test-models/ietf-inet-types@2010-09-24.yang")\r
-                .getPath();\r
-        final String yangTypesPath = getClass().getResource("/leafref-test-models/ietf-yang-types@2010-09-24.yang")\r
-                .getPath();\r
+    public void testLeafrefResolving() throws URISyntaxException {\r
+        final URI topologyPath = getClass().getResource("/leafref-test-models/abstract-topology@2013-02-08.yang")\r
+                .toURI();\r
+        final URI interfacesPath = getClass().getResource("/leafref-test-models/ietf-interfaces@2012-11-15.yang")\r
+                .toURI();\r
+        final URI inetTypesPath = getClass().getResource("/leafref-test-models/ietf-inet-types@2010-09-24.yang")\r
+                .toURI();\r
+        final URI yangTypesPath = getClass().getResource("/leafref-test-models/ietf-yang-types@2010-09-24.yang")\r
+                .toURI();\r
 \r
         assertNotNull(topologyPath);\r
         assertNotNull(interfacesPath);\r
@@ -253,8 +253,8 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testContainerResolving() {\r
-        final String filePath = getClass().getResource("/simple-container-demo.yang").getPath();\r
+    public void testContainerResolving() throws URISyntaxException {\r
+        final URI filePath = getClass().getResource("/simple-container-demo.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(filePath);\r
         assert (context != null);\r
 \r
@@ -338,8 +338,8 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testLeafListResolving() {\r
-        final String filePath = getClass().getResource("/simple-leaf-list-demo.yang").getPath();\r
+    public void testLeafListResolving() throws URISyntaxException {\r
+        final URI filePath = getClass().getResource("/simple-leaf-list-demo.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(filePath);\r
         assertNotNull(context);\r
 \r
@@ -422,8 +422,8 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testListResolving() {\r
-        final String filePath = getClass().getResource("/simple-list-demo.yang").getPath();\r
+    public void testListResolving() throws URISyntaxException {\r
+        final URI filePath = getClass().getResource("/simple-list-demo.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(filePath);\r
         assertNotNull(context);\r
 \r
@@ -545,8 +545,8 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testListCompositeKeyResolving() {\r
-        final String filePath = getClass().getResource("/list-composite-key.yang").getPath();\r
+    public void testListCompositeKeyResolving() throws URISyntaxException {\r
+        final URI filePath = getClass().getResource("/list-composite-key.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(filePath);\r
 \r
         assertNotNull(context);\r
@@ -598,8 +598,8 @@ public class GeneratedTypesTest {
     }\r
 \r
     @Test\r
-    public void testGeneratedTypes() {\r
-        final String filePath = getClass().getResource("/demo-topology.yang").getPath();\r
+    public void testGeneratedTypes() throws URISyntaxException {\r
+        final URI filePath = getClass().getResource("/demo-topology.yang").toURI();\r
         final SchemaContext context = resolveSchemaContextFromFiles(filePath);\r
         assertNotNull(context);\r
 \r