diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestId.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestId.java deleted file mode 100644 index 50d480c3ac4..00000000000 --- a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestId.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2015-2016 the original author or authors. - * - * All rights reserved. This program and the accompanying materials are - * made available under the terms of the Eclipse Public License v1.0 which - * accompanies this distribution and is available at - * - * http://www.eclipse.org/legal/epl-v10.html - */ - -package org.junit.gen5.launcher; - -import static org.junit.gen5.commons.meta.API.Usage.Experimental; - -import java.io.Serializable; -import java.util.Objects; - -import org.junit.gen5.commons.meta.API; -import org.junit.gen5.commons.util.Preconditions; - -/** - * Immutable value object representing a unique test ID. - * - * @since 5.0 - */ -@API(Experimental) -public final class TestId implements Serializable { - - private static final long serialVersionUID = 1L; - - private final String uniqueId; - - public TestId(String uniqueId) { - this.uniqueId = Preconditions.notBlank(uniqueId, "uniqueId must not be null or empty"); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof TestId) { - TestId that = (TestId) obj; - return Objects.equals(this.uniqueId, that.uniqueId); - } - return false; - } - - @Override - public int hashCode() { - return this.uniqueId.hashCode(); - } - - @Override - public String toString() { - return this.uniqueId; - } -} diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestIdentifier.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestIdentifier.java index 8f8efe0c5b0..da8bf2543eb 100644 --- a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestIdentifier.java +++ b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestIdentifier.java @@ -36,30 +36,30 @@ public final class TestIdentifier implements Serializable { private static final long serialVersionUID = 1L; - private final TestId uniqueId; + private final String uniqueId; private final String name; private final String displayName; private final TestSource source; private final Set tags; private final boolean test; private final boolean container; - private final TestId parentId; + private final String parentId; public static TestIdentifier from(TestDescriptor testDescriptor) { // TODO Use Flyweight Pattern for TestId? - TestId uniqueId = new TestId(testDescriptor.getUniqueId()); + String uniqueId = testDescriptor.getUniqueId(); String name = testDescriptor.getName(); String displayName = testDescriptor.getDisplayName(); Optional source = testDescriptor.getSource(); Set tags = testDescriptor.getTags(); boolean test = testDescriptor.isTest(); boolean container = !test || !testDescriptor.getChildren().isEmpty(); - Optional parentId = testDescriptor.getParent().map(TestDescriptor::getUniqueId).map(TestId::new); + Optional parentId = testDescriptor.getParent().map(TestDescriptor::getUniqueId); return new TestIdentifier(uniqueId, name, displayName, source, tags, test, container, parentId); } - private TestIdentifier(TestId uniqueId, String name, String displayName, Optional source, - Set tags, boolean test, boolean container, Optional parentId) { + private TestIdentifier(String uniqueId, String name, String displayName, Optional source, + Set tags, boolean test, boolean container, Optional parentId) { this.uniqueId = uniqueId; this.name = name; this.displayName = displayName; @@ -77,7 +77,7 @@ private TestIdentifier(TestId uniqueId, String name, String displayName, Optiona * {@linkplain TestPlan test plan}, regardless of how many engines are used * behind the scenes. */ - public TestId getUniqueId() { + public String getUniqueId() { return uniqueId; } @@ -141,7 +141,7 @@ public Set getTags() { * *

