Commit 71f12090 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'unit-test-fix' into 'master'

Unit test fix

See merge request !413
parents 457582b0 2013c5ae
Pipeline #6486 passed with stage
in 7 minutes and 36 seconds
......@@ -130,7 +130,9 @@ public class RestAnnotationParser extends XmlParser {
sb.append(createEntry(NoteField.PANTHER, filterMiriam(data, MiriamType.PANTHER), forceFullInfo));
sb.append(createEntry(NoteField.DESCRIPTION, null, forceFullInfo));
sb.append(createEntry(NoteField.ABBREVIATION, element.getAbbreviation(), forceFullInfo));
sb.append(createEntry(NoteField.SEMANTIC_ZOOM_LEVEL_VISIBILITY, element.getVisibilityLevel(), forceFullInfo));
sb.append(createEntry(NoteField.SEMANTIC_ZOOM_LEVEL_VISIBILITY, element.getVisibilityLevel(), forceFullInfo));
sb.append(createEntry(NoteField.TRANSPARENCY_ZOOM_LEVEL_VISIBILITY, element.getTransparencyLevel(), forceFullInfo));
sb.append(createEntry(NoteField.CHARGED_FORMULA, element.getFormula(), forceFullInfo));
if (element instanceof Species) {
sb.append(createEntry(NoteField.CHARGE, ((Species) element).getCharge(), forceFullInfo));
......
......@@ -124,7 +124,7 @@ public class ConfigurationServiceTest extends ServiceTestFunctions {
try {
for (PrivilegeType type : PrivilegeType.values()) {
ConfigurationOption value = configurationService.getValue(type);
if (Project.class.equals(type.getPrivilegeObjectType())) {
if (Project.class.equals(type.getPrivilegeObjectType()) || type.equals(PrivilegeType.CUSTOM_LAYOUTS)) {
assertNotNull("No default value for privilege " + type.getCommonName(), value);
assertNotNull(value.getValue());
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment