From 60e76f2e7e5fa342f3e448255b275b83d7238426 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Mon, 14 Mar 2022 19:58:36 +0000 Subject: update expected results * drop lots of duplicate data types --- .../annotationsstructarray/documentmanager.cfg | 6 +- .../src/test/derived/arrays/documentmanager.cfg | 8 --- .../derived/attributeprefetch/documentmanager.cfg | 36 ---------- .../src/test/derived/complex/documentmanager.cfg | 4 -- .../test/derived/namecollision/documentmanager.cfg | 2 - .../derived/streamingstruct/documentmanager.cfg | 5 -- .../derived/structandfieldset/documentmanager.cfg | 2 - .../derived/structanyorder/documentmanager.cfg | 8 +-- .../src/test/derived/types/documentmanager.cfg | 82 ---------------------- 9 files changed, 5 insertions(+), 148 deletions(-) (limited to 'config-model/src/test/derived') diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg index f30914ebbf6..640655c53b6 100644 --- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg +++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg @@ -45,9 +45,7 @@ doctype[].inherits[].idx 10000 doctype[].contentstruct 10016 doctype[].arraytype[].idx 10017 doctype[].arraytype[].elementtype 10018 -doctype[].arraytype[].idx 10020 -doctype[].arraytype[].elementtype 10018 -doctype[].annotationtype[].idx 10021 +doctype[].annotationtype[].idx 10020 doctype[].annotationtype[].name "my_anno" doctype[].annotationtype[].internalid -160036815 doctype[].annotationtype[].datatype 10019 @@ -62,4 +60,4 @@ doctype[].structtype[].idx 10019 doctype[].structtype[].name "annotation.my_anno" doctype[].structtype[].field[].name "my_annofield" doctype[].structtype[].field[].internalid 718266337 -doctype[].structtype[].field[].type 10020 +doctype[].structtype[].field[].type 10017 diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg index fc9f42afab2..7da3b44f43c 100644 --- a/config-model/src/test/derived/arrays/documentmanager.cfg +++ b/config-model/src/test/derived/arrays/documentmanager.cfg @@ -57,18 +57,10 @@ doctype[].arraytype[].idx 10018 doctype[].arraytype[].elementtype 10007 doctype[].arraytype[].idx 10019 doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10021 -doctype[].arraytype[].elementtype 10007 -doctype[].arraytype[].idx 10022 -doctype[].arraytype[].elementtype 10012 doctype[].wsettype[].idx 10020 doctype[].wsettype[].elementtype 10012 doctype[].wsettype[].createifnonexistent false doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10023 -doctype[].wsettype[].elementtype 10012 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false doctype[].structtype[].idx 10016 doctype[].structtype[].name "arrays.header" doctype[].structtype[].field[].name "tags" diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg index aeca3f9fd74..373e0211253 100644 --- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg +++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg @@ -73,18 +73,6 @@ doctype[].arraytype[].idx 10025 doctype[].arraytype[].elementtype 10004 doctype[].arraytype[].idx 10027 doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10029 -doctype[].arraytype[].elementtype 10003 -doctype[].arraytype[].idx 10030 -doctype[].arraytype[].elementtype 10004 -doctype[].arraytype[].idx 10031 -doctype[].arraytype[].elementtype 10005 -doctype[].arraytype[].idx 10032 -doctype[].arraytype[].elementtype 10007 -doctype[].arraytype[].idx 10033 -doctype[].arraytype[].elementtype 10008 -doctype[].arraytype[].idx 10034 -doctype[].arraytype[].elementtype 10012 doctype[].wsettype[].idx 10018 doctype[].wsettype[].elementtype 10003 doctype[].wsettype[].createifnonexistent false @@ -109,30 +97,6 @@ doctype[].wsettype[].idx 10028 doctype[].wsettype[].elementtype 10012 doctype[].wsettype[].createifnonexistent false doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10035 -doctype[].wsettype[].elementtype 10003 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10036 -doctype[].wsettype[].elementtype 10004 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10037 -doctype[].wsettype[].elementtype 10005 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10038 -doctype[].wsettype[].elementtype 10007 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10039 -doctype[].wsettype[].elementtype 10008 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10040 -doctype[].wsettype[].elementtype 10012 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false doctype[].structtype[].idx 10016 doctype[].structtype[].name "prefetch.header" doctype[].structtype[].field[].name "singlebyte" diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg index dd243a88f69..da4f2fc0942 100644 --- a/config-model/src/test/derived/complex/documentmanager.cfg +++ b/config-model/src/test/derived/complex/documentmanager.cfg @@ -75,10 +75,6 @@ doctype[].arraytype[].idx 10017 doctype[].arraytype[].elementtype 10005 doctype[].arraytype[].idx 10018 doctype[].arraytype[].elementtype 10007 -doctype[].arraytype[].idx 10019 -doctype[].arraytype[].elementtype 10005 -doctype[].arraytype[].idx 10020 -doctype[].arraytype[].elementtype 10007 doctype[].structtype[].idx 10016 doctype[].structtype[].name "complex.header" doctype[].structtype[].field[].name "title" diff --git a/config-model/src/test/derived/namecollision/documentmanager.cfg b/config-model/src/test/derived/namecollision/documentmanager.cfg index e520c1144fa..73730595574 100644 --- a/config-model/src/test/derived/namecollision/documentmanager.cfg +++ b/config-model/src/test/derived/namecollision/documentmanager.cfg @@ -52,8 +52,6 @@ doctype[].contentstruct 10018 doctype[].fieldsets{[document]}.fields[] "structarray" doctype[].arraytype[].idx 10019 doctype[].arraytype[].elementtype 10020 -doctype[].arraytype[].idx 10021 -doctype[].arraytype[].elementtype 10020 doctype[].structtype[].idx 10020 doctype[].structtype[].name "collision" doctype[].structtype[].idx 10018 diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg index cc2ee0b3979..30dd3fc1d35 100644 --- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg +++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg @@ -66,14 +66,9 @@ doctype[].arraytype[].idx 10021 doctype[].arraytype[].elementtype 10017 doctype[].arraytype[].idx 10022 doctype[].arraytype[].elementtype 10017 -doctype[].arraytype[].idx 10023 -doctype[].arraytype[].elementtype 10017 doctype[].maptype[].idx 10018 doctype[].maptype[].keytype 10008 doctype[].maptype[].valuetype 10012 -doctype[].maptype[].idx 10024 -doctype[].maptype[].keytype 10008 -doctype[].maptype[].valuetype 10012 doctype[].structtype[].idx 10017 doctype[].structtype[].name "s1" doctype[].structtype[].field[].name "f1" diff --git a/config-model/src/test/derived/structandfieldset/documentmanager.cfg b/config-model/src/test/derived/structandfieldset/documentmanager.cfg index f30377a5b7e..85df5249e3a 100644 --- a/config-model/src/test/derived/structandfieldset/documentmanager.cfg +++ b/config-model/src/test/derived/structandfieldset/documentmanager.cfg @@ -49,8 +49,6 @@ doctype[].fieldsets{[document]}.fields[] "people" doctype[].fieldsets{[document]}.fields[] "tag" doctype[].arraytype[].idx 10017 doctype[].arraytype[].elementtype 10018 -doctype[].arraytype[].idx 10019 -doctype[].arraytype[].elementtype 10018 doctype[].structtype[].idx 10018 doctype[].structtype[].name "person" doctype[].structtype[].field[].name "first_name" diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg index 2b06c6d7214..b3b6a2587c1 100644 --- a/config-model/src/test/derived/structanyorder/documentmanager.cfg +++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg @@ -47,12 +47,10 @@ doctype[].fieldsets{[document]}.fields[] "structarrayfield" doctype[].fieldsets{[document]}.fields[] "structfield" doctype[].arraytype[].idx 10019 doctype[].arraytype[].elementtype 10017 -doctype[].arraytype[].idx 10020 -doctype[].arraytype[].elementtype 10017 -doctype[].annotationtype[].idx 10022 +doctype[].annotationtype[].idx 10021 doctype[].annotationtype[].name "banana" doctype[].annotationtype[].internalid -269517759 -doctype[].annotationtype[].datatype 10021 +doctype[].annotationtype[].datatype 10020 doctype[].structtype[].idx 10018 doctype[].structtype[].name "foo" doctype[].structtype[].field[].name "s1" @@ -80,7 +78,7 @@ doctype[].structtype[].field[].type 10017 doctype[].structtype[].field[].name "structarrayfield" doctype[].structtype[].field[].internalid 335048518 doctype[].structtype[].field[].type 10019 -doctype[].structtype[].idx 10021 +doctype[].structtype[].idx 10020 doctype[].structtype[].name "annotation.banana" doctype[].structtype[].field[].name "b" doctype[].structtype[].field[].internalid 1964392128 diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg index 3ee8b5cb38c..f74ce87e6cb 100644 --- a/config-model/src/test/derived/types/documentmanager.cfg +++ b/config-model/src/test/derived/types/documentmanager.cfg @@ -95,40 +95,6 @@ doctype[].arraytype[].idx 10042 doctype[].arraytype[].elementtype 10003 doctype[].arraytype[].idx 10045 doctype[].arraytype[].elementtype 10041 -doctype[].arraytype[].idx 10051 -doctype[].arraytype[].elementtype 10052 -doctype[].arraytype[].idx 10052 -doctype[].arraytype[].elementtype 10053 -doctype[].arraytype[].idx 10053 -doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10054 -doctype[].arraytype[].elementtype 10055 -doctype[].arraytype[].idx 10055 -doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10056 -doctype[].arraytype[].elementtype 10057 -doctype[].arraytype[].idx 10058 -doctype[].arraytype[].elementtype 10059 -doctype[].arraytype[].idx 10059 -doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10060 -doctype[].arraytype[].elementtype 10061 -doctype[].arraytype[].idx 10062 -doctype[].arraytype[].elementtype 10003 -doctype[].arraytype[].idx 10063 -doctype[].arraytype[].elementtype 10007 -doctype[].arraytype[].idx 10064 -doctype[].arraytype[].elementtype 10041 -doctype[].arraytype[].idx 10065 -doctype[].arraytype[].elementtype 10023 -doctype[].arraytype[].idx 10066 -doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10068 -doctype[].arraytype[].elementtype 10069 -doctype[].arraytype[].idx 10069 -doctype[].arraytype[].elementtype 10012 -doctype[].arraytype[].idx 10075 -doctype[].arraytype[].elementtype 10007 doctype[].maptype[].idx 10025 doctype[].maptype[].keytype 10012 doctype[].maptype[].valuetype 10012 @@ -165,42 +131,6 @@ doctype[].maptype[].valuetype 10047 doctype[].maptype[].idx 10048 doctype[].maptype[].keytype 10012 doctype[].maptype[].valuetype 10008 -doctype[].maptype[].idx 10057 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10058 -doctype[].maptype[].idx 10061 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10012 -doctype[].maptype[].idx 10067 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10068 -doctype[].maptype[].idx 10070 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10004 -doctype[].maptype[].idx 10071 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10047 -doctype[].maptype[].idx 10072 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10008 -doctype[].maptype[].idx 10073 -doctype[].maptype[].keytype 10007 -doctype[].maptype[].valuetype 10041 -doctype[].maptype[].idx 10074 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10075 -doctype[].maptype[].idx 10076 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10005 -doctype[].maptype[].idx 10077 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10007 -doctype[].maptype[].idx 10078 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10008 -doctype[].maptype[].idx 10079 -doctype[].maptype[].keytype 10012 -doctype[].maptype[].valuetype 10012 doctype[].wsettype[].idx 10018 doctype[].wsettype[].elementtype 10012 doctype[].wsettype[].createifnonexistent false @@ -229,18 +159,6 @@ doctype[].wsettype[].idx 10050 doctype[].wsettype[].elementtype 10012 doctype[].wsettype[].createifnonexistent true doctype[].wsettype[].removeifzero true -doctype[].wsettype[].idx 10080 -doctype[].wsettype[].elementtype 10012 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10081 -doctype[].wsettype[].elementtype 10012 -doctype[].wsettype[].createifnonexistent true -doctype[].wsettype[].removeifzero false -doctype[].wsettype[].idx 10082 -doctype[].wsettype[].elementtype 10012 -doctype[].wsettype[].createifnonexistent false -doctype[].wsettype[].removeifzero true doctype[].structtype[].idx 10023 doctype[].structtype[].name "sct" doctype[].structtype[].field[].name "s1" -- cgit v1.2.3