zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mor integration tests

Browse source
This commit is contained in:
anhefti 2020-06-15 12:43:31 +02:00
parent 42a5c7cf3b
commit 54c248980b
3 changed files with 85 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/converter/ArrayOfStringConverter.java
View file

@ -85,7 +85,7 @@ public class ArrayOfStringConverter implements AttributeValueConverter {
final ConfigurationValue value, final ConfigurationValue value,
final boolean xml) throws IOException { final boolean xml) throws IOException {
final String val = (value.value != null) ? value.value : attribute.getDefaultValue(); final String val = (value != null && value.value != null) ? value.value : attribute.getDefaultValue();
if (StringUtils.isNotBlank(val)) { if (StringUtils.isNotBlank(val)) {
final String[] values = StringUtils.split(val, Constants.LIST_SEPARATOR); final String[] values = StringUtils.split(val, Constants.LIST_SEPARATOR);

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/converter/InlineTableConverter.java
View file

@ -92,7 +92,7 @@ public class InlineTableConverter implements AttributeValueConverter {
(xml) ? XML_KEY_TEMPLATE : JSON_KEY_TEMPLATE, (xml) ? XML_KEY_TEMPLATE : JSON_KEY_TEMPLATE,
AttributeValueConverter.extractName(attribute)))); AttributeValueConverter.extractName(attribute))));
if (StringUtils.isBlank(value.value)) { if (value == null || StringUtils.isBlank(value.value)) {
out.write((xml) ? XML_EMPTY_ARRAY : JSON_EMPTY_ARRAY); out.write((xml) ? XML_EMPTY_ARRAY : JSON_EMPTY_ARRAY);
out.flush(); out.flush();
return; return;

86
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

File diff suppressed because one or more lines are too long