diff options
| author | Evgeny Mandrikov <138671+Godin@users.noreply.github.com> | 2020-02-01 00:01:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 23:01:00 +0100 |
| commit | d013ac8700e0e4d14eb13eddf063cfcfbad0669c (patch) | |
| tree | 4c38a505babc50decfd5247ffc5b32f0dfb98b71 | |
| parent | 17313eba38b68ab43595a0f3e07d8a32e2e12a06 (diff) | |
| download | platform_external_jacoco-d013ac8700e0e4d14eb13eddf063cfcfbad0669c.tar.gz platform_external_jacoco-d013ac8700e0e4d14eb13eddf063cfcfbad0669c.tar.bz2 platform_external_jacoco-d013ac8700e0e4d14eb13eddf063cfcfbad0669c.zip | |
Adjust test to reflect fix of JDK-8237528 in JDK 15 EA b08 (#1011)
2 files changed, 11 insertions, 2 deletions
diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java b/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java index 3f43912f..4a085f27 100644 --- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java +++ b/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/InstanceofTest.java @@ -12,6 +12,7 @@ *******************************************************************************/ package org.jacoco.core.test.validation.java14; +import org.jacoco.core.test.validation.Source.Line; import org.jacoco.core.test.validation.ValidationTestBase; import org.jacoco.core.test.validation.java14.targets.InstanceofTarget; @@ -24,4 +25,13 @@ public class InstanceofTest extends ValidationTestBase { super(InstanceofTarget.class); } + public void assertInstanceof(final Line line) { + if (isJDKCompiler && JAVA_VERSION.isBefore("15")) { + // https://bugs.openjdk.java.net/browse/JDK-8237528 + assertFullyCovered(line, 1, 3); + } else { + assertFullyCovered(line, 0, 2); + } + } + } diff --git a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java b/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java index 08438512..0c69a2cc 100644 --- a/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java +++ b/org.jacoco.core.test.validation.java14/src/org/jacoco/core/test/validation/java14/targets/InstanceofTarget.java @@ -20,8 +20,7 @@ import static org.jacoco.core.test.validation.targets.Stubs.nop; public class InstanceofTarget { private static void ifInstanceof(Object e) { - /* See https://bugs.openjdk.java.net/browse/JDK-8237528 */ - if (e instanceof String s) { // assertFullyCovered(1, 3) + if (e instanceof String s) { // assertInstanceof() nop(s); } } |