From 16f848886b5987978791fdd22411d42d586dc45a Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@cadoles.com>
Date: Wed, 6 Mar 2019 21:04:08 +0100
Subject: [PATCH] change type name (for tiramisu 3.0rc3)

---
 test/data/filename1.info                          | 2 +-
 test/data/filename1.json                          | 2 +-
 test/data/hostname1.info                          | 2 +-
 test/data/hostname1.json                          | 2 +-
 test/data/ip1.info                                | 2 +-
 test/data/ip1.json                                | 2 +-
 test/data/ip1_frozen.info                         | 2 +-
 test/data/ip1_frozen.json                         | 2 +-
 test/data/mail1.info                              | 2 +-
 test/data/mail1.json                              | 2 +-
 test/data/number1.json                            | 2 +-
 test/data/number1_frozen.json                     | 2 +-
 test/data/number1_mod_value.json                  | 2 +-
 test/data/number1_value.json                      | 2 +-
 test/data/subconfig_filename1.info                | 2 +-
 test/data/subconfig_filename1.json                | 2 +-
 test/data/subconfig_hostname1.info                | 2 +-
 test/data/subconfig_hostname1.json                | 2 +-
 test/data/subconfig_ip1.info                      | 2 +-
 test/data/subconfig_ip1.json                      | 2 +-
 test/data/subconfig_ip1_frozen.info               | 2 +-
 test/data/subconfig_ip1_frozen.json               | 2 +-
 test/data/subconfig_mail1.info                    | 2 +-
 test/data/subconfig_mail1.json                    | 2 +-
 test/data/subconfig_number1.json                  | 2 +-
 test/data/subconfig_number1_frozen.json           | 2 +-
 test/data/subconfig_number1_mod_value.json        | 2 +-
 test/data/subconfig_number1_value.json            | 2 +-
 test/data/subconfig_unicode1_multi_mandatory.prop | 2 +-
 test/data/subconfig_username1.json                | 2 +-
 test/data/subconfig_username1_frozen.json         | 2 +-
 test/data/unicode1_multi_mandatory.prop           | 2 +-
 test/data/username1.json                          | 2 +-
 test/data/username1_frozen.json                   | 2 +-
 34 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/test/data/filename1.info b/test/data/filename1.info
