Skip to content

Commit

Permalink
Use String instead of TestId to represent unique IDs of TestIdentifiers
Browse files Browse the repository at this point in the history 
Fixes #189.
  • Loading branch information
@marcphilipp
marcphilipp committed Mar 14, 2016
1 parent fbf36ff commit 442657b
Show file tree
Hide file tree
Showing 12 changed files with 66 additions and 123 deletions.
55 changes: 0 additions & 55 deletions junit-launcher/src/main/java/org/junit/gen5/launcher/TestId.java
View file

This file was deleted.

16 changes: 8 additions & 8 deletions junit-launcher/src/main/java/org/junit/gen5/launcher/TestIdentifier.java
View file
Expand Up @@ -36,30 +36,30 @@ public final class TestIdentifier implements Serializable {


private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


private final TestId uniqueId; private final String uniqueId;
private final String name; private final String name;
private final String displayName; private final String displayName;
private final TestSource source; private final TestSource source;
private final Set<TestTag> tags; private final Set<TestTag> tags;
private final boolean test; private final boolean test;
private final boolean container; private final boolean container;
private final TestId parentId; private final String parentId;


public static TestIdentifier from(TestDescriptor testDescriptor) { public static TestIdentifier from(TestDescriptor testDescriptor) {
// TODO Use Flyweight Pattern for TestId? // TODO Use Flyweight Pattern for TestId?
TestId uniqueId = new TestId(testDescriptor.getUniqueId()); String uniqueId = testDescriptor.getUniqueId();
String name = testDescriptor.getName(); String name = testDescriptor.getName();
String displayName = testDescriptor.getDisplayName(); String displayName = testDescriptor.getDisplayName();
Optional<TestSource> source = testDescriptor.getSource(); Optional<TestSource> source = testDescriptor.getSource();
Set<TestTag> tags = testDescriptor.getTags(); Set<TestTag> tags = testDescriptor.getTags();
boolean test = testDescriptor.isTest(); boolean test = testDescriptor.isTest();
boolean container = !test || !testDescriptor.getChildren().isEmpty(); boolean container = !test || !testDescriptor.getChildren().isEmpty();
Optional<TestId> parentId = testDescriptor.getParent().map(TestDescriptor::getUniqueId).map(TestId::new); Optional<String> parentId = testDescriptor.getParent().map(TestDescriptor::getUniqueId);
return new TestIdentifier(uniqueId, name, displayName, source, tags, test, container, parentId); return new TestIdentifier(uniqueId, name, displayName, source, tags, test, container, parentId);
} }


private TestIdentifier(TestId uniqueId, String name, String displayName, Optional<TestSource> source, private TestIdentifier(String uniqueId, String name, String displayName, Optional<TestSource> source,
Set<TestTag> tags, boolean test, boolean container, Optional<TestId> parentId) { Set<TestTag> tags, boolean test, boolean container, Optional<String> parentId) {
this.uniqueId = uniqueId; this.uniqueId = uniqueId;
this.name = name; this.name = name;
this.displayName = displayName; this.displayName = displayName;
Expand All @@ -77,7 +77,7 @@ private TestIdentifier(TestId uniqueId, String name, String displayName, Optiona
* {@linkplain TestPlan test plan}, regardless of how many engines are used * {@linkplain TestPlan test plan}, regardless of how many engines are used
* behind the scenes. * behind the scenes.
*/ */
public TestId getUniqueId() { public String getUniqueId() {
return uniqueId; return uniqueId;
} }


Expand Down Expand Up @@ -141,7 +141,7 @@ public Set<TestTag> getTags() {
* *
* <p>An identifier without a parent ID is called a <em>root</em>. * <p>An identifier without a parent ID is called a <em>root</em>.
*/ */
public Optional<TestId> getParentId() { public Optional<String> getParentId() {
return Optional.ofNullable(parentId); return Optional.ofNullable(parentId);
} }


Expand Down
32 changes: 16 additions & 16 deletions junit-launcher/src/main/java/org/junit/gen5/launcher/TestPlan.java
View file
Expand Up @@ -53,8 +53,8 @@
public final class TestPlan { public final class TestPlan {


private final Set<TestIdentifier> roots = new LinkedHashSet<>(); private final Set<TestIdentifier> roots = new LinkedHashSet<>();
private final Map<TestId, LinkedHashSet<TestIdentifier>> children = new LinkedHashMap<>(); private final Map<String, LinkedHashSet<TestIdentifier>> children = new LinkedHashMap<>();
private final Map<TestId, TestIdentifier> allIdentifiers = new LinkedHashMap<>(); private final Map<String, TestIdentifier> allIdentifiers = new LinkedHashMap<>();


public static TestPlan from(Collection<TestDescriptor> engineDescriptors) { public static TestPlan from(Collection<TestDescriptor> engineDescriptors) {
TestPlan testPlan = new TestPlan(); TestPlan testPlan = new TestPlan();
Expand All @@ -74,7 +74,7 @@ private TestPlan() {
public void add(TestIdentifier testIdentifier) { public void add(TestIdentifier testIdentifier) {
allIdentifiers.put(testIdentifier.getUniqueId(), testIdentifier); allIdentifiers.put(testIdentifier.getUniqueId(), testIdentifier);
if (testIdentifier.getParentId().isPresent()) { if (testIdentifier.getParentId().isPresent()) {
TestId parentId = testIdentifier.getParentId().get(); String parentId = testIdentifier.getParentId().get();
Set<TestIdentifier> directChildren = children.computeIfAbsent(parentId, key -> new LinkedHashSet<>()); Set<TestIdentifier> directChildren = children.computeIfAbsent(parentId, key -> new LinkedHashSet<>());
directChildren.add(testIdentifier); directChildren.add(testIdentifier);
} }
Expand All @@ -99,7 +99,7 @@ public Set<TestIdentifier> getRoots() {
* @return an {@code Optional} containing the parent, if present * @return an {@code Optional} containing the parent, if present
*/ */
public Optional<TestIdentifier> getParent(TestIdentifier child) { public Optional<TestIdentifier> getParent(TestIdentifier child) {
Optional<TestId> optionalParentId = child.getParentId(); Optional<String> optionalParentId = child.getParentId();
if (optionalParentId.isPresent()) { if (optionalParentId.isPresent()) {
return Optional.of(getTestIdentifier(optionalParentId.get())); return Optional.of(getTestIdentifier(optionalParentId.get()));
} }
Expand All @@ -111,35 +111,35 @@ public Optional<TestIdentifier> getParent(TestIdentifier child) {
* *
* @param parent the identifier to look up the children for * @param parent the identifier to look up the children for
* @return an unmodifiable set of the parent's children, potentially empty * @return an unmodifiable set of the parent's children, potentially empty
* @see #getChildren(TestId) * @see #getChildren(String)
*/ */
public Set<TestIdentifier> getChildren(TestIdentifier parent) { public Set<TestIdentifier> getChildren(TestIdentifier parent) {
return getChildren(parent.getUniqueId()); 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 * @param parentId the ID to look up the children for
* @return an unmodifiable set of the parent's children, potentially empty * @return an unmodifiable set of the parent's children, potentially empty
* @see #getChildren(TestIdentifier) * @see #getChildren(TestIdentifier)
*/ */
public Set<TestIdentifier> getChildren(TestId parentId) { public Set<TestIdentifier> getChildren(String parentId) {
return children.containsKey(parentId) ? unmodifiableSet(children.get(parentId)) : emptySet(); 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 * @param uniqueId the unique ID to look up the identifier for
* @return the identifier with the specified unique ID * @return the identifier with the supplied unique ID
* @throws PreconditionViolationException if no {@code TestIdentifier} * @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 { public TestIdentifier getTestIdentifier(String uniqueId) throws PreconditionViolationException {
Preconditions.condition(allIdentifiers.containsKey(testId), Preconditions.condition(allIdentifiers.containsKey(uniqueId),
() -> "No TestIdentifier with this TestId has been added to this TestPlan: " + testId); () -> "No TestIdentifier with this unique ID has been added to this TestPlan: " + uniqueId);
return allIdentifiers.get(testId); return allIdentifiers.get(uniqueId);
} }


/** /**
Expand All @@ -148,7 +148,7 @@ public TestIdentifier getTestIdentifier(TestId testId) throws PreconditionViolat
* *
* @param predicate a predicate which returns {@code true} for identifiers * @param predicate a predicate which returns {@code true} for identifiers
* to be counted * 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<? super TestIdentifier> predicate) { public long countTestIdentifiers(Predicate<? super TestIdentifier> predicate) {
return allIdentifiers.values().stream().filter(predicate).count(); return allIdentifiers.values().stream().filter(predicate).count();
Expand Down
3 changes: 1 addition & 2 deletions junit-launcher/src/main/java/org/junit/gen5/launcher/main/ExecutionListenerAdapter.java
View file
Expand Up @@ -15,7 +15,6 @@
import org.junit.gen5.engine.TestExecutionResult; import org.junit.gen5.engine.TestExecutionResult;
import org.junit.gen5.engine.reporting.ReportEntry; import org.junit.gen5.engine.reporting.ReportEntry;
import org.junit.gen5.launcher.TestExecutionListener; import org.junit.gen5.launcher.TestExecutionListener;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestIdentifier;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;


Expand Down Expand Up @@ -57,7 +56,7 @@ public void reportingEntryPublished(TestDescriptor testDescriptor, ReportEntry e
} }


private TestIdentifier getTestIdentifier(TestDescriptor testDescriptor) { private TestIdentifier getTestIdentifier(TestDescriptor testDescriptor) {
return testPlan.getTestIdentifier(new TestId(testDescriptor.getUniqueId())); return testPlan.getTestIdentifier(testDescriptor.getUniqueId());
} }


} }
11 changes: 5 additions & 6 deletions junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportDataTests.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.junit.gen5.engine.TestExecutionResult; import org.junit.gen5.engine.TestExecutionResult;
import org.junit.gen5.engine.UniqueId; import org.junit.gen5.engine.UniqueId;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;


class XmlReportDataTests { class XmlReportDataTests {
Expand All @@ -35,7 +34,7 @@ void resultOfTestIdentifierWithoutAnyReportedEventsIsEmpty() {
TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));


XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("test"));


assertThat(result).isEmpty(); assertThat(result).isEmpty();
} }
Expand All @@ -48,9 +47,9 @@ void resultOfTestIdentifierWithoutReportedEventsIsFailureOfAncestor() {


XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
TestExecutionResult failureOfAncestor = failed(new RuntimeException("failed!")); TestExecutionResult failureOfAncestor = failed(new RuntimeException("failed!"));
reportData.markFinished(testPlan.getTestIdentifier(new TestId("[engine:engine]")), failureOfAncestor); reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), failureOfAncestor);


Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("test"));


assertThat(result).contains(failureOfAncestor); assertThat(result).contains(failureOfAncestor);
} }
Expand All @@ -62,9 +61,9 @@ void resultOfTestIdentifierWithoutReportedEventsIsEmptyWhenAncestorWasSuccessful
TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));


XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
reportData.markFinished(testPlan.getTestIdentifier(new TestId("[engine:engine]")), successful()); reportData.markFinished(testPlan.getTestIdentifier("[engine:engine]"), successful());


Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier(new TestId("test"))); Optional<TestExecutionResult> result = reportData.getResult(testPlan.getTestIdentifier("test"));


assertThat(result).isEmpty(); assertThat(result).isEmpty();
} }
Expand Down
8 changes: 3 additions & 5 deletions junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportWriterTests.java
View file
Expand Up @@ -23,7 +23,6 @@
import org.junit.gen5.engine.TestDescriptorStub; import org.junit.gen5.engine.TestDescriptorStub;
import org.junit.gen5.engine.UniqueId; import org.junit.gen5.engine.UniqueId;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;


class XmlReportWriterTests { class XmlReportWriterTests {
Expand Down Expand Up @@ -54,7 +53,7 @@ void writesEmptySkippedElementForSkippedTestWithoutReason() throws Exception {


TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); 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(); StringWriter out = new StringWriter();
new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out);
Expand All @@ -76,7 +75,7 @@ void writesEmptyErrorElementForFailedTestWithoutCause() throws Exception {


TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); 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(); StringWriter out = new StringWriter();
new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out);
Expand All @@ -98,8 +97,7 @@ void omitsMessageAttributeForFailedTestWithThrowableWithoutMessage() throws Exce


TestPlan testPlan = TestPlan.from(singleton(engineDescriptor)); TestPlan testPlan = TestPlan.from(singleton(engineDescriptor));
XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone()); XmlReportData reportData = new XmlReportData(testPlan, Clock.systemDefaultZone());
reportData.markFinished(testPlan.getTestIdentifier(new TestId("failedTest")), reportData.markFinished(testPlan.getTestIdentifier("failedTest"), failed(new NullPointerException()));
failed(new NullPointerException()));


StringWriter out = new StringWriter(); StringWriter out = new StringWriter();
new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out); new XmlReportWriter(reportData).writeXmlReport(getOnlyElement(testPlan.getRoots()), out);
Expand Down
5 changes: 2 additions & 3 deletions junit-tests/src/test/java/org/junit/gen5/console/tasks/XmlReportsWritingListenerTests.java
View file
Expand Up @@ -51,7 +51,6 @@
import org.junit.gen5.engine.support.hierarchical.DummyTestDescriptor; import org.junit.gen5.engine.support.hierarchical.DummyTestDescriptor;
import org.junit.gen5.engine.support.hierarchical.DummyTestEngine; import org.junit.gen5.engine.support.hierarchical.DummyTestEngine;
import org.junit.gen5.launcher.Launcher; import org.junit.gen5.launcher.Launcher;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestIdentifier;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;
import org.opentest4j.AssertionFailedError; import org.opentest4j.AssertionFailedError;
Expand Down Expand Up @@ -354,15 +353,15 @@ void writesReportEntriesToSystemOutElement(@Root Path tempDirectory, TestReporte
new PrintWriter(out)); new PrintWriter(out));


listener.testPlanExecutionStarted(testPlan); listener.testPlanExecutionStarted(testPlan);
TestIdentifier testIdentifier = testPlan.getTestIdentifier(new TestId("test")); TestIdentifier testIdentifier = testPlan.getTestIdentifier("test");
listener.executionStarted(testIdentifier); listener.executionStarted(testIdentifier);
listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar")); listener.reportingEntryPublished(testIdentifier, ReportEntry.from("foo", "bar"));
Map<String, String> map = new LinkedHashMap<>(); Map<String, String> map = new LinkedHashMap<>();
map.put("bar", "baz"); map.put("bar", "baz");
map.put("qux", "foo"); map.put("qux", "foo");
listener.reportingEntryPublished(testIdentifier, ReportEntry.from(map)); listener.reportingEntryPublished(testIdentifier, ReportEntry.from(map));
listener.executionFinished(testIdentifier, successful()); 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")); String content = readValidXmlFile(tempDirectory.resolve("TEST-engine.xml"));
//testReporter.publishEntry("xml", content); //testReporter.publishEntry("xml", content);
Expand Down
5 changes: 2 additions & 3 deletions junit-tests/src/test/java/org/junit/gen5/junit4/runner/JUnit5Tests.java
View file
Expand Up @@ -52,7 +52,6 @@
import org.junit.gen5.launcher.Launcher; import org.junit.gen5.launcher.Launcher;
import org.junit.gen5.launcher.PostDiscoveryFilter; import org.junit.gen5.launcher.PostDiscoveryFilter;
import org.junit.gen5.launcher.TestDiscoveryRequest; import org.junit.gen5.launcher.TestDiscoveryRequest;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runner.manipulation.NoTestsRemainException; import org.junit.runner.manipulation.NoTestsRemainException;
Expand Down Expand Up @@ -342,11 +341,11 @@ void reportsIgnoredEventsForLeafsWhenContainerIsSkipped() throws Exception {
} }


private static Description suiteDescription(String uniqueId) { private static Description suiteDescription(String uniqueId) {
return createSuiteDescription(uniqueId, new TestId(uniqueId)); return createSuiteDescription(uniqueId, uniqueId);
} }


private static Description testDescription(String uniqueId) { private static Description testDescription(String uniqueId) {
return createTestDescription(uniqueId, uniqueId, new TestId(uniqueId)); return createTestDescription(uniqueId, uniqueId, uniqueId);
} }


private TestDescriptor testDescriptorWithTag(String tag) { private TestDescriptor testDescriptorWithTag(String tag) {
Expand Down
2 changes: 1 addition & 1 deletion junit-tests/src/test/java/org/junit/gen5/launcher/TestIdentifierTests.java
View file
Expand Up @@ -24,7 +24,7 @@ public void inheritsIdAndNamesFromDescriptor() {


TestIdentifier testIdentifier = TestIdentifier.from(testDescriptor); TestIdentifier testIdentifier = TestIdentifier.from(testDescriptor);


assertEquals(new TestId("uniqueId"), testIdentifier.getUniqueId()); assertEquals("uniqueId", testIdentifier.getUniqueId());
assertEquals("displayName", testIdentifier.getDisplayName()); assertEquals("displayName", testIdentifier.getDisplayName());
assertEquals("name", testIdentifier.getName()); assertEquals("name", testIdentifier.getName());
} }
Expand Down
13 changes: 6 additions & 7 deletions junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java
View file
Expand Up @@ -26,7 +26,6 @@
import org.junit.gen5.engine.support.hierarchical.DummyTestEngine; import org.junit.gen5.engine.support.hierarchical.DummyTestEngine;
import org.junit.gen5.launcher.PostDiscoveryFilter; import org.junit.gen5.launcher.PostDiscoveryFilter;
import org.junit.gen5.launcher.PostDiscoveryFilterStub; import org.junit.gen5.launcher.PostDiscoveryFilterStub;
import org.junit.gen5.launcher.TestId;
import org.junit.gen5.launcher.TestIdentifier; import org.junit.gen5.launcher.TestIdentifier;
import org.junit.gen5.launcher.TestPlan; import org.junit.gen5.launcher.TestPlan;


Expand Down Expand Up @@ -74,7 +73,7 @@ void discoverTestPlanForSingleEngine() {
assertThat(testPlan.getRoots()).hasSize(1); assertThat(testPlan.getRoots()).hasSize(1);
TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next(); TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(2); assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(2);
assertThat(testPlan.getChildren(new TestId("[engine:myEngine]"))).hasSize(2); assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(2);
} }


@Test @Test
Expand All @@ -90,8 +89,8 @@ void discoverTestPlanForMultipleEngines() {
request().select(forUniqueId(test1.getUniqueId()), forUniqueId(test2.getUniqueId())).build()); request().select(forUniqueId(test1.getUniqueId()), forUniqueId(test2.getUniqueId())).build());


assertThat(testPlan.getRoots()).hasSize(2); assertThat(testPlan.getRoots()).hasSize(2);
assertThat(testPlan.getChildren(new TestId("[engine:engine1]"))).hasSize(1); assertThat(testPlan.getChildren("[engine:engine1]")).hasSize(1);
assertThat(testPlan.getChildren(new TestId("[engine:engine2]"))).hasSize(1); assertThat(testPlan.getChildren("[engine:engine2]")).hasSize(1);
} }


@Test @Test
Expand All @@ -110,7 +109,7 @@ void launcherWillNotCallEnginesThatAreFilteredByAnEngineIdFilter() {
assertThat(testPlan.getRoots()).hasSize(1); assertThat(testPlan.getRoots()).hasSize(1);
TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next(); TestIdentifier rootIdentifier = testPlan.getRoots().iterator().next();
assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1); assertThat(testPlan.getChildren(rootIdentifier.getUniqueId())).hasSize(1);
assertThat(testPlan.getChildren(new TestId("[engine:first]"))).hasSize(1); assertThat(testPlan.getChildren("[engine:first]")).hasSize(1);
} }


@Test @Test
Expand All @@ -132,8 +131,8 @@ void launcherAppliesPostDiscoveryFilters() {
.filter(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) // .filter(includeWithUniqueIdContainsTest, includeWithUniqueIdContains1) //
.build()); .build());


assertThat(testPlan.getChildren(new TestId("[engine:myEngine]"))).hasSize(1); assertThat(testPlan.getChildren("[engine:myEngine]")).hasSize(1);
assertThat(testPlan.getTestIdentifier(new TestId(test1.getUniqueId()))).isNotNull(); assertThat(testPlan.getTestIdentifier(test1.getUniqueId())).isNotNull();
} }


private static Runnable noOp() { private static Runnable noOp() {
Expand Down

0 comments on commit 442657b

Please sign in to comment.