tests: Add variant type tests

ifex/model/ifex_ast_introspect.py

@@ -15,7 +15,7 @@
 """
 
 import re
-import ifex_ast
+import ifex.model.ifex_ast as ifex_ast
 from dataclasses import is_dataclass, fields
 from typing import get_args, get_origin, List, Optional, Union, Any, ForwardRef
 import typing
@@ -291,4 +291,5 @@ def _simple_process(arg):
     print(f"{is_ifex_variant_typedef(y)=}")
     print(f"The types of y are: {get_variant_types(y)}")
     print(f"The types of x are: {get_variant_types(x)}")
-    print(f"The types of variant<this, that ,and,another > are: {get_variant_types("variant<this, that ,and,another >")}")
+    s = "variant<this, that ,and,another >"
+    print(f"The types of {s} are: {get_variant_types(s)}")

tests/gen_test.py

@@ -11,6 +11,7 @@
 import yaml
 
 from ifex.model import ifex_ast, ifex_parser, ifex_generator
+import ifex.model.ifex_ast_introspect as introspect
 import dacite, pytest
 import os
 
@@ -55,6 +56,28 @@ def test_ast_gen():
     assert service.minor_version == 0
 
 
+# This does not assert anything -> but if printouts are captured they can be studied
+def test_print():
+    ast = ifex_parser.get_ast_from_yaml_file(os.path.join(TestPath, 'test.variant', 'input.yaml'))
+    print(yaml.dump(ast, sort_keys=False))
+    print(introspect.get_variant_types(ast.namespaces[0].typedefs[0]))
+
+# Test expectations and helper-functions on the variant type
+def test_variant():
+    ast = ifex_parser.get_ast_from_yaml_file(os.path.join(TestPath, 'test.variant', 'input.yaml'))
+    # Method argument
+    v0type = ast.namespaces[0].methods[0].input[0].datatype
+    assert not introspect.is_ifex_variant_typedef(v0type)
+    assert introspect.is_ifex_variant_shortform(v0type)
+
+    # Typdefs
+    v1 = ast.namespaces[0].typedefs[0]
+    v2 = ast.namespaces[0].typedefs[1]
+    assert introspect.is_ifex_variant_typedef(v1)
+    assert introspect.is_ifex_variant_typedef(v2)
+    assert introspect.is_ifex_variant_shortform(v2.datatype)
+
+
 def test_ast_manual():
     service = ifex_ast.AST(name='test', description='test', major_version=1, minor_version=0)
 

tests/test.variant/input.yaml

@@ -0,0 +1,38 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022 MBition GmbH.
+# SPDX-License-Identifier: MPL-2.0
+
+name: named_service
+description: This is it.
+major_version: 3
+minor_version: 0
+
+namespaces:
+    - name: first_nested
+      description: first namespace description
+
+      methods:
+        - name: another_method
+          description: this is yet another sample method
+          input:
+            - name: arg1
+              datatype: variant<string, uint32 >
+
+      structs:
+        - name: MyStruct
+          members:
+            - name: x
+              datatype: uint32
+            - name: y
+              datatype: string
+
+      typedefs:
+        - name: MyVariant
+          description: Test of typedefed variant
+          datatypes:
+            - MyStruct
+            - string
+            - uint32
+        - name: MyVariant2
+          description: Test 2 of typedefed variant
+          datatype: variant<uint32, MyStruct>
+

tests/test.variant/result

@@ -0,0 +1,2 @@
+NAME:named_service
+DESCRIPTION SHOULD BE HERE: <<--This is it.-->>

tests/test.variant/template

@@ -0,0 +1,2 @@
+NAME:{{item.name}}
+DESCRIPTION SHOULD BE HERE: <<--{{item.description}}-->>