Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@
path = src/test/resources/ext/edt/ssl_3_1
url = ../ssl_3_1_edt.git
shallow = true
[submodule "src/test/resources/ext/designer/ssl_3_2"]
path = src/test/resources/ext/designer/ssl_3_2
url = ../ssl_3_2.git
shallow = true
[submodule "src/test/resources/ext/edt/ssl_3_2"]
path = src/test/resources/ext/edt/ssl_3_2
url = ../ssl_3_2_edt.git
shallow = true
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class PredefinedValueConverter implements ReadConverter {

private static final String ID_ATTRIBUTE = "id";
private static final String CHILD_ITEMS_NODE = "ChildItems";
private static final String CONTENT_NODE = "content";
private static final String ITEMS_NODE = "items";
private static final String VALUE_NODE = "value";

Expand All @@ -60,7 +61,7 @@ public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext co
case "Code", "code" -> builder.code(readCode(reader));
case "IsFolder", "isFolder" -> builder.folder(Boolean.parseBoolean(reader.getValue()));
case CHILD_ITEMS_NODE -> readChildItems(reader, context, builder);
case ITEMS_NODE -> builder.childItem((PredefinedValue) context.convertAnother(null, PredefinedValue.class));
case ITEMS_NODE, CONTENT_NODE -> builder.childItem((PredefinedValue) context.convertAnother(null, PredefinedValue.class));
default -> {
// прочие свойства игнорируем
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ void testCatalog(ArgumentsAccessor argumentsAccessor) {
@CsvSource(
{
"true, ssl_3_1, _edt",
"false, ssl_3_1"
"false, ssl_3_1",
"true, ssl_3_2, _edt",
"false, ssl_3_2"
}
)
void testDefinedType(ArgumentsAccessor argumentsAccessor) {
Expand Down
Loading
Loading