Sync with 5.2.0

[deliverable/titan.core.git] / regression_test / ttcn2json / one_e.json

diff --git a/regression_test/ttcn2json/one_e.json b/regression_test/ttcn2json/one_e.json
index f8827455e1748ec6e5ddf77e57ecd2d14bef5847..da16123a449949c148de06385b1bb5edbba86548 100644 (file)
--- a/regression_test/ttcn2json/one_e.json
+++ b/regression_test/ttcn2json/one_e.json
@@ -27,6 +27,11 @@
                                        "Short",
                                        "Medium",
                                        "Tall"
+                               ],
+                               "numericValues" : [
+                                       0,
+                                       1,
+                                       2
                                ]
                        },
                        "Rec" : {
@@ -59,6 +64,7 @@
                                "properties" : {
                                        "os" : {
                                                "type" : "string",
+                                               "subType" : "octetstring",
                                                "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
                                        },
                                        "buul" : {
@@ -147,6 +153,7 @@
                                                "properties" : {
                                                        "bytes" : {
                                                                "type" : "string",
+                                                               "subType" : "octetstring",
                                                                "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
                                                        }
                                                },
@@ -162,6 +169,11 @@
                                        "Thin",
                                        "Medium",
                                        "Wide"
+                               ],
+                               "numericValues" : [
+                                       0,
+                                       1,
+                                       2
                                ]
                        },
                        "anytype" : {
@@ -195,6 +207,7 @@
                                                "properties" : {
                                                        "bitstring" : {
                                                                "type" : "string",
+                                                               "subType" : "bitstring",
                                                                "pattern" : "^[01]*$"
                                                        }
                                                },
@@ -212,6 +225,7 @@
                                "subType" : "record of",
                                "items" : {
                                        "type" : "string",
+                                       "subType" : "bitstring",
                                        "pattern" : "^[01]*$"
                                }
                        },
@@ -239,6 +253,7 @@
                                "subType" : "record of",
                                "items" : {
                                        "type" : "string",
+                                       "subType" : "hexstring",
                                        "pattern" : "^[0-9A-Fa-f]*$"
                                }
                        },
@@ -261,6 +276,7 @@
                                "subType" : "set of",
                                "items" : {
                                        "type" : "string",
+                                       "subType" : "octetstring",
                                        "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
                                }
                        },
@@ -322,6 +338,11 @@
                                                                        "Small",
                                                                        "Medium",
                                                                        "Large"
+                                                               ],
+                                                               "numericValues" : [
+                                                                       0,
+                                                                       1,
+                                                                       2
                                                                ]
                                                        },
                                                        "filled" : {
@@ -429,6 +450,109 @@
                        }
                },
                "Zero" : {
+                       "SeqOfInt" : {
+                               "type" : "array",
+                               "subType" : "record of",
+                               "items" : {
+                                       "type" : "integer"
+                               }
+                       },
+                       "SeqProduct" : {
+                               "type" : "object",
+                               "subType" : "record",
+                               "properties" : {
+                                       "name" : {
+                                               "type" : "string",
+                                               "subType" : "universal charstring"
+                                       },
+                                       "price" : {
+                                               "anyOf" : [
+                                                       {
+                                                               "type" : "number"
+                                                       },
+                                                       {
+                                                               "enum" : [
+                                                                       "not_a_number",
+                                                                       "infinity",
+                                                                       "-infinity"
+                                                               ]
+                                                       }
+                                               ]
+                                       },
+                                       "id" : {
+                                               "anyOf" : [
+                                                       {
+                                                               "type" : "null"
+                                                       },
+                                                       {
+                                                               "type" : "string",
+                                                               "subType" : "octetstring",
+                                                               "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
+                                                       }
+                                               ],
+                                               "omitAsNull" : false
+                                       },
+                                       "available" : {
+                                               "type" : "boolean"
+                                       }
+                               },
+                               "additionalProperties" : false,
+                               "fieldOrder" : [
+                                       "name",
+                                       "price",
+                                       "id",
+                                       "available"
+                               ],
+                               "required" : [
+                                       "name",
+                                       "price",
+                                       "available"
+                               ]
+                       },
+                       "Number" : {
+                               "anyOf" : [
+                                       {
+                                               "type" : "object",
+                                               "properties" : {
+                                                       "decimal" : {
+                                                               "type" : "integer"
+                                                       }
+                                               },
+                                               "additionalProperties" : false,
+                                               "required" : [
+                                                       "decimal"
+                                               ]
+                                       },
+                                       {
+                                               "type" : "object",
+                                               "properties" : {
+                                                       "binary" : {
+                                                               "type" : "string",
+                                                               "subType" : "bitstring",
+                                                               "pattern" : "^[01]*$"
+                                                       }
+                                               },
+                                               "additionalProperties" : false,
+                                               "required" : [
+                                                       "binary"
+                                               ]
+                                       },
+                                       {
+                                               "type" : "object",
+                                               "properties" : {
+                                                       "hexadecimal" : {
+                                                               "type" : "string",
+                                                               "subType" : "octetstring",
+                                                               "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
+                                                       }
+                                               },
+                                               "additionalProperties" : false,
+                                               "required" : [
+                                                       "hexadecimal"
+                                               ]
+                                       }
+                               ]
+                       },
                        "AnyString" : {
                                "anyOf" : [
                                        {
@@ -576,37 +700,12 @@
                                        }
                                ]
                        },
-                       "Big_Choice" : {
-                               "anyOf" : [
-                                       {
-                                               "type" : "object",
-                                               "properties" : {
-                                                       "numbers" : {
-                                                               "type" : "array",
-                                                               "subType" : "set of",
-                                                               "items" : {
-                                                                       "$ref" : "#/definitions/Zero/Number"
-                                                               }
-                                                       }
-                                               },
-                                               "additionalProperties" : false,
-                                               "required" : [
-                                                       "numbers"
-                                               ]
-                                       },
-                                       {
-                                               "type" : "object",
-                                               "properties" : {
-                                                       "strings" : {
-                                                               "$ref" : "#/definitions/Zero/ManyStrings"
-                                                       }
-                                               },
-                                               "additionalProperties" : false,
-                                               "required" : [
-                                                       "strings"
-                                               ]
-                                       }
-                               ]
+                       "ManyStrings" : {
+                               "type" : "array",
+                               "subType" : "record of",
+                               "items" : {
+                                       "$ref" : "#/definitions/Zero/AnyString"
+                               }
                        },
                        "Big_Set" : {
                                "type" : "object",
@@ -631,6 +730,12 @@
                                                        "blue",
                                                        "green",
                                                        "yellow"
+                                               ],
+                                               "numericValues" : [
+                                                       0,
+                                                       1,
+                                                       2,
+                                                       3
                                                ]
                                        }
                                },