index 69c4883..f39b95c 100644
--- a/test/data/filename1.info
+++ b/test/data/filename1.info
@@ -1 +1 @@
-{"usbpath": {"doc": "Chemin d'acc\u00e8s", "name": "usbpath", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "file name"}}
\ No newline at end of file
+{"usbpath": {"doc": "Chemin d'acc\u00e8s", "name": "usbpath", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "filename"}}
\ No newline at end of file
diff --git a/test/data/filename1.json b/test/data/filename1.json
index d620156..197f1e6 100644
--- a/test/data/filename1.json
+++ b/test/data/filename1.json
@@ -1 +1 @@
-{"schema": {"usbpath": {"name": "usbpath", "type": "file name", "title": "Chemin d'acc\u00e8s"}}, "model": [{"key": "usbpath", "required": true}], "form": [{"key": "usbpath", "pattern": "^[a-zA-Z0-9\\-\\._~/+]+$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"usbpath": {"name": "usbpath", "type": "filename", "title": "Chemin d'acc\u00e8s"}}, "model": [{"key": "usbpath", "required": true}], "form": [{"key": "usbpath", "pattern": "^[a-zA-Z0-9\\-\\._~/+]+$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/hostname1.info b/test/data/hostname1.info
index 33507c5..401bf27 100644
--- a/test/data/hostname1.info
+++ b/test/data/hostname1.info
@@ -1 +1 @@
-{"options.hostname1": {"doc": "Domainname Description", "name": "hostname1", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "options.hostname2": {"doc": "Domainname without dot Description", "name": "hostname2", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "options.hostname3": {"doc": "Hostname or IP Description", "name": "hostname3", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "options.hostname4": {"doc": "Netbios Description", "name": "hostname4", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}}
\ No newline at end of file
+{"options.hostname1": {"doc": "Domainname Description", "name": "hostname1", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "options.hostname2": {"doc": "Domainname without dot Description", "name": "hostname2", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "options.hostname3": {"doc": "Hostname or IP Description", "name": "hostname3", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "options.hostname4": {"doc": "Netbios Description", "name": "hostname4", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}}
\ No newline at end of file
diff --git a/test/data/hostname1.json b/test/data/hostname1.json
index 2001363..fd84021 100644
--- a/test/data/hostname1.json
+++ b/test/data/hostname1.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.hostname1": {"name": "options.hostname1", "type": "domain name", "title": "Domainname Description"}, "options.hostname2": {"name": "options.hostname2", "type": "domain name", "title": "Domainname without dot Description"}, "options.hostname3": {"name": "options.hostname3", "type": "domain name", "title": "Hostname or IP Description"}, "options.hostname4": {"name": "options.hostname4", "type": "domain name", "title": "Netbios Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.hostname1": {"name": "options.hostname1", "type": "domainname", "title": "Domainname Description"}, "options.hostname2": {"name": "options.hostname2", "type": "domainname", "title": "Domainname without dot Description"}, "options.hostname3": {"name": "options.hostname3", "type": "domainname", "title": "Hostname or IP Description"}, "options.hostname4": {"name": "options.hostname4", "type": "domainname", "title": "Netbios Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.hostname1", "pattern": "^((?!-)[a-z0-9-]{1,63}\\.){1,}[a-z0-9-]{1,63}$", "type": "input"}, {"key": "options.hostname2", "pattern": "^((?!-)[a-z0-9-]{0,63}\\.){0,}[a-z0-9-]{1,63}$", "type": "input"}, {"key": "options.hostname3", "pattern": "^(?:((?!-)[a-z0-9-]{1,63})|(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))$", "type": "input"}, {"key": "options.hostname4", "pattern": "^((?!-)[a-z0-9-]{1,15})$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/ip1.info b/test/data/ip1.info
index af5de31..274e81f 100644
--- a/test/data/ip1.info
+++ b/test/data/ip1.info
@@ -1 +1 @@
-{"options.ip": {"doc": "IP Description", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "IP"}}
\ No newline at end of file
+{"options.ip": {"doc": "IP Description", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "ip"}}
\ No newline at end of file
diff --git a/test/data/ip1.json b/test/data/ip1.json
index dbdb078..4141cda 100644
--- a/test/data/ip1.json
+++ b/test/data/ip1.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.ip": {"name": "options.ip", "type": "IP", "title": "IP Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.ip": {"name": "options.ip", "type": "ip", "title": "IP Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/ip1_frozen.info b/test/data/ip1_frozen.info
index c5d4753..171d642 100644
--- a/test/data/ip1_frozen.info
+++ b/test/data/ip1_frozen.info
@@ -1 +1 @@
-{"options.ip": {"doc": "IP Description frozen", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "IP"}}
\ No newline at end of file
+{"options.ip": {"doc": "IP Description frozen", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "ip"}}
\ No newline at end of file
diff --git a/test/data/ip1_frozen.json b/test/data/ip1_frozen.json
index b0c4f3a..49c3288 100644
--- a/test/data/ip1_frozen.json
+++ b/test/data/ip1_frozen.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.ip": {"name": "options.ip", "type": "IP", "title": "IP Description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.ip", "readOnly": true}], "form": [{"key": "options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.ip": {"name": "options.ip", "type": "ip", "title": "IP Description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.ip", "readOnly": true}], "form": [{"key": "options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/mail1.info b/test/data/mail1.info
index 8f76fbc..2f2ee80 100644
--- a/test/data/mail1.info
+++ b/test/data/mail1.info
@@ -1 +1 @@
-{"options.mail": {"doc": "Mail Description", "name": "mail", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "email address"}}
\ No newline at end of file
+{"options.mail": {"doc": "Mail Description", "name": "mail", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "email"}}
\ No newline at end of file
diff --git a/test/data/mail1.json b/test/data/mail1.json
index c1a7c56..ae261fc 100644
--- a/test/data/mail1.json
+++ b/test/data/mail1.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.mail": {"name": "options.mail", "type": "email address", "title": "Mail Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.mail", "pattern": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.mail": {"name": "options.mail", "type": "email", "title": "Mail Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.mail", "pattern": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/number1.json b/test/data/number1.json
index d07ae6a..bfa75a8 100644
--- a/test/data/number1.json
+++ b/test/data/number1.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.integer", "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/number1_frozen.json b/test/data/number1_frozen.json
index e431147..27e7f54 100644
--- a/test/data/number1_frozen.json
+++ b/test/data/number1_frozen.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "title": "integer 1 frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "readOnly": true}], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "title": "integer 1 frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "readOnly": true}], "form": [{"key": "options.integer", "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/number1_mod_value.json b/test/data/number1_mod_value.json
index 00cef0f..4b74a4a 100644
--- a/test/data/number1_mod_value.json
+++ b/test/data/number1_mod_value.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "value": 3, "owner": "user"}], "form": [{"key": "options.integer", "clearable": true}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "value": 3, "owner": "user"}], "form": [{"key": "options.integer", "clearable": true, "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/number1_value.json b/test/data/number1_value.json
index bf10c17..8e8d153 100644
--- a/test/data/number1_value.json
+++ b/test/data/number1_value.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "value": 0, "owner": "default"}], "form": [{"key": "options.integer", "clearable": true}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.integer": {"name": "options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.integer", "value": 0, "owner": "default"}], "form": [{"key": "options.integer", "clearable": true, "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_filename1.info b/test/data/subconfig_filename1.info
index 8088397..126addd 100644
--- a/test/data/subconfig_filename1.info
+++ b/test/data/subconfig_filename1.info
@@ -1 +1 @@
-{"filename1.usbpath": {"doc": "Chemin d'acc\u00e8s", "name": "usbpath", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "file name"}}
\ No newline at end of file
+{"filename1.usbpath": {"doc": "Chemin d'acc\u00e8s", "name": "usbpath", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "filename"}}
\ No newline at end of file
diff --git a/test/data/subconfig_filename1.json b/test/data/subconfig_filename1.json
index 3fd88a4..04221e5 100644
--- a/test/data/subconfig_filename1.json
+++ b/test/data/subconfig_filename1.json
@@ -1 +1 @@
-{"schema": {"filename1.usbpath": {"name": "filename1.usbpath", "type": "file name", "title": "Chemin d'acc\u00e8s"}}, "model": [{"key": "filename1.usbpath", "required": true}], "form": [{"key": "filename1.usbpath", "pattern": "^[a-zA-Z0-9\\-\\._~/+]+$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"filename1.usbpath": {"name": "filename1.usbpath", "type": "filename", "title": "Chemin d'acc\u00e8s"}}, "model": [{"key": "filename1.usbpath", "required": true}], "form": [{"key": "filename1.usbpath", "pattern": "^[a-zA-Z0-9\\-\\._~/+]+$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_hostname1.info b/test/data/subconfig_hostname1.info
index 3e012c0..2d55b9f 100644
--- a/test/data/subconfig_hostname1.info
+++ b/test/data/subconfig_hostname1.info
@@ -1 +1 @@
-{"hostname1.options.hostname1": {"doc": "Domainname Description", "name": "hostname1", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "hostname1.options.hostname2": {"doc": "Domainname without dot Description", "name": "hostname2", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "hostname1.options.hostname3": {"doc": "Hostname or IP Description", "name": "hostname3", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}, "hostname1.options.hostname4": {"doc": "Netbios Description", "name": "hostname4", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domain name"}}
\ No newline at end of file
+{"hostname1.options.hostname1": {"doc": "Domainname Description", "name": "hostname1", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "hostname1.options.hostname2": {"doc": "Domainname without dot Description", "name": "hostname2", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "hostname1.options.hostname3": {"doc": "Hostname or IP Description", "name": "hostname3", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}, "hostname1.options.hostname4": {"doc": "Netbios Description", "name": "hostname4", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "domainname"}}
\ No newline at end of file
diff --git a/test/data/subconfig_hostname1.json b/test/data/subconfig_hostname1.json
index 1e11b49..90916ec 100644
--- a/test/data/subconfig_hostname1.json
+++ b/test/data/subconfig_hostname1.json
@@ -1 +1 @@
-{"schema": {"hostname1.options": {"name": "hostname1.options", "properties": {"hostname1.options.hostname1": {"name": "hostname1.options.hostname1", "type": "domain name", "title": "Domainname Description"}, "hostname1.options.hostname2": {"name": "hostname1.options.hostname2", "type": "domain name", "title": "Domainname without dot Description"}, "hostname1.options.hostname3": {"name": "hostname1.options.hostname3", "type": "domain name", "title": "Hostname or IP Description"}, "hostname1.options.hostname4": {"name": "hostname1.options.hostname4", "type": "domain name", "title": "Netbios Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"hostname1.options": {"name": "hostname1.options", "properties": {"hostname1.options.hostname1": {"name": "hostname1.options.hostname1", "type": "domainname", "title": "Domainname Description"}, "hostname1.options.hostname2": {"name": "hostname1.options.hostname2", "type": "domainname", "title": "Domainname without dot Description"}, "hostname1.options.hostname3": {"name": "hostname1.options.hostname3", "type": "domainname", "title": "Hostname or IP Description"}, "hostname1.options.hostname4": {"name": "hostname1.options.hostname4", "type": "domainname", "title": "Netbios Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "hostname1.options.hostname1", "pattern": "^((?!-)[a-z0-9-]{1,63}\\.){1,}[a-z0-9-]{1,63}$", "type": "input"}, {"key": "hostname1.options.hostname2", "pattern": "^((?!-)[a-z0-9-]{0,63}\\.){0,}[a-z0-9-]{1,63}$", "type": "input"}, {"key": "hostname1.options.hostname3", "pattern": "^(?:((?!-)[a-z0-9-]{1,63})|(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))$", "type": "input"}, {"key": "hostname1.options.hostname4", "pattern": "^((?!-)[a-z0-9-]{1,15})$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_ip1.info b/test/data/subconfig_ip1.info
index 3555767..2a53fd7 100644
--- a/test/data/subconfig_ip1.info
+++ b/test/data/subconfig_ip1.info
@@ -1 +1 @@
-{"ip1.options.ip": {"doc": "IP Description", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "IP"}}
\ No newline at end of file
+{"ip1.options.ip": {"doc": "IP Description", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "ip"}}
\ No newline at end of file
diff --git a/test/data/subconfig_ip1.json b/test/data/subconfig_ip1.json
index f0efbdc..4b21604 100644
--- a/test/data/subconfig_ip1.json
+++ b/test/data/subconfig_ip1.json
@@ -1 +1 @@
-{"schema": {"ip1.options": {"name": "ip1.options", "properties": {"ip1.options.ip": {"name": "ip1.options.ip", "type": "IP", "title": "IP Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "ip1.options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"ip1.options": {"name": "ip1.options", "properties": {"ip1.options.ip": {"name": "ip1.options.ip", "type": "ip", "title": "IP Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "ip1.options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_ip1_frozen.info b/test/data/subconfig_ip1_frozen.info
index 4891689..d3ff4c4 100644
--- a/test/data/subconfig_ip1_frozen.info
+++ b/test/data/subconfig_ip1_frozen.info
@@ -1 +1 @@
-{"ip1_frozen.options.ip": {"doc": "IP Description frozen", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "IP"}}
\ No newline at end of file
+{"ip1_frozen.options.ip": {"doc": "IP Description frozen", "name": "ip", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "ip"}}
\ No newline at end of file
diff --git a/test/data/subconfig_ip1_frozen.json b/test/data/subconfig_ip1_frozen.json
index a88c33b..5b65a62 100644
--- a/test/data/subconfig_ip1_frozen.json
+++ b/test/data/subconfig_ip1_frozen.json
@@ -1 +1 @@
-{"schema": {"ip1_frozen.options": {"name": "ip1_frozen.options", "properties": {"ip1_frozen.options.ip": {"name": "ip1_frozen.options.ip", "type": "IP", "title": "IP Description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "ip1_frozen.options.ip", "readOnly": true}], "form": [{"key": "ip1_frozen.options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"ip1_frozen.options": {"name": "ip1_frozen.options", "properties": {"ip1_frozen.options.ip": {"name": "ip1_frozen.options.ip", "type": "ip", "title": "IP Description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "ip1_frozen.options.ip", "readOnly": true}], "form": [{"key": "ip1_frozen.options.ip", "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_mail1.info b/test/data/subconfig_mail1.info
index d9762db..a6e198e 100644
--- a/test/data/subconfig_mail1.info
+++ b/test/data/subconfig_mail1.info
@@ -1 +1 @@
-{"mail1.options.mail": {"doc": "Mail Description", "name": "mail", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "email address"}}
\ No newline at end of file
+{"mail1.options.mail": {"doc": "Mail Description", "name": "mail", "isoptiondescription": false, "isleader": false, "isfollower": false, "issymlinkoption": false, "ismulti": false, "type": "email"}}
\ No newline at end of file
diff --git a/test/data/subconfig_mail1.json b/test/data/subconfig_mail1.json
index 88a6ec7..90f62ea 100644
--- a/test/data/subconfig_mail1.json
+++ b/test/data/subconfig_mail1.json
@@ -1 +1 @@
-{"schema": {"mail1.options": {"name": "mail1.options", "properties": {"mail1.options.mail": {"name": "mail1.options.mail", "type": "email address", "title": "Mail Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "mail1.options.mail", "pattern": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"mail1.options": {"name": "mail1.options", "properties": {"mail1.options.mail": {"name": "mail1.options.mail", "type": "email", "title": "Mail Description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "mail1.options.mail", "pattern": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_number1.json b/test/data/subconfig_number1.json
index af86a65..b5b95e6 100644
--- a/test/data/subconfig_number1.json
+++ b/test/data/subconfig_number1.json
@@ -1 +1 @@
-{"schema": {"number1.options": {"name": "number1.options", "properties": {"number1.options.integer": {"name": "number1.options.integer", "type": "integer", "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"number1.options": {"name": "number1.options", "properties": {"number1.options.integer": {"name": "number1.options.integer", "type": "integer", "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "number1.options.integer", "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_number1_frozen.json b/test/data/subconfig_number1_frozen.json
index 5d8fc62..4cd1bc1 100644
--- a/test/data/subconfig_number1_frozen.json
+++ b/test/data/subconfig_number1_frozen.json
@@ -1 +1 @@
-{"schema": {"number1_frozen.options": {"name": "number1_frozen.options", "properties": {"number1_frozen.options.integer": {"name": "number1_frozen.options.integer", "type": "integer", "title": "integer 1 frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_frozen.options.integer", "readOnly": true}], "form": [{"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"number1_frozen.options": {"name": "number1_frozen.options", "properties": {"number1_frozen.options.integer": {"name": "number1_frozen.options.integer", "type": "integer", "title": "integer 1 frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_frozen.options.integer", "readOnly": true}], "form": [{"key": "number1_frozen.options.integer", "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_number1_mod_value.json b/test/data/subconfig_number1_mod_value.json
index 3a819fd..140e7f0 100644
--- a/test/data/subconfig_number1_mod_value.json
+++ b/test/data/subconfig_number1_mod_value.json
@@ -1 +1 @@
-{"schema": {"number1_mod_value.options": {"name": "number1_mod_value.options", "properties": {"number1_mod_value.options.integer": {"name": "number1_mod_value.options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_mod_value.options.integer", "value": 3, "owner": "user"}], "form": [{"key": "number1_mod_value.options.integer", "clearable": true}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"number1_mod_value.options": {"name": "number1_mod_value.options", "properties": {"number1_mod_value.options.integer": {"name": "number1_mod_value.options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_mod_value.options.integer", "value": 3, "owner": "user"}], "form": [{"key": "number1_mod_value.options.integer", "clearable": true, "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_number1_value.json b/test/data/subconfig_number1_value.json
index 2ba4ca3..d84434e 100644
--- a/test/data/subconfig_number1_value.json
+++ b/test/data/subconfig_number1_value.json
@@ -1 +1 @@
-{"schema": {"number1_value.options": {"name": "number1_value.options", "properties": {"number1_value.options.integer": {"name": "number1_value.options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_value.options.integer", "value": 0, "owner": "default"}], "form": [{"key": "number1_value.options.integer", "clearable": true}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"number1_value.options": {"name": "number1_value.options", "properties": {"number1_value.options.integer": {"name": "number1_value.options.integer", "type": "integer", "value": 0, "title": "integer 1"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "number1_value.options.integer", "value": 0, "owner": "default"}], "form": [{"key": "number1_value.options.integer", "clearable": true, "allowedpattern": "[0-9]", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_unicode1_multi_mandatory.prop b/test/data/subconfig_unicode1_multi_mandatory.prop
index 95c9f6b..8d1e0a6 100644
--- a/test/data/subconfig_unicode1_multi_mandatory.prop
+++ b/test/data/subconfig_unicode1_multi_mandatory.prop
@@ -1 +1 @@
-{"unicode1_multi_mandatory.options.unicode": {"null": ["empty", "mandatory"]}}
\ No newline at end of file
+{"unicode1_multi_mandatory.options.unicode": {"null": ["mandatory", "empty"]}}
\ No newline at end of file
diff --git a/test/data/subconfig_username1.json b/test/data/subconfig_username1.json
index 7fba3f0..d638a25 100644
--- a/test/data/subconfig_username1.json
+++ b/test/data/subconfig_username1.json
@@ -1 +1 @@
-{"schema": {"username1.options": {"name": "username1.options", "properties": {"username1.options.username": {"name": "username1.options.username", "type": "username", "title": "Username description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "username1.options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"username1.options": {"name": "username1.options", "properties": {"username1.options.username": {"name": "username1.options.username", "type": "username", "title": "Username description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "username1.options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/subconfig_username1_frozen.json b/test/data/subconfig_username1_frozen.json
index 9aa4ba7..93d8553 100644
--- a/test/data/subconfig_username1_frozen.json
+++ b/test/data/subconfig_username1_frozen.json
@@ -1 +1 @@
-{"schema": {"username1_frozen.options": {"name": "username1_frozen.options", "properties": {"username1_frozen.options.username": {"name": "username1_frozen.options.username", "type": "username", "title": "Username description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "username1_frozen.options.username", "readOnly": true}], "form": [{"key": "username1_frozen.options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"username1_frozen.options": {"name": "username1_frozen.options", "properties": {"username1_frozen.options.username": {"name": "username1_frozen.options.username", "type": "username", "title": "Username description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "username1_frozen.options.username", "readOnly": true}], "form": [{"key": "username1_frozen.options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/unicode1_multi_mandatory.prop b/test/data/unicode1_multi_mandatory.prop
index 651d55e..4c66872 100644
--- a/test/data/unicode1_multi_mandatory.prop
+++ b/test/data/unicode1_multi_mandatory.prop
@@ -1 +1 @@
-{"options.unicode": {"null": ["empty", "mandatory"]}}
\ No newline at end of file
+{"options.unicode": {"null": ["mandatory", "empty"]}}
\ No newline at end of file
diff --git a/test/data/username1.json b/test/data/username1.json
index f692674..f639c51 100644
--- a/test/data/username1.json
+++ b/test/data/username1.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.username": {"name": "options.username", "type": "username", "title": "Username description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.username": {"name": "options.username", "type": "username", "title": "Username description"}}, "type": "object", "title": "Common configuration"}}, "model": [], "form": [{"key": "options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
diff --git a/test/data/username1_frozen.json b/test/data/username1_frozen.json
index eac984e..4a8521f 100644
--- a/test/data/username1_frozen.json
+++ b/test/data/username1_frozen.json
@@ -1 +1 @@
-{"schema": {"options": {"name": "options", "properties": {"options.username": {"name": "options.username", "type": "username", "title": "Username description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.username", "readOnly": true}], "form": [{"key": "options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file
+{"schema": {"options": {"name": "options", "properties": {"options.username": {"name": "options.username", "type": "username", "title": "Username description frozen"}}, "type": "object", "title": "Common configuration"}}, "model": [{"key": "options.username", "readOnly": true}], "form": [{"key": "options.username", "pattern": "^[a-z_][a-z0-9_-]{0,30}[$a-z0-9_-]{0,1}$", "type": "input"}, {"title": "Configurer", "type": "submit"}]}
\ No newline at end of file