Code Review / mdsal.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Adjust to yangtools-2.0.0 changes
[mdsal.git] / binding / mdsal-binding-generator-impl / src / test / java / org / opendaylight / mdsal / binding / yang / types / BaseYangTypesTest.java
diff --git a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
index 64af70e8b4b6f3e940b8bf5827f842a1102f6d31..2631d500ff119c693b99fba4512db74b10ce228d 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
+++ b/binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/yang/types/BaseYangTypesTest.java
@@ -11,11 +11,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -29,12 +26,16 @@ import org.opendaylight.yangtools.yang.model.api.type.BooleanTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EmptyTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Int16TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Int64TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Int8TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Uint16TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Uint32TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Uint64TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.type.Uint8TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition;
-import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
 
 /**
@@ -47,24 +48,22 @@ public class BaseYangTypesTest {
     private static BinaryTypeDefinition binary = null;
     private static DecimalTypeDefinition decimal64 = null;
     private static EnumTypeDefinition enumeration = null;
-    private static IntegerTypeDefinition int8 = null;
-    private static IntegerTypeDefinition int16 = null;
-    private static IntegerTypeDefinition int32 = null;
-    private static IntegerTypeDefinition int64 = null;
+    private static Int8TypeDefinition int8 = null;
+    private static Int16TypeDefinition int16 = null;
+    private static Int32TypeDefinition int32 = null;
+    private static Int64TypeDefinition int64 = null;
     private static StringTypeDefinition string = null;
-    private static UnsignedIntegerTypeDefinition uint8 = null;
-    private static UnsignedIntegerTypeDefinition uint16 = null;
-    private static UnsignedIntegerTypeDefinition uint32 = null;
-    private static UnsignedIntegerTypeDefinition uint64 = null;
+    private static Uint8TypeDefinition uint8 = null;
+    private static Uint16TypeDefinition uint16 = null;
+    private static Uint32TypeDefinition uint32 = null;
+    private static Uint64TypeDefinition uint64 = null;
     private static UnionTypeDefinition union = null;
     private static EmptyTypeDefinition empty = null;
     private static BooleanTypeDefinition bool = null;
 
     @BeforeClass
-    public static void setup() throws SourceException, ReactorException {
-        final List<InputStream> modelsToParse = Collections
-            .singletonList(BaseYangTypesTest.class.getResourceAsStream("/base-yang-types.yang"));
-        schemaContext = YangParserTestUtils.parseYangStreams(modelsToParse);
+    public static void setup() {
+        schemaContext = YangParserTestUtils.parseYangResource("/base-yang-types.yang");
         assertNotNull(schemaContext);
         initTypeDefinitionsFromSchemaContext();
     }
@@ -85,40 +84,24 @@ public class BaseYangTypesTest {
                 decimal64 = (DecimalTypeDefinition) baseType;
             } else if (baseType instanceof EnumTypeDefinition) {
                 enumeration = (EnumTypeDefinition) baseType;
-            } else if (baseType instanceof IntegerTypeDefinition) {
-                String typeName = baseType.getQName().getLocalName();
-                switch (typeName) {
-                case "int8":
-                    int8 = (IntegerTypeDefinition) baseType;
-                    break;
-                case "int16":
-                    int16 = (IntegerTypeDefinition) baseType;
-                    break;
-                case "int32":
-                    int32 = (IntegerTypeDefinition) baseType;
-                    break;
-                case "int64":
-                    int64 = (IntegerTypeDefinition) baseType;
-                    break;
-                }
+            } else if (baseType instanceof Int8TypeDefinition) {
+                int8 = (Int8TypeDefinition) baseType;
+            } else if (baseType instanceof Int16TypeDefinition) {
+                int16 = (Int16TypeDefinition) baseType;
+            } else if (baseType instanceof Int32TypeDefinition) {
+                int32 = (Int32TypeDefinition) baseType;
+            } else if (baseType instanceof Int64TypeDefinition) {
+                int64 = (Int64TypeDefinition) baseType;
             } else if (baseType instanceof StringTypeDefinition) {
                 string = (StringTypeDefinition) baseType;
-            } else if (baseType instanceof UnsignedIntegerTypeDefinition) {
-                String typeName = baseType.getQName().getLocalName();
-                switch (typeName) {
-                case "uint8":
-                    uint8 = (UnsignedIntegerTypeDefinition) baseType;
-                    break;
-                case "uint16":
-                    uint16 = (UnsignedIntegerTypeDefinition) baseType;
-                    break;
-                case "uint32":
-                    uint32 = (UnsignedIntegerTypeDefinition) baseType;
-                    break;
-                case "uint64":
-                    uint64 = (UnsignedIntegerTypeDefinition) baseType;
-                    break;
-                }
+            } else if (baseType instanceof Uint8TypeDefinition) {
+                uint8 = (Uint8TypeDefinition) baseType;
+            } else if (baseType instanceof Uint16TypeDefinition) {
+                uint16 = (Uint16TypeDefinition) baseType;
+            } else if (baseType instanceof Uint32TypeDefinition) {
+                uint32 = (Uint32TypeDefinition) baseType;
+            } else if (baseType instanceof Uint64TypeDefinition) {
+                uint64 = (Uint64TypeDefinition) baseType;
             } else if (baseType instanceof UnionTypeDefinition) {
                 union = (UnionTypeDefinition) baseType;
             } else if (baseType instanceof EmptyTypeDefinition) {
@@ -213,15 +196,18 @@ public class BaseYangTypesTest {
     public void javaTypeForRestrictedSchemaDefinitionTypeTest() {
         final TypeProvider typeProvider = BaseYangTypes.BASE_YANG_TYPES_PROVIDER;
 
-        Type javaType = typeProvider.javaTypeForSchemaDefinitionType(binary, binary, BindingGeneratorUtil.getRestrictions(binary));
+        Type javaType = typeProvider.javaTypeForSchemaDefinitionType(binary, binary,
+            BindingGeneratorUtil.getRestrictions(binary));
         assertNotNull(javaType);
         assertEquals("byte[]", javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(decimal64, decimal64, BindingGeneratorUtil.getRestrictions(decimal64));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(decimal64, decimal64,
+            BindingGeneratorUtil.getRestrictions(decimal64));
         assertNotNull(javaType);
         assertEquals(BigDecimal.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(enumeration, enumeration, BindingGeneratorUtil.getRestrictions(enumeration));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(enumeration, enumeration,
+            BindingGeneratorUtil.getRestrictions(enumeration));
         assertNotNull(javaType);
         assertEquals(Enum.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
@@ -229,47 +215,58 @@ public class BaseYangTypesTest {
         assertNotNull(javaType);
         assertEquals(Byte.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(int16, int16, BindingGeneratorUtil.getRestrictions(int16));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(int16, int16,
+            BindingGeneratorUtil.getRestrictions(int16));
         assertNotNull(javaType);
         assertEquals(Short.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(int32, int32, BindingGeneratorUtil.getRestrictions(int32));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(int32, int32,
+            BindingGeneratorUtil.getRestrictions(int32));
         assertNotNull(javaType);
         assertEquals(Integer.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(int64, int64, BindingGeneratorUtil.getRestrictions(int64));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(int64, int64,
+            BindingGeneratorUtil.getRestrictions(int64));
         assertNotNull(javaType);
         assertEquals(Long.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(string, string, BindingGeneratorUtil.getRestrictions(string));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(string, string,
+            BindingGeneratorUtil.getRestrictions(string));
         assertNotNull(javaType);
         assertEquals(String.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint8, uint8, BindingGeneratorUtil.getRestrictions(uint8));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint8, uint8,
+            BindingGeneratorUtil.getRestrictions(uint8));
         assertNotNull(javaType);
         assertEquals(Short.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint16, uint16, BindingGeneratorUtil.getRestrictions(uint16));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint16, uint16,
+            BindingGeneratorUtil.getRestrictions(uint16));
         assertNotNull(javaType);
         assertEquals(Integer.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint32, uint32, BindingGeneratorUtil.getRestrictions(uint32));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint32, uint32,
+            BindingGeneratorUtil.getRestrictions(uint32));
         assertNotNull(javaType);
         assertEquals(Long.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint64, uint64, BindingGeneratorUtil.getRestrictions(uint64));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(uint64, uint64,
+            BindingGeneratorUtil.getRestrictions(uint64));
         assertNotNull(javaType);
         assertEquals(BigInteger.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(union, union, BindingGeneratorUtil.getRestrictions(union));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(union, union,
+            BindingGeneratorUtil.getRestrictions(union));
         assertNotNull(javaType);
         assertEquals("Union", javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(empty, empty, BindingGeneratorUtil.getRestrictions(empty));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(empty, empty,
+            BindingGeneratorUtil.getRestrictions(empty));
         assertNotNull(javaType);
         assertEquals(Boolean.class.getCanonicalName(), javaType.getFullyQualifiedName());
 
-        javaType = typeProvider.javaTypeForSchemaDefinitionType(bool, bool, BindingGeneratorUtil.getRestrictions(bool));
+        javaType = typeProvider.javaTypeForSchemaDefinitionType(bool, bool,
+            BindingGeneratorUtil.getRestrictions(bool));
         assertNotNull(javaType);
         assertEquals(Boolean.class.getCanonicalName(), javaType.getFullyQualifiedName());
     }
MD-SAL: Model-Driven Service Adaptation Layer