From c2c8e783cb09ee72ccdcb09f874f903b64ec5415 Mon Sep 17 00:00:00 2001 From: Hamdi Douss Date: Mon, 17 Feb 2020 22:15:16 +0100 Subject: [PATCH 1/7] #323 migrate to junit 5 --- pom.xml | 12 +++++++ src/test/java/org/jpeek/AppTest.java | 6 ++-- src/test/java/org/jpeek/DefaultBaseTest.java | 4 +-- src/test/java/org/jpeek/IndexTest.java | 8 ++--- src/test/java/org/jpeek/MainTest.java | 30 ++++++++++++----- src/test/java/org/jpeek/MatrixTest.java | 8 ++--- src/test/java/org/jpeek/MetricsTest.java | 33 +++++++++---------- src/test/java/org/jpeek/ReportTest.java | 4 +-- .../org/jpeek/ReportWithStatisticsTest.java | 4 +-- src/test/java/org/jpeek/package-info.java | 6 +++- 10 files changed, 71 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 5b3c130b..b9547955 100644 --- a/pom.xml +++ b/pom.xml @@ -210,6 +210,18 @@ SOFTWARE. + + org.junit.jupiter + junit-jupiter-engine + 5.5.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.5.2 + test + diff --git a/src/test/java/org/jpeek/AppTest.java b/src/test/java/org/jpeek/AppTest.java index 6f5a212c..5053f144 100644 --- a/src/test/java/org/jpeek/AppTest.java +++ b/src/test/java/org/jpeek/AppTest.java @@ -38,14 +38,14 @@ import org.cactoos.text.TextOf; import org.hamcrest.collection.IsEmptyIterable; import org.hamcrest.core.IsNot; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; import org.llorllale.cactoos.matchers.IsTrue; /** * Test case for {@link App}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: 6f5a212c49c37e8fcb52668a89bef98c2e0a9335 $ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) @@ -138,7 +138,7 @@ public void isXsdDocumented() throws IOException { elements, populated ).affirm(); - for (final XML element: elements) { + for (final XML element : elements) { new Assertion<>( String.format( "element '%s' must have a documentation", diff --git a/src/test/java/org/jpeek/DefaultBaseTest.java b/src/test/java/org/jpeek/DefaultBaseTest.java index ae62c672..e1cc3a9a 100644 --- a/src/test/java/org/jpeek/DefaultBaseTest.java +++ b/src/test/java/org/jpeek/DefaultBaseTest.java @@ -28,13 +28,13 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import org.hamcrest.Matchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; /** * Test case for {@link DefaultBase}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: ae62c6725397b0a66e08f8b6beccc49f9b2e8058 $ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/IndexTest.java b/src/test/java/org/jpeek/IndexTest.java index a6fe3d1c..6ab13873 100644 --- a/src/test/java/org/jpeek/IndexTest.java +++ b/src/test/java/org/jpeek/IndexTest.java @@ -29,14 +29,14 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.cactoos.text.TextOf; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; /** * Test case for {@link Index}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: a6fe3d1c462d150d28d8137672c457f7ef6ad9de $ * @since 0.6 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) @@ -47,7 +47,7 @@ public final class IndexTest { */ private String xml; - @Before + @BeforeEach public void setUp() throws IOException { final Path output = Files.createTempDirectory("").resolve("x2"); final Path input = Paths.get("."); diff --git a/src/test/java/org/jpeek/MainTest.java b/src/test/java/org/jpeek/MainTest.java index b1b1f9e4..0a3038b4 100644 --- a/src/test/java/org/jpeek/MainTest.java +++ b/src/test/java/org/jpeek/MainTest.java @@ -29,7 +29,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.cactoos.Scalar; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; import org.llorllale.cactoos.matchers.IsTrue; import org.llorllale.cactoos.matchers.Throws; @@ -37,7 +37,7 @@ /** * Test case for {@link Main}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: b1b1f9e48a25fb704c1d28fad85d363be2c9bb46 $ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) @@ -57,18 +57,30 @@ public void createsXmlReports() throws IOException { ).affirm(); } - @Test(expected = ParameterException.class) + @Test public void crashesIfInvalidInput() throws IOException { - Main.main("hello"); + new Assertion<>( + "Must throw an exception if parameter is invalid", + () -> { + Main.main("hello"); + return null; + }, new Throws<>("", ParameterException.class) + ).affirm(); } - @Test(expected = IllegalStateException.class) + @Test public void crashesIfNoOverwriteAndTargetExists() throws IOException { final Path target = Files.createTempDirectory(""); - Main.main( - "--sources", Paths.get(".").toString(), - "--target", target.toString() - ); + new Assertion<>( + "Must throw an exception if target exists and no overwrite", + () -> { + Main.main( + "--sources", Paths.get(".").toString(), + "--target", target.toString() + ); + return null; + }, new Throws<>("", IllegalStateException.class) + ).affirm(); } @Test diff --git a/src/test/java/org/jpeek/MatrixTest.java b/src/test/java/org/jpeek/MatrixTest.java index 1855f8cf..74a4e1cc 100644 --- a/src/test/java/org/jpeek/MatrixTest.java +++ b/src/test/java/org/jpeek/MatrixTest.java @@ -29,14 +29,14 @@ import java.nio.file.Path; import java.nio.file.Paths; import org.cactoos.text.TextOf; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; /** * Test case for {@link Matrix}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: 1855f8cf6c5488becaed4c48cfce961fb57a7786 $ * @since 0.8 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) @@ -47,7 +47,7 @@ public final class MatrixTest { */ private String xml; - @Before + @BeforeEach public void setUp() throws IOException { final Path output = Files.createTempDirectory("").resolve("x2"); final Path input = Paths.get("."); diff --git a/src/test/java/org/jpeek/MetricsTest.java b/src/test/java/org/jpeek/MetricsTest.java index 473cae02..a7d491bc 100644 --- a/src/test/java/org/jpeek/MetricsTest.java +++ b/src/test/java/org/jpeek/MetricsTest.java @@ -44,28 +44,27 @@ /** * Tests for all metrics. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: 473cae02955981eb3ce0a348f85a6bdd23457899 $ * @since 0.23 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle VisibilityModifierCheck (500 lines) * @checkstyle JavadocVariableCheck (500 lines) * @checkstyle MagicNumberCheck (500 lines) * @todo #118:30min Add test for LCC with "IndirectlyRelatedPairs" and others. - * In "IndirectlyRelatedPairs" all methods exist in one transitive closure, - * so the result should be {@code 1d}. - * Also, all classes without transitive relations - * should have the same LCC metric as TCC metric. - * Before do it we have to fix puzzles in LCC.xml. - * @checkstyle JavadocTagsCheck (500 lines) + * In "IndirectlyRelatedPairs" all methods exist in one transitive closure, so + * the result should be {@code 1d}. Also, all classes without transitive + * relations should have the same LCC metric as TCC metric. Before do it we have + * to fix puzzles in LCC.xml. + * @todo #323:30min Migrate this parametrized test to junit 5, so it won't + * import any classes from junit 4 anymore. + * @checkstyle JavadocTagsCheck (500 lines) */ @RunWith(Parameterized.class) -@SuppressWarnings( - { - "PMD.AvoidDuplicateLiterals", - "PMD.ExcessiveMethodLength", - "PMD.UseUnderscoresInNumericLiterals" - } -) +@SuppressWarnings({ + "PMD.AvoidDuplicateLiterals", + "PMD.ExcessiveMethodLength", + "PMD.UseUnderscoresInNumericLiterals" +}) public final class MetricsTest { @Parameterized.Parameter @@ -121,9 +120,9 @@ public static Collection targets() { new Object[] {"WithoutAttributes", "NHD", 0.0d}, new Object[] {"OneMethodCreatesLambda", "NHD", 0.0d}, new Object[] {"MethodsWithDiffParamTypes", "CCM", 0.0476d}, - new Object[]{"Foo", "SCOM", 0.5d}, - new Object[]{"MethodsWithDiffParamTypes", "SCOM", 0.2381d}, - new Object[]{"OverloadMethods", "SCOM", 0.75d}, + new Object[] {"Foo", "SCOM", 0.5d}, + new Object[] {"MethodsWithDiffParamTypes", "SCOM", 0.2381d}, + new Object[] {"OverloadMethods", "SCOM", 0.75d}, new Object[] {"TwoCommonAttributes", "SCOM", 0.0d}, new Object[] {"NoMethods", "SCOM", Double.NaN}, new Object[] {"OneVoidMethodWithoutParams", "SCOM", 0.0d}, diff --git a/src/test/java/org/jpeek/ReportTest.java b/src/test/java/org/jpeek/ReportTest.java index 46f01c3c..f722792d 100644 --- a/src/test/java/org/jpeek/ReportTest.java +++ b/src/test/java/org/jpeek/ReportTest.java @@ -30,7 +30,7 @@ import java.nio.file.Path; import org.cactoos.text.TextOf; import org.jpeek.skeleton.Skeleton; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; import org.llorllale.cactoos.matchers.IsTrue; import org.xembly.Directives; @@ -39,7 +39,7 @@ /** * Test case for {@link Report}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: 46f01c3c892964ce23da18ad766d18f364982c33 $ * @since 0.4 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle ClassDataAbstractionCouplingCheck (500 lines) diff --git a/src/test/java/org/jpeek/ReportWithStatisticsTest.java b/src/test/java/org/jpeek/ReportWithStatisticsTest.java index cd48d531..d69cf94d 100644 --- a/src/test/java/org/jpeek/ReportWithStatisticsTest.java +++ b/src/test/java/org/jpeek/ReportWithStatisticsTest.java @@ -29,13 +29,13 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.llorllale.cactoos.matchers.Assertion; /** * Test case for {@link ReportWithStatistics}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: cd48d531b54b75bcbb7d7300276380a36337f1be $ * @since 0.19 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/package-info.java b/src/test/java/org/jpeek/package-info.java index 5f32b906..a48ebb4c 100644 --- a/src/test/java/org/jpeek/package-info.java +++ b/src/test/java/org/jpeek/package-info.java @@ -26,7 +26,11 @@ * Tests. * * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id$ + * @version $Id: 5f32b906da657837e39669980f837afea3dc7a9e $ * @since 0.1 + * @todo #323:30min Migrate the tests in the sub-packages: org.jpeek.metrics, + * org.jpeek.skeleton and org.jpeek.web to junit 5, so they won't + * import any classes from junit 4 anymore. Then, we should find a way to + * exclude junit 4 from project dependecy, so they won't be imported anymore. */ package org.jpeek; From 72813558ad2a79e52edff13c70fb65653374d2d9 Mon Sep 17 00:00:00 2001 From: Hamdi Douss Date: Mon, 17 Feb 2020 22:17:52 +0100 Subject: [PATCH 2/7] #323 remove version ids --- src/test/java/org/jpeek/AppTest.java | 2 +- src/test/java/org/jpeek/DefaultBaseTest.java | 2 +- src/test/java/org/jpeek/IndexTest.java | 2 +- src/test/java/org/jpeek/MainTest.java | 2 +- src/test/java/org/jpeek/MatrixTest.java | 2 +- src/test/java/org/jpeek/MetricsTest.java | 2 +- src/test/java/org/jpeek/ReportTest.java | 2 +- src/test/java/org/jpeek/ReportWithStatisticsTest.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/jpeek/AppTest.java b/src/test/java/org/jpeek/AppTest.java index 5053f144..aa9d879c 100644 --- a/src/test/java/org/jpeek/AppTest.java +++ b/src/test/java/org/jpeek/AppTest.java @@ -45,7 +45,7 @@ /** * Test case for {@link App}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: 6f5a212c49c37e8fcb52668a89bef98c2e0a9335 $ + * @version $Id$ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/DefaultBaseTest.java b/src/test/java/org/jpeek/DefaultBaseTest.java index e1cc3a9a..c53d0f4a 100644 --- a/src/test/java/org/jpeek/DefaultBaseTest.java +++ b/src/test/java/org/jpeek/DefaultBaseTest.java @@ -34,7 +34,7 @@ /** * Test case for {@link DefaultBase}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: ae62c6725397b0a66e08f8b6beccc49f9b2e8058 $ + * @version $Id$ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/IndexTest.java b/src/test/java/org/jpeek/IndexTest.java index 6ab13873..231f68b1 100644 --- a/src/test/java/org/jpeek/IndexTest.java +++ b/src/test/java/org/jpeek/IndexTest.java @@ -36,7 +36,7 @@ /** * Test case for {@link Index}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: a6fe3d1c462d150d28d8137672c457f7ef6ad9de $ + * @version $Id$ * @since 0.6 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/MainTest.java b/src/test/java/org/jpeek/MainTest.java index 0a3038b4..5dc0ed51 100644 --- a/src/test/java/org/jpeek/MainTest.java +++ b/src/test/java/org/jpeek/MainTest.java @@ -37,7 +37,7 @@ /** * Test case for {@link Main}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: b1b1f9e48a25fb704c1d28fad85d363be2c9bb46 $ + * @version $Id$ * @since 0.1 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/MatrixTest.java b/src/test/java/org/jpeek/MatrixTest.java index 74a4e1cc..494358f3 100644 --- a/src/test/java/org/jpeek/MatrixTest.java +++ b/src/test/java/org/jpeek/MatrixTest.java @@ -36,7 +36,7 @@ /** * Test case for {@link Matrix}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: 1855f8cf6c5488becaed4c48cfce961fb57a7786 $ + * @version $Id$ * @since 0.8 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) diff --git a/src/test/java/org/jpeek/MetricsTest.java b/src/test/java/org/jpeek/MetricsTest.java index a7d491bc..1a84a81c 100644 --- a/src/test/java/org/jpeek/MetricsTest.java +++ b/src/test/java/org/jpeek/MetricsTest.java @@ -44,7 +44,7 @@ /** * Tests for all metrics. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: 473cae02955981eb3ce0a348f85a6bdd23457899 $ + * @version $Id$ * @since 0.23 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle VisibilityModifierCheck (500 lines) diff --git a/src/test/java/org/jpeek/ReportTest.java b/src/test/java/org/jpeek/ReportTest.java index f722792d..e6a0fb35 100644 --- a/src/test/java/org/jpeek/ReportTest.java +++ b/src/test/java/org/jpeek/ReportTest.java @@ -39,7 +39,7 @@ /** * Test case for {@link Report}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: 46f01c3c892964ce23da18ad766d18f364982c33 $ + * @version $Id$ * @since 0.4 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle ClassDataAbstractionCouplingCheck (500 lines) diff --git a/src/test/java/org/jpeek/ReportWithStatisticsTest.java b/src/test/java/org/jpeek/ReportWithStatisticsTest.java index d69cf94d..3844da59 100644 --- a/src/test/java/org/jpeek/ReportWithStatisticsTest.java +++ b/src/test/java/org/jpeek/ReportWithStatisticsTest.java @@ -35,7 +35,7 @@ /** * Test case for {@link ReportWithStatistics}. * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: cd48d531b54b75bcbb7d7300276380a36337f1be $ + * @version $Id$ * @since 0.19 * @checkstyle JavadocMethodCheck (500 lines) * @checkstyle JavadocTagsCheck (500 lines) From f36123d91a53ba8adc6e4ca921bfd65c2a4035e4 Mon Sep 17 00:00:00 2001 From: Hamdi Douss Date: Mon, 17 Feb 2020 22:19:13 +0100 Subject: [PATCH 3/7] #323 remove version id --- src/test/java/org/jpeek/package-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/jpeek/package-info.java b/src/test/java/org/jpeek/package-info.java index a48ebb4c..d76d7caf 100644 --- a/src/test/java/org/jpeek/package-info.java +++ b/src/test/java/org/jpeek/package-info.java @@ -26,7 +26,7 @@ * Tests. * * @author Yegor Bugayenko (yegor256@gmail.com) - * @version $Id: 5f32b906da657837e39669980f837afea3dc7a9e $ + * @version $Id$ * @since 0.1 * @todo #323:30min Migrate the tests in the sub-packages: org.jpeek.metrics, * org.jpeek.skeleton and org.jpeek.web to junit 5, so they won't From 91d3487954cd3e5cb65c85a33da21e018fb3822c Mon Sep 17 00:00:00 2001 From: Hamdi Douss Date: Mon, 17 Feb 2020 23:04:51 +0100 Subject: [PATCH 4/7] #323 run junit5 tests alongside junit4 tests --- pom.xml | 11 +++++++++++ src/test/java/org/jpeek/MainTest.java | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9547955..d6485f62 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,12 @@ SOFTWARE. 5.5.2 test + + org.junit.vintage + junit-vintage-engine + 5.5.2 + test + @@ -247,6 +253,11 @@ SOFTWARE. + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + diff --git a/src/test/java/org/jpeek/MainTest.java b/src/test/java/org/jpeek/MainTest.java index 5dc0ed51..cb1f2b8b 100644 --- a/src/test/java/org/jpeek/MainTest.java +++ b/src/test/java/org/jpeek/MainTest.java @@ -64,7 +64,7 @@ public void crashesIfInvalidInput() throws IOException { () -> { Main.main("hello"); return null; - }, new Throws<>("", ParameterException.class) + }, new Throws<>(ParameterException.class) ).affirm(); } @@ -79,7 +79,7 @@ public void crashesIfNoOverwriteAndTargetExists() throws IOException { "--target", target.toString() ); return null; - }, new Throws<>("", IllegalStateException.class) + }, new Throws<>(IllegalStateException.class) ).affirm(); } From 9e43678e785bdf4352fee48dfc35a6c57cc7f202 Mon Sep 17 00:00:00 2001 From: Hamdi Douss Date: Tue, 18 Feb 2020 03:58:04 +0100 Subject: [PATCH 5/7] #323 CR --- src/test/java/org/jpeek/MainTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/jpeek/MainTest.java b/src/test/java/org/jpeek/MainTest.java index cb1f2b8b..90a5422a 100644 --- a/src/test/java/org/jpeek/MainTest.java +++ b/src/test/java/org/jpeek/MainTest.java @@ -58,12 +58,12 @@ public void createsXmlReports() throws IOException { } @Test - public void crashesIfInvalidInput() throws IOException { + public void crashesIfInvalidInput() { new Assertion<>( "Must throw an exception if parameter is invalid", () -> { Main.main("hello"); - return null; + return ""; }, new Throws<>(ParameterException.class) ).affirm(); } @@ -78,7 +78,7 @@ public void crashesIfNoOverwriteAndTargetExists() throws IOException { "--sources", Paths.get(".").toString(), "--target", target.toString() ); - return null; + return ""; }, new Throws<>(IllegalStateException.class) ).affirm(); } From 8bf935cb34403f51ee89d569486d58bc1ecabb9e Mon Sep 17 00:00:00 2001 From: HDouss Date: Tue, 18 Feb 2020 14:06:49 +0100 Subject: [PATCH 6/7] fix puzzle formatting --- src/test/java/org/jpeek/package-info.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/jpeek/package-info.java b/src/test/java/org/jpeek/package-info.java index d76d7caf..be97bff7 100644 --- a/src/test/java/org/jpeek/package-info.java +++ b/src/test/java/org/jpeek/package-info.java @@ -29,8 +29,8 @@ * @version $Id$ * @since 0.1 * @todo #323:30min Migrate the tests in the sub-packages: org.jpeek.metrics, - * org.jpeek.skeleton and org.jpeek.web to junit 5, so they won't - * import any classes from junit 4 anymore. Then, we should find a way to - * exclude junit 4 from project dependecy, so they won't be imported anymore. + * org.jpeek.skeleton and org.jpeek.web to junit 5, so they won't + * import any classes from junit 4 anymore. Then, we should find a way to + * exclude junit 4 from project dependecy, so they won't be imported anymore. */ package org.jpeek; From 37d6b954d13c11672361a79a07fe2c0618a27eab Mon Sep 17 00:00:00 2001 From: HDouss Date: Tue, 18 Feb 2020 15:04:54 +0100 Subject: [PATCH 7/7] Enrich puzzle wording --- src/test/java/org/jpeek/MetricsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jpeek/MetricsTest.java b/src/test/java/org/jpeek/MetricsTest.java index 1a84a81c..a623fc33 100644 --- a/src/test/java/org/jpeek/MetricsTest.java +++ b/src/test/java/org/jpeek/MetricsTest.java @@ -55,8 +55,8 @@ * the result should be {@code 1d}. Also, all classes without transitive * relations should have the same LCC metric as TCC metric. Before do it we have * to fix puzzles in LCC.xml. - * @todo #323:30min Migrate this parametrized test to junit 5, so it won't - * import any classes from junit 4 anymore. + * @todo #323:30min This test is fully written against JUnit 4 API. + * Migrate this parametrized test to junit 5, so it won't import any classes from junit 4 anymore. * @checkstyle JavadocTagsCheck (500 lines) */ @RunWith(Parameterized.class)