From 9d503f6980f728e07094e577566daad1fd9dea60 Mon Sep 17 00:00:00 2001 From: henry Date: Sat, 3 Feb 2024 10:11:21 +0000 Subject: [PATCH] Non jdk classes picked up by filter If code was packaged anywhere in com.sun* it was being picked up by the filter for legacy jdk classes in the com.sun.* package. --- .../org/pitest/coverage/execute/CoverageOptions.java | 4 ++-- .../pitest/coverage/execute/CoverageOptionsTest.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pitest/src/main/java/org/pitest/coverage/execute/CoverageOptions.java b/pitest/src/main/java/org/pitest/coverage/execute/CoverageOptions.java index 36fcb9959..03e1bb1dd 100644 --- a/pitest/src/main/java/org/pitest/coverage/execute/CoverageOptions.java +++ b/pitest/src/main/java/org/pitest/coverage/execute/CoverageOptions.java @@ -64,8 +64,8 @@ private static Predicate commonClasses() { glob("org.pitest.*"), glob("java.*"), glob("javax.*"), - glob("com.sun*"), - glob("org.junit*"), + glob("com.sun.*"), + glob("org.junit.*"), glob("sun.*")); } diff --git a/pitest/src/test/java/org/pitest/coverage/execute/CoverageOptionsTest.java b/pitest/src/test/java/org/pitest/coverage/execute/CoverageOptionsTest.java index 9f4c1a010..82ad2c611 100644 --- a/pitest/src/test/java/org/pitest/coverage/execute/CoverageOptionsTest.java +++ b/pitest/src/test/java/org/pitest/coverage/execute/CoverageOptionsTest.java @@ -39,9 +39,19 @@ public void shouldNotCoverSunClassesWhenFilterIsBroad() { assertThat(this.testee.getFilter().test("sun.foo.Bar")).isFalse(); } + @Test + public void shouldNotCoverDotSun() { + assertThat(this.testee.getFilter().test("com.sun.dance")).isFalse(); + } + + @Test + public void shouldCoverSunDance() { + assertThat(this.testee.getFilter().test("com.sundance")).isTrue(); + } + @Test public void shouldNotCoverJUnitWhenFilterIsBroad() { - assertThat(this.testee.getFilter().test("sun.foo.Bar")).isFalse(); + assertThat(this.testee.getFilter().test("org.junit.Bar")).isFalse(); } @Test