Adjust to yangtools-2.0.0 changes

[mdsal.git] / binding / mdsal-binding-generator-impl / src / test / java / org / opendaylight / mdsal / binding / generator / impl / UnionTypeDefTest.java

diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
index 300b2a23963e1081e774f72a51b7552949025cac..a12c1bdafda9f3f991e90b3236d11187f973c99f 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/UnionTypeDefTest.java
@@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.File;
 import java.util.List;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.generator.api.BindingGenerator;
@@ -25,10 +24,9 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 public class UnionTypeDefTest {
 
     @Test
-    public void unionTypeResolvingTest() throws Exception {
-        final File abstractTopology = new File(getClass().getResource("/union-test-models/abstract-topology.yang").toURI());
-        final File ietfInetTypes = new File(getClass().getResource("/ietf/ietf-inet-types.yang").toURI());
-        final SchemaContext context = YangParserTestUtils.parseYangSources(abstractTopology, ietfInetTypes);
+    public void unionTypeResolvingTest() {
+        final SchemaContext context = YangParserTestUtils.parseYangResources(UnionTypeDefTest.class,
+            "/union-test-models/abstract-topology.yang", "/ietf/ietf-inet-types.yang");
 
         assertNotNull("context is null", context);
         final BindingGenerator bindingGen = new BindingGeneratorImpl(true);
@@ -41,15 +39,15 @@ public class UnionTypeDefTest {
     }
 
     @Test
-    public void unionTypedefLeafrefTest() throws Exception {
-        final File yang = new File(getClass().getResource("/leafref_typedef_union/bug8449.yang").toURI());
-        final SchemaContext schemaContext = YangParserTestUtils.parseYangSources(yang);
+    public void unionTypedefLeafrefTest() {
+        final SchemaContext schemaContext = YangParserTestUtils.parseYangResource(
+            "/leafref_typedef_union/bug8449.yang");
         assertNotNull(schemaContext);
         final List<Type> generateTypes = new BindingGeneratorImpl(false).generateTypes(schemaContext);
         assertNotNull(generateTypes);
         for (final Type type : generateTypes) {
             if (type.getName().equals("Cont")) {
-                final GeneratedType gt = ((GeneratedType) type);
+                final GeneratedType gt = (GeneratedType) type;
                 assertNotNull(gt);
                 final GeneratedType refType = gt.getEnclosedTypes().iterator().next();
                 for (final GeneratedProperty generatedProperty : refType.getProperties()) {