Skip to content

Commit 97b85d2

Browse files
committed
MCR-3639 align test class order with usage order
1 parent d150d3f commit 97b85d2

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed

mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyListTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,23 +1022,31 @@ public void requiredPropertyLongNotEmptyDefaultSetDefaultPropertyLongNotEmpty()
10221022
}
10231023

10241024
public static class NotRequiredDefaultNotSet {
1025+
10251026
@MCRPropertyList(name = "List", required = false)
10261027
public List<String> list;
1028+
10271029
}
10281030

10291031
public static class NotRequiredDefaultSet {
1032+
10301033
@MCRPropertyList(name = "List", required = false, defaultName = "MCR.List")
10311034
public List<String> list;
1032-
}
10331035

1034-
public static class RequiredDefaultSet {
1035-
@MCRPropertyList(name = "List", defaultName = "MCR.List")
1036-
public List<String> list;
10371036
}
10381037

10391038
public static class RequiredDefaultNotSet {
1039+
10401040
@MCRPropertyList(name = "List")
10411041
public List<String> list;
1042+
1043+
}
1044+
1045+
public static class RequiredDefaultSet {
1046+
1047+
@MCRPropertyList(name = "List", defaultName = "MCR.List")
1048+
public List<String> list;
1049+
10421050
}
10431051

10441052
}

mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyMapTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,23 +1021,31 @@ public void requiredPropertyLongNotEmptyDefaultSetDefaultPropertyLongNotEmpty()
10211021
}
10221022

10231023
public static class NotRequiredDefaultNotSet {
1024+
10241025
@MCRPropertyMap(name = "Map", required = false)
10251026
public Map<String, String> map;
1027+
10261028
}
10271029

10281030
public static class NotRequiredDefaultSet {
1031+
10291032
@MCRPropertyMap(name = "Map", required = false, defaultName = "MCR.Map")
10301033
public Map<String, String> map;
1031-
}
10321034

1033-
public static class RequiredDefaultSet {
1034-
@MCRPropertyMap(name = "Map", defaultName = "MCR.Map")
1035-
public Map<String, String> map;
10361035
}
10371036

10381037
public static class RequiredDefaultNotSet {
1038+
10391039
@MCRPropertyMap(name = "Map")
10401040
public Map<String, String> map;
1041+
1042+
}
1043+
1044+
public static class RequiredDefaultSet {
1045+
1046+
@MCRPropertyMap(name = "Map", defaultName = "MCR.Map")
1047+
public Map<String, String> map;
1048+
10411049
}
10421050

10431051
}

mycore-base/src/test/java/org/mycore/common/config/MCRConfigurableInstancePropertyTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,23 +589,31 @@ public void requiredPropertyNotEmptyDefaultSetDefaultPropertyNotEmpty() {
589589
}
590590

591591
public static class NotRequiredDefaultNotSet {
592+
592593
@MCRProperty(name = "Value", required = false)
593594
public String value;
595+
594596
}
595597

596598
public static class NotRequiredDefaultSet {
599+
597600
@MCRProperty(name = "Value", required = false, defaultName = "MCR.Value")
598601
public String value;
599-
}
600602

601-
public static class RequiredDefaultSet {
602-
@MCRProperty(name = "Value", defaultName = "MCR.Value")
603-
public String value;
604603
}
605604

606605
public static class RequiredDefaultNotSet {
606+
607607
@MCRProperty(name = "Value")
608608
public String value;
609+
610+
}
611+
612+
public static class RequiredDefaultSet {
613+
614+
@MCRProperty(name = "Value", defaultName = "MCR.Value")
615+
public String value;
616+
609617
}
610618

611619
}

0 commit comments

Comments
 (0)