OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed config validation message for parameter options (#2777) 

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/2778/head
Christoph Weitkamp 2022-02-17 20:33:37 +01:00 committed by GitHub
parent 69069270a9
commit 9bf181bf0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/validation/OptionsValidator.java
View File

@ -35,7 +35,7 @@ final class OptionsValidator implements ConfigDescriptionParameterValidator {
if (param.getOptions().stream().map(o -> o.getValue()).noneMatch(v -> v.equals(value.toString()))) {
MessageKey messageKey = MessageKey.OPTIONS_VIOLATED;
return new ConfigValidationMessage(param.getName(), messageKey.defaultMessage, messageKey.key,
param.getOptions());
String.valueOf(value), param.getOptions());
}
return null;
}

5
bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/internal/validation/ConfigDescriptionValidatorTest.java
View File

@ -424,10 +424,11 @@ public class ConfigDescriptionValidatorTest {
@Test
public void assertValidationThrowsExceptionForNotAllowedLimitedParameterOption() {
String parameterValue = "ftp";
List<ConfigValidationMessage> expected = List.of(new ConfigValidationMessage(
TXT_PARAM_WITH_LIMITED_OPTIONS_NAME, MessageKey.OPTIONS_VIOLATED.defaultMessage,
MessageKey.OPTIONS_VIOLATED.key, PARAMETER_OPTIONS));
params.put(TXT_PARAM_WITH_LIMITED_OPTIONS_NAME, "ftp");
MessageKey.OPTIONS_VIOLATED.key, parameterValue, PARAMETER_OPTIONS));
params.put(TXT_PARAM_WITH_LIMITED_OPTIONS_NAME, parameterValue);
ConfigValidationException exception = Assertions.assertThrows(ConfigValidationException.class,
() -> configDescriptionValidator.validate(params, CONFIG_DESCRIPTION_URI));
assertThat(getConfigValidationMessages(exception), is(expected));