@@ -648,55 +753,52 @@
                                        "color"
                                ]
                        },
-                       "ManyStrings" : {
-                               "type" : "array",
-                               "subType" : "record of",
-                               "items" : {
-                                       "$ref" : "#/definitions/Zero/AnyString"
-                               }
-                       },
-                       "Number" : {
+                       "Big_Choice" : {
                                "anyOf" : [
                                        {
                                                "type" : "object",
                                                "properties" : {
-                                                       "decimal" : {
-                                                               "type" : "integer"
-                                                       }
-                                               },
-                                               "additionalProperties" : false,
-                                               "required" : [
-                                                       "decimal"
-                                               ]
-                                       },
-                                       {
-                                               "type" : "object",
-                                               "properties" : {
-                                                       "binary" : {
-                                                               "type" : "string",
-                                                               "pattern" : "^[01]*$"
+                                                       "numbers" : {
+                                                               "type" : "array",
+                                                               "subType" : "set of",
+                                                               "items" : {
+                                                                       "$ref" : "#/definitions/Zero/Number"
+                                                               }
                                                        }
                                                },
                                                "additionalProperties" : false,
                                                "required" : [
-                                                       "binary"
+                                                       "numbers"
                                                ]
                                        },
                                        {
                                                "type" : "object",
                                                "properties" : {
-                                                       "hexadecimal" : {
-                                                               "type" : "string",
-                                                               "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
+                                                       "strings" : {
+                                                               "$ref" : "#/definitions/Zero/ManyStrings"
                                                        }
                                                },
                                                "additionalProperties" : false,
                                                "required" : [
-                                                       "hexadecimal"
+                                                       "strings"
                                                ]
                                        }
                                ]
                        },
+                       "Season" : {
+                               "enum" : [
+                                       "spring",
+                                       "summer",
+                                       "fall",
+                                       "winter"
+                               ],
+                               "numericValues" : [
+                                       1,
+                                       2,
+                                       3,
+                                       4
+                               ]
+                       },
                        "SelectionType" : {
                                "type" : "array",
                                "subType" : "set of",
@@ -704,63 +806,18 @@
                                        "$ref" : "#/definitions/Zero/Number"
                                }
                        },
-                       "SeqOfInt" : {
-                               "type" : "array",
-                               "subType" : "record of",
-                               "items" : {
-                                       "type" : "integer"
-                               }
+                       "NullType" : {
+                               "type" : "null"
                        },
-                       "SeqProduct" : {
-                               "type" : "object",
-                               "subType" : "record",
-                               "properties" : {
-                                       "name" : {
-                                               "type" : "string",
-                                               "subType" : "universal charstring"
-                                       },
-                                       "price" : {
-                                               "anyOf" : [
-                                                       {
-                                                               "type" : "number"
-                                                       },
-                                                       {
-                                                               "enum" : [
-                                                                       "not_a_number",
-                                                                       "infinity",
-                                                                       "-infinity"
-                                                               ]
-                                                       }
-                                               ]
-                                       },
-                                       "id" : {
-                                               "anyOf" : [
-                                                       {
-                                                               "type" : "null"
-                                                       },
-                                                       {
-                                                               "type" : "string",
-                                                               "pattern" : "^([0-9A-Fa-f][0-9A-Fa-f])*$"
-                                                       }
-                                               ],
-                                               "omitAsNull" : false
-                                       },
-                                       "available" : {
-                                               "type" : "boolean"
-                                       }
-                               },
-                               "additionalProperties" : false,
-                               "fieldOrder" : [
-                                       "name",
-                                       "price",
-                                       "id",
-                                       "available"
-                               ],
-                               "required" : [
-                                       "name",
-                                       "price",
-                                       "available"
-                               ]
+                       "ObjIdType" : {
+                               "type" : "string",
+                               "subType" : "objid",
+                               "pattern" : "^[0-2][.][1-3]?[0-9]([.][0-9]|([1-9][0-9]+))*$"
+                       },
+                       "RelObjIdType" : {
+                               "type" : "string",
+                               "subType" : "objid",
+                               "pattern" : "^[0-2][.][1-3]?[0-9]([.][0-9]|([1-9][0-9]+))*$"
                        }
                }
        },