remove sort in SearchOrderer

* to keep unit tests deterministic, sort earlier instead

2 files changed, 51 insertions, 51 deletions

diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
index 7a67640adfe..b15734169a5 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
@@ -43,57 +43,57 @@ doctype[].structtype[].field[].name "y"
 doctype[].structtype[].field[].internalid 900009410
 doctype[].structtype[].field[].type 10007
 doctype[].structtype[].internalid 1381038251
-doctype[].name "child_a"
+doctype[].name "parent"
 doctype[].idx 10015
-doctype[].internalid -94853056
+doctype[].internalid 1175161836
 doctype[].inherits[].idx 10000
 doctype[].contentstruct 10016
+doctype[].fieldsets{[document]}.fields[] "int_field"
+doctype[].structtype[].idx 10016
+doctype[].structtype[].name "parent.header"
+doctype[].structtype[].field[].name "int_field"
+doctype[].structtype[].field[].internalid 2128822283
+doctype[].structtype[].field[].type 10007
+doctype[].structtype[].internalid 836075987
+doctype[].name "child_a"
+doctype[].idx 10017
+doctype[].internalid -94853056
+doctype[].inherits[].idx 10000
+doctype[].contentstruct 10018
 doctype[].fieldsets{[document]}.fields[] "ref_from_a"
-doctype[].documentref[].idx 10017
-doctype[].documentref[].targettype 10018
+doctype[].documentref[].idx 10019
+doctype[].documentref[].targettype 10015
 doctype[].documentref[].internalid 427398467
-doctype[].structtype[].idx 10016
+doctype[].structtype[].idx 10018
 doctype[].structtype[].name "child_a.header"
 doctype[].structtype[].field[].name "ref_from_a"
 doctype[].structtype[].field[].internalid 300427062
-doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].type 10019
 doctype[].structtype[].internalid 867409663
 doctype[].name "child_b"
-doctype[].idx 10019
+doctype[].idx 10020
 doctype[].internalid -94852095
 doctype[].inherits[].idx 10000
-doctype[].inherits[].idx 10015
-doctype[].contentstruct 10020
+doctype[].inherits[].idx 10017
+doctype[].contentstruct 10021
 doctype[].fieldsets{[document]}.fields[] "ref_from_a"
 doctype[].fieldsets{[document]}.fields[] "ref_from_b"
-doctype[].structtype[].idx 10020
+doctype[].structtype[].idx 10021
 doctype[].structtype[].name "child_b.header"
 doctype[].structtype[].field[].name "ref_from_b"
 doctype[].structtype[].field[].internalid 185778735
-doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].type 10019
 doctype[].structtype[].internalid 670896158
 doctype[].name "child_c"
-doctype[].idx 10021
+doctype[].idx 10022
 doctype[].internalid -94851134
 doctype[].inherits[].idx 10000
-doctype[].inherits[].idx 10019
-doctype[].contentstruct 10022
+doctype[].inherits[].idx 10020
+doctype[].contentstruct 10023
 doctype[].fieldsets{[document]}.fields[] "ref_from_a"
 doctype[].fieldsets{[document]}.fields[] "ref_from_b"
 doctype[].importedfield[].name "from_a_int_field"
 doctype[].importedfield[].name "from_b_int_field"
-doctype[].structtype[].idx 10022
+doctype[].structtype[].idx 10023
 doctype[].structtype[].name "child_c.header"
 doctype[].structtype[].internalid 474382653
