[dataformat] fix complex types & add test

beat/core/schema/dataformat/1.json

@@ -46,6 +46,7 @@
         { "type": "integer" },
         {
           "oneOf": [
+            { "$ref": "#/definitions/complextype" },
             { "$ref": "../common/1.json#/definitions/basetype" },
             { "$ref": "../common/1.json#/definitions/reference" },
             { "$ref": "#" }
@@ -64,6 +65,7 @@
         { "type": "integer" },
         {
           "oneOf": [
+            { "$ref": "#/definitions/complextype" },
             { "$ref": "../common/1.json#/definitions/basetype" },
             { "$ref": "../common/1.json#/definitions/reference" },
             { "$ref": "#" }
@@ -83,6 +85,7 @@
         { "type": "integer" },
         {
           "oneOf": [
+            { "$ref": "#/definitions/complextype" },
             { "$ref": "../common/1.json#/definitions/basetype" },
             { "$ref": "../common/1.json#/definitions/reference" },
             { "$ref": "#" }
@@ -103,6 +106,7 @@
         { "type": "integer" },
         {
           "oneOf": [
+            { "$ref": "#/definitions/complextype" },
             { "$ref": "../common/1.json#/definitions/basetype" },
             { "$ref": "../common/1.json#/definitions/reference" },
             { "$ref": "#" }
@@ -124,6 +128,7 @@
         { "type": "integer" },
         {
           "oneOf": [
+            { "$ref": "#/definitions/complextype" },
             { "$ref": "../common/1.json#/definitions/basetype" },
             { "$ref": "../common/1.json#/definitions/reference" },
             { "$ref": "#" }

beat/core/test/prefix/dataformats/user/complex/1.json

+{
+        "#description": "A dataformat with complex types",
+        "param_complex_64": "complex64",
+        "param_complex_128": "complex128",
+        "complex_array": [
+                0,
+                0,
+                "complex64"
+        ]
+}

beat/core/test/test_format_load.py

@@ -167,6 +167,12 @@ def test_load_indirect_recursion():
     )
 
 
+def test_load_complex():
+    """tests that the system accepts complex types in dataformats"""
+    df = DataFormat(prefix, "user/complex/1")
+    nose.tools.assert_true(df.valid, "\n  * %s" % "\n  * ".join(df.errors))
+
+
 @nose.tools.with_setup(teardown=cleanup)
 def test_export():