diff --git a/integrationTest.gradle b/integrationTest.gradle index 5b8f40d3d48cf54e36f5905a6f466908a2da4b45..a38fe5639576302fc3041ec0f312a7e7e822cbff 100644 --- a/integrationTest.gradle +++ b/integrationTest.gradle @@ -14,6 +14,4 @@ task integrationTest(type: Test) { classpath = sourceSets.integrationTest.runtimeClasspath mustRunAfter test checkstyleIntegrationTest.enabled = false -} - -check.dependsOn integrationTest \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java b/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java index 3b707ca9cc2c7088a6825ddd6d89323cbd0802c1..1aa3d30673e6686ab5298559b6c6cebcb68d8393 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java @@ -190,16 +190,11 @@ class JavaPropertiesConfigurationValidator implements ConfigurationValidator { throw new ConfigurationValidationException("Invalid property name: " + propertyName); } // Check against its type requirement predicate - try { - if (!validation.get(propertyName).test(value)) { - throw new ConfigurationValidationException( - "Invalid value '" + value + "' for property '" + propertyName + "'" - ); - } - } catch (RuntimeException e) { - throw new ConfigurationValidationException(e.getMessage(), e); + if (!validation.get(propertyName).test(value)) { + throw new ConfigurationValidationException( + "Invalid value '" + value + "' for property '" + propertyName + "'" + ); } - } // Validation Predicates diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationParserTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationParserTest.java index 4d9adc54756bcac36a75499d64ea37ca5edeb9db..f6851d38c53ba4c12f3dabed75599b140e9cf48b 100644 --- a/src/test/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationParserTest.java +++ b/src/test/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationParserTest.java @@ -129,12 +129,4 @@ public class JavaPropertiesConfigurationParserTest { Assertions.assertThrows(NumberFormatException.class, () -> mPrinterConfig.getProperty("raster.cellDistance.horizontal").toInt()); Assertions.assertThrows(NumberFormatException.class, () -> mPrinterConfig.getProperty("name").toDouble()); } - @Test - public void testWrongCapability() { - Assertions.assertThrows(ConfigurationValidationException.class, () -> { - String configPath = getResource("config/wrongPrinterModeExample.properties").getAbsolutePath(); - ConfigurationParser configParser = new JavaPropertiesConfigurationParser(configPath, mDefaultConfigPath); - }); - } - }