-doctype[].name "parent"
-doctype[].idx 10018
-doctype[].internalid 1175161836
-doctype[].inherits[].idx 10000
-doctype[].contentstruct 10023
-doctype[].fieldsets{[document]}.fields[] "int_field"
-doctype[].structtype[].idx 10023
-doctype[].structtype[].name "parent.header"
-doctype[].structtype[].field[].name "int_field"
-doctype[].structtype[].field[].internalid 2128822283
-doctype[].structtype[].field[].type 10007
-doctype[].structtype[].internalid 836075987
diff --git a/config-model/src/test/derived/reference_from_several/documentmanager.cfg b/config-model/src/test/derived/reference_from_several/documentmanager.cfg
index 0418b05d9d6..6ac1aab0baf 100644
--- a/config-model/src/test/derived/reference_from_several/documentmanager.cfg
+++ b/config-model/src/test/derived/reference_from_several/documentmanager.cfg
@@ -39,45 +39,45 @@ doctype[].structtype[].field[].type 10007
 doctype[].structtype[].field[].name "y"
 doctype[].structtype[].field[].internalid 900009410
 doctype[].structtype[].field[].type 10007
-doctype[].name "bar"
+doctype[].name "parent"
 doctype[].idx 10015
 doctype[].inherits[].idx 10000
 doctype[].contentstruct 10016
-doctype[].fieldsets{[document]}.fields[] "bartitle"
-doctype[].fieldsets{[document]}.fields[] "bpref"
-doctype[].importedfield[].name "barsximp"
-doctype[].documentref[].idx 10017
-doctype[].documentref[].targettype 10018
+doctype[].fieldsets{[document]}.fields[] "x"
 doctype[].structtype[].idx 10016
-doctype[].structtype[].name "bar.header"
-doctype[].structtype[].field[].name "bpref"
-doctype[].structtype[].field[].internalid 1709838545
-doctype[].structtype[].field[].type 10017
-doctype[].structtype[].field[].name "bartitle"
-doctype[].structtype[].field[].internalid 1554393914
-doctype[].structtype[].field[].type 10012
+doctype[].structtype[].name "parent.header"
+doctype[].structtype[].field[].name "x"
+doctype[].structtype[].field[].internalid 914677694
+doctype[].structtype[].field[].type 10007
 doctype[].name "foo"
-doctype[].idx 10019
+doctype[].idx 10017
 doctype[].inherits[].idx 10000
-doctype[].contentstruct 10020
+doctype[].contentstruct 10018
 doctype[].fieldsets{[document]}.fields[] "foo"
 doctype[].fieldsets{[document]}.fields[] "myref"
 doctype[].importedfield[].name "myx"
-doctype[].structtype[].idx 10020
+doctype[].documentref[].idx 10019
+doctype[].documentref[].targettype 10015
+doctype[].structtype[].idx 10018
 doctype[].structtype[].name "foo.header"
 doctype[].structtype[].field[].name "myref"
 doctype[].structtype[].field[].internalid 598565475
-doctype[].structtype[].field[].type 10017
+doctype[].structtype[].field[].type 10019
 doctype[].structtype[].field[].name "foo"
 doctype[].structtype[].field[].internalid 846279091
 doctype[].structtype[].field[].type 10012
-doctype[].name "parent"
-doctype[].idx 10018
+doctype[].name "bar"
+doctype[].idx 10020
 doctype[].inherits[].idx 10000
 doctype[].contentstruct 10021
-doctype[].fieldsets{[document]}.fields[] "x"
+doctype[].fieldsets{[document]}.fields[] "bartitle"
+doctype[].fieldsets{[document]}.fields[] "bpref"
+doctype[].importedfield[].name "barsximp"
 doctype[].structtype[].idx 10021
-doctype[].structtype[].name "parent.header"
-doctype[].structtype[].field[].name "x"
-doctype[].structtype[].field[].internalid 914677694
-doctype[].structtype[].field[].type 10007
+doctype[].structtype[].name "bar.header"
+doctype[].structtype[].field[].name "bpref"
+doctype[].structtype[].field[].internalid 1709838545
+doctype[].structtype[].field[].type 10019
+doctype[].structtype[].field[].name "bartitle"
+doctype[].structtype[].field[].internalid 1554393914
+doctype[].structtype[].field[].type 10012