An identifier without a parent ID is called a root. */ - public Optional getParentId() { + public Optional getParentId() { return Optional.ofNullable(parentId); } diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java index 4ed8db69098..6f94cf641bc 100644 --- a/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java +++ b/junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java @@ -53,8 +53,8 @@ public final class TestPlan { private final Set roots = new LinkedHashSet<>(); - private final Map> children = new LinkedHashMap<>(); - private final Map allIdentifiers = new LinkedHashMap<>(); + private final Map> children = new LinkedHashMap<>(); + private final Map allIdentifiers = new LinkedHashMap<>(); public static TestPlan from(Collection engineDescriptors) { TestPlan testPlan = new TestPlan(); @@ -74,7 +74,7 @@ private TestPlan() { public void add(TestIdentifier testIdentifier) { allIdentifiers.put(testIdentifier.getUniqueId(), testIdentifier); if (testIdentifier.getParentId().isPresent()) { - TestId parentId = testIdentifier.getParentId().get(); + String parentId = testIdentifier.getParentId().get(); Set directChildren = children.computeIfAbsent(parentId, key -> new LinkedHashSet<>()); directChildren.add(testIdentifier); } @@ -99,7 +99,7 @@ public Set getRoots() { * @return an {@code Optional} containing the parent, if present */ public Optional getParent(TestIdentifier child) { - Optional optionalParentId = child.getParentId(); + Optional optionalParentId = child.getParentId(); if (optionalParentId.isPresent()) { return Optional.of(getTestIdentifier(optionalParentId.get())); } @@ -111,35 +111,35 @@ public Optional getParent(TestIdentifier child) { * * @param parent the identifier to look up the children for * @return an unmodifiable set of the parent's children, potentially empty - * @see #getChildren(TestId) + * @see #getChildren(String) */ public Set getChildren(TestIdentifier parent) { return getChildren(parent.getUniqueId()); } /** - * Get the children of the supplied {@link TestId}. + * Get the children of the supplied unique ID. * * @param parentId the ID to look up the children for * @return an unmodifiable set of the parent's children, potentially empty * @see #getChildren(TestIdentifier) */ - public Set getChildren(TestId parentId) { + public Set getChildren(String parentId) { return children.containsKey(parentId) ? unmodifiableSet(children.get(parentId)) : emptySet(); } /** - * Get the {@link TestIdentifier} with the specified {@link TestId}. + * Get the {@link TestIdentifier} with the supplied unique ID. * - * @param testId the unique ID to look up the identifier for - * @return the identifier with the specified unique ID + * @param uniqueId the unique ID to look up the identifier for + * @return the identifier with the supplied unique ID * @throws PreconditionViolationException if no {@code TestIdentifier} - * with the specified unique ID is present in this test plan + * with the supplied unique ID is present in this test plan */ - public TestIdentifier getTestIdentifier(TestId testId) throws PreconditionViolationException { - Preconditions.condition(allIdentifiers.containsKey(testId), - () -> "No TestIdentifier with this TestId has been added to this TestPlan: " + testId); - return allIdentifiers.get(testId); + public TestIdentifier getTestIdentifier(String uniqueId) throws PreconditionViolationException { + Preconditions.condition(allIdentifiers.containsKey(uniqueId), + () -> "No TestIdentifier with this unique ID has been added to this TestPlan: " + uniqueId); + return allIdentifiers.get(uniqueId); } /** @@ -148,7 +148,7 @@ public TestIdentifier getTestIdentifier(TestId testId) throws PreconditionViolat * * @param predicate a predicate which returns {@code true} for identifiers * to be counted - * @return the number of identifiers that satisfy the specified predicate + * @return the number of identifiers that satisfy the supplied predicate */ public long countTestIdentifiers(Predicate predicate) { return allIdentifiers.values().stream().filter(predicate).count(); diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java index 998f3ad2bd0..ebdf535adfe 100644 --- a/junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java +++ b/junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java @@ -15,7 +15,6 @@ import org.junit.gen5.engine.TestExecutionResult; import org.junit.gen5.engine.reporting.ReportEntry; import org.junit.gen5.launcher.TestExecutionListener; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestPlan; @@ -57,7 +56,7 @@ public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry e } private TestIdentifier getTestIdentifier(TestDescriptor testDescriptor) { - return testPlan.getTestIdentifier(new TestId(testDescriptor.getUniqueId())); + return testPlan.getTestIdentifier(testDescriptor.getUniqueId()); } } diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportDataTests.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportDataTests.java index c48ab8c2e3b..12586a45e50 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportDataTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportDataTests.java @@ -23,7 +23,6 @@ import org.junit.gen5.engine.TestExecutionResult; import org.junit.gen5.engine.UniqueId; import org.junit.gen5.engine.support.descriptor.EngineDescriptor; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestPlan; class XmlReportDataTests { @@ -35,7 +34,7 @@ void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() { TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); - Optional result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); + Optional result = reportData.getResult(testPlan.getTestIdentifier("test")); assertThat(result).isEmpty(); } @@ -48,9 +47,9 @@ void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() { XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); TestExecutionResult failureOfAncestor = failed(new RuntimeException("failed!")); - reportData.markFinished(testPlan.getTestIdentifier(new TestId("[engine:engine]")), failureOfAncestor); + reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), failureOfAncestor); - Optional result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); + Optional result = reportData.getResult(testPlan.getTestIdentifier("test")); assertThat(result).contains(failureOfAncestor); } @@ -62,9 +61,9 @@ void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); - reportData.markFinished(testPlan.getTestIdentifier(new TestId("[engine:engine]")), successful()); + reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful()); - Optional result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); + Optional result = reportData.getResult(testPlan.getTestIdentifier("test")); assertThat(result).isEmpty(); } diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportWriterTests.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportWriterTests.java index e77b5220996..7a63e3bb61b 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportWriterTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportWriterTests.java @@ -23,7 +23,6 @@ import org.junit.gen5.engine.TestDescriptorStub; import org.junit.gen5.engine.UniqueId; import org.junit.gen5.engine.support.descriptor.EngineDescriptor; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestPlan; class XmlReportWriterTests { @@ -54,7 +53,7 @@ void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception { TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); - reportData.markSkipped(testPlan.getTestIdentifier(new TestId("skippedTest")), null); + reportData.markSkipped(testPlan.getTestIdentifier("skippedTest"), null); StringWriter out = new StringWriter(); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); @@ -76,7 +75,7 @@ void writesEmptyErrorElementForFailedTestWithoutCause() throws Exception { TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); - reportData.markFinished(testPlan.getTestIdentifier(new TestId("failedTest")), failed(null)); + reportData.markFinished(testPlan.getTestIdentifier("failedTest"), failed(null)); StringWriter out = new StringWriter(); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); @@ -98,8 +97,7 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); - reportData.markFinished(testPlan.getTestIdentifier(new TestId("failedTest")), - failed(new NullPointerException())); + reportData.markFinished(testPlan.getTestIdentifier("failedTest"), failed(new NullPointerException())); StringWriter out = new StringWriter(); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); diff --git a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportsWritingListenerTests.java b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportsWritingListenerTests.java index c0430f3ec29..3c332ff5745 100644 --- a/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportsWritingListenerTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportsWritingListenerTests.java @@ -51,7 +51,6 @@ import org.junit.gen5.engine.support.hierarchical.DummyTestDescriptor; import org.junit.gen5.engine.support.hierarchical.DummyTestEngine; import org.junit.gen5.launcher.Launcher; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestPlan; import org.opentest4j.AssertionFailedError; @@ -354,7 +353,7 @@ void writesReportEntriesToSystemOutElement(@Root Path tempDirectory, TestReporte new PrintWriter(out)); listener.testPlanExecutionStarted(testPlan); - TestIdentifier testIdentifier = testPlan.getTestIdentifier(new TestId("test")); + TestIdentifier testIdentifier = testPlan.getTestIdentifier("test"); listener.executionStarted(testIdentifier); listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar")); Map map = new LinkedHashMap<>(); @@ -362,7 +361,7 @@ void writesReportEntriesToSystemOutElement(@Root Path tempDirectory, TestReporte map.put("qux", "foo"); listener.reportingEntryPublished(testIdentifier, ReportEntry.from(map)); listener.executionFinished(testIdentifier, successful()); - listener.executionFinished(testPlan.getTestIdentifier(new TestId("[engine:engine]")), successful()); + listener.executionFinished(testPlan.getTestIdentifier("[engine:engine]"), successful()); String content = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml")); //testReporter.publishEntry("xml", content); diff --git a/junit-tests/src/test/java/org/junit/gen5/junit4/runner/JUnit5Tests.java b/junit-tests/src/test/java/org/junit/gen5/junit4/runner/JUnit5Tests.java index 5af3e2a3ccb..cbf00d7e69e 100644 --- a/junit-tests/src/test/java/org/junit/gen5/junit4/runner/JUnit5Tests.java +++ b/junit-tests/src/test/java/org/junit/gen5/junit4/runner/JUnit5Tests.java @@ -52,7 +52,6 @@ import org.junit.gen5.launcher.Launcher; import org.junit.gen5.launcher.PostDiscoveryFilter; import org.junit.gen5.launcher.TestDiscoveryRequest; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestPlan; import org.junit.runner.Description; import org.junit.runner.manipulation.NoTestsRemainException; @@ -342,11 +341,11 @@ void reportsIgnoredEventsForLeafsWhenContainerIsSkipped() throws Exception { } private static Description suiteDescription(String uniqueId) { - return createSuiteDescription(uniqueId, new TestId(uniqueId)); + return createSuiteDescription(uniqueId, uniqueId); } private static Description testDescription(String uniqueId) { - return createTestDescription(uniqueId, uniqueId, new TestId(uniqueId)); + return createTestDescription(uniqueId, uniqueId, uniqueId); } private TestDescriptor testDescriptorWithTag(String tag) { diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/TestIdentifierTests.java b/junit-tests/src/test/java/org/junit/gen5/launcher/TestIdentifierTests.java index e4735d288c7..80de705589f 100644 --- a/junit-tests/src/test/java/org/junit/gen5/launcher/TestIdentifierTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/launcher/TestIdentifierTests.java @@ -24,7 +24,7 @@ public void inheritsIdAndNamesFromDescriptor() { TestIdentifier testIdentifier = TestIdentifier.from(testDescriptor); - assertEquals(new TestId("uniqueId"), testIdentifier.getUniqueId()); + assertEquals("uniqueId", testIdentifier.getUniqueId()); assertEquals("displayName", testIdentifier.getDisplayName()); assertEquals("name", testIdentifier.getName()); } diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java b/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java index 71b54f56975..fdc823f84c9 100644 --- a/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java @@ -26,7 +26,6 @@ import org.junit.gen5.engine.support.hierarchical.DummyTestEngine; import org.junit.gen5.launcher.PostDiscoveryFilter; import org.junit.gen5.launcher.PostDiscoveryFilterStub; -import org.junit.gen5.launcher.TestId; import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestPlan; @@ -74,7 +73,7 @@ void discoverTestPlanForSingleEngine() { assertThat(testPlan.getRoots()).hasSize(1); TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next(); assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(2); - assertThat(testPlan.getChildren(new TestId("[engine:myEngine]"))).hasSize(2); + assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(2); } @Test @@ -90,8 +89,8 @@ void discoverTestPlanForMultipleEngines() { request().select(forUniqueId(test1.getUniqueId()), forUniqueId(test2.getUniqueId())).build()); assertThat(testPlan.getRoots()).hasSize(2); - assertThat(testPlan.getChildren(new TestId("[engine:engine1]"))).hasSize(1); - assertThat(testPlan.getChildren(new TestId("[engine:engine2]"))).hasSize(1); + assertThat(testPlan.getChildren("[engine:engine1]")).hasSize(1); + assertThat(testPlan.getChildren("[engine:engine2]")).hasSize(1); } @Test @@ -110,7 +109,7 @@ void launcherWillNotCallEnginesThatAreFilteredByAnEngineIdFilter() { assertThat(testPlan.getRoots()).hasSize(1); TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next(); assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1); - assertThat(testPlan.getChildren(new TestId("[engine:first]"))).hasSize(1); + assertThat(testPlan.getChildren("[engine:first]")).hasSize(1); } @Test @@ -132,8 +131,8 @@ void launcherAppliesPostDiscoveryFilters() { .filter(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) // .build()); - assertThat(testPlan.getChildren(new TestId("[engine:myEngine]"))).hasSize(1); - assertThat(testPlan.getTestIdentifier(new TestId(test1.getUniqueId()))).isNotNull(); + assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(1); + assertThat(testPlan.getTestIdentifier(test1.getUniqueId())).isNotNull(); } private static Runnable noOp() { diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/main/ExecutionListenerAdapterTests.java b/junit-tests/src/test/java/org/junit/gen5/launcher/main/ExecutionListenerAdapterTests.java index bca0c8fa0ac..b7e1b489de9 100644 --- a/junit-tests/src/test/java/org/junit/gen5/launcher/main/ExecutionListenerAdapterTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/launcher/main/ExecutionListenerAdapterTests.java @@ -10,17 +10,19 @@ package org.junit.gen5.launcher.main; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; -import java.lang.reflect.*; -import java.util.*; +import java.lang.reflect.Method; +import java.util.Collections; -import org.junit.gen5.api.*; -import org.junit.gen5.commons.util.*; +import org.junit.gen5.api.Test; +import org.junit.gen5.commons.util.ReflectionUtils; import org.junit.gen5.engine.UniqueId; -import org.junit.gen5.engine.junit5.descriptor.*; -import org.junit.gen5.engine.reporting.*; -import org.junit.gen5.launcher.*; +import org.junit.gen5.engine.junit5.descriptor.MethodTestDescriptor; +import org.junit.gen5.engine.reporting.ReportEntry; +import org.junit.gen5.launcher.TestExecutionListener; +import org.junit.gen5.launcher.TestIdentifier; +import org.junit.gen5.launcher.TestPlan; //TODO: test other adapter methods class ExecutionListenerAdapterTests { @@ -31,7 +33,7 @@ void testReportingEntryPublished() { //cannot mock final classes with mockito TestPlan testPlan = TestPlan.from(Collections.singleton(testDescriptor)); - TestIdentifier testIdentifier = testPlan.getTestIdentifier(new TestId(testDescriptor.getUniqueId())); + TestIdentifier testIdentifier = testPlan.getTestIdentifier(testDescriptor.getUniqueId()); //not yet spyable with mockito? -> https://github.com/mockito/mockito/issues/146 MockTestExecutionListener testExecutionListener = new MockTestExecutionListener(); diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryTests.java b/junit-tests/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryTests.java index fadad4276e0..66def0ec82d 100644 --- a/junit-tests/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryTests.java +++ b/junit-tests/src/test/java/org/junit/gen5/launcher/main/LauncherFactoryTests.java @@ -10,15 +10,19 @@ package org.junit.gen5.launcher.main; -import static java.util.stream.Collectors.*; -import static org.assertj.core.api.Assertions.*; -import static org.junit.gen5.engine.discovery.ClassSelector.*; -import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.*; +import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.gen5.engine.discovery.ClassSelector.forClass; +import static org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder.request; -import java.util.*; +import java.util.List; +import java.util.Set; -import org.junit.gen5.api.*; -import org.junit.gen5.launcher.*; +import org.junit.gen5.api.Test; +import org.junit.gen5.launcher.Launcher; +import org.junit.gen5.launcher.TestDiscoveryRequest; +import org.junit.gen5.launcher.TestIdentifier; +import org.junit.gen5.launcher.TestPlan; class LauncherFactoryTests { @@ -34,7 +38,6 @@ void testCreate() { // @formatter:off List ids = roots.stream() .map(TestIdentifier::getUniqueId) - .map(TestId::toString) .collect(toList()); // @formatter:on