diff options
| author | J08nY | 2024-03-27 16:27:11 +0100 |
|---|---|---|
| committer | J08nY | 2024-03-27 16:27:11 +0100 |
| commit | 9539db147e847cee6d4b6f3f12cf698575f2cc92 (patch) | |
| tree | 6e931fa0edccf462c17691bc3e32679587883b51 | |
| parent | bd5d548bdb5c9d42e58de3d16e52a8b36204f528 (diff) | |
| download | ECTester-9539db147e847cee6d4b6f3f12cf698575f2cc92.tar.gz ECTester-9539db147e847cee6d4b6f3f12cf698575f2cc92.tar.zst ECTester-9539db147e847cee6d4b6f3f12cf698575f2cc92.zip | |
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43453 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | reader/build.gradle.kts | 4 | ||||
| -rw-r--r-- | standalone/build.gradle.kts | 5 | ||||
| -rw-r--r-- | standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java | 10 |
5 files changed, 12 insertions, 9 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex d64cd49..e644113 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/reader/build.gradle.kts b/reader/build.gradle.kts index cec3614..7ad2442 100644 --- a/reader/build.gradle.kts +++ b/reader/build.gradle.kts @@ -44,6 +44,10 @@ tasks.jacocoTestReport { } } +testlogger { + theme = com.adarshr.gradle.testlogger.theme.ThemeType.MOCHA +} + tasks.register<Jar>("uberJar") { archiveFileName = "ECTesterReader.jar" duplicatesStrategy = DuplicatesStrategy.WARN diff --git a/standalone/build.gradle.kts b/standalone/build.gradle.kts index 1734578..faf62ac 100644 --- a/standalone/build.gradle.kts +++ b/standalone/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { application jacoco @@ -51,6 +50,10 @@ tasks.jacocoTestReport { } } +testlogger { + theme = com.adarshr.gradle.testlogger.theme.ThemeType.MOCHA +} + tasks.withType<JavaCompile> { if (JavaVersion.current() > JavaVersion.VERSION_1_8) { options.compilerArgs.addAll(arrayOf( diff --git a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java index 6714e56..de1d9b0 100644 --- a/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java +++ b/standalone/src/test/java/cz/crcs/ectester/standalone/AppTests.java @@ -55,9 +55,9 @@ public class AppTests { @ParameterizedTest // TODO: @ExpectedToFail does not work with parameterized tests: https://github.com/junit-pioneer/junit-pioneer/issues/762 @ExpectedToFail - @ValueSource(strings = {"Bouncy", "Sun", "libtomcrypt", "Botan", "Crypto++", "OpenSSL 3", "BoringSSL", "libgcrypt", "mbedTLS", "2021" /* IPPCP */, "Nettle", "LibreSSL", "wolfCrypt"}) + @ValueSource(strings = {"Bouncy", "Sun", "libtomcrypt", "Botan", "Crypto++", "OpenSSL 3", "BoringSSL", "libgcrypt", "mbed TLS", "2021" /* IPPCP */, "Nettle", "LibreSSL", "wolfCrypt"}) @StdIo() - public void defaultSuite(String libName, StdOut out, StdErr err) { + public void defaultSuite(String libName, StdOut out) { String[] args = new String[]{"test", "default", libName}; if (libName.equals("Botan") || libName.equals("Crypto++")) { args = new String[]{"test", "--kpg-type", "ECDH", "default", libName}; @@ -65,11 +65,7 @@ public class AppTests { ECTesterStandalone.main(args); String sout = out.capturedString(); if (sout.contains("Exception")) { - fail("Default suite has exceptions."); - } - String serr = err.capturedString(); - if (!serr.isEmpty()) { - fail(serr); + System.err.printf("%s: Default suite has exceptions.%n", libName); } } } |
