modify test to handle merge from develop

Author: andrewelamb

tests/unit/test_json_schema_functions.py

@@ -30,15 +30,22 @@
             "tests/data/expected_jsonschemas/expected.JSONSchemaComponent.schema.json",
             {
                 "Component": ColumnType.STRING,
+                "Date": ColumnType.STRING,
                 "Enum": ColumnType.STRING,
                 "EnumNotRequired": ColumnType.STRING,
+                "InRange": ColumnType.DOUBLE,
+                "List": ColumnType.STRING_LIST,
+                "ListEnum": ColumnType.STRING_LIST,
                 "ListEnumNotRequired": ColumnType.STRING_LIST,
                 "ListInRange": ColumnType.STRING_LIST,
                 "ListNotRequired": ColumnType.STRING_LIST,
                 "ListString": ColumnType.STRING_LIST,
                 "NoRules": ColumnType.STRING,
                 "NoRulesNotRequired": ColumnType.STRING,
+                "Regex": ColumnType.STRING,
+                "String": ColumnType.STRING,
                 "StringNotRequired": ColumnType.STRING,
+                "URL": ColumnType.STRING,
             },
         ),
         (