Skip to content

Commit

Permalink
Remove EngineAwareTestDescriptor
Browse files Browse the repository at this point in the history 
Issue: #54
  • Loading branch information
@marcphilipp
marcphilipp committed Jan 18, 2016
1 parent 9da25e1 commit ab12dc8
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 50 deletions.
17 changes: 0 additions & 17 deletions junit-engine-api/src/main/java/org/junit/gen5/engine/EngineAwareTestDescriptor.java
View file

This file was deleted.

3 changes: 2 additions & 1 deletion junit-engine-api/src/main/java/org/junit/gen5/engine/TestEngine.java
View file
Expand Up @@ -14,11 +14,12 @@
* @since 5.0 * @since 5.0
*/ */
public interface TestEngine { public interface TestEngine {

default String getId() { default String getId() {
return getClass().getCanonicalName(); return getClass().getCanonicalName();
} }


EngineAwareTestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest); TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest);


void execute(ExecutionRequest request); void execute(ExecutionRequest request);
} }
4 changes: 1 addition & 3 deletions ...t-engine-api/src/main/java/org/junit/gen5/engine/support/descriptor/EngineDescriptor.java
View file
Expand Up @@ -10,13 +10,12 @@


package org.junit.gen5.engine.support.descriptor; package org.junit.gen5.engine.support.descriptor;


import org.junit.gen5.engine.EngineAwareTestDescriptor;
import org.junit.gen5.engine.TestEngine; import org.junit.gen5.engine.TestEngine;


/** /**
* @since 5.0 * @since 5.0
*/ */
public class EngineDescriptor extends AbstractTestDescriptor implements EngineAwareTestDescriptor { public class EngineDescriptor extends AbstractTestDescriptor {


private final TestEngine engine; private final TestEngine engine;


Expand Down Expand Up @@ -45,7 +44,6 @@ public boolean isContainer() {
return true; return true;
} }


@Override
public TestEngine getEngine() { public TestEngine getEngine() {
return engine; return engine;
} }
Expand Down
3 changes: 1 addition & 2 deletions junit-launcher/src/main/java/org/junit/gen5/launcher/Launcher.java
View file
Expand Up @@ -13,7 +13,6 @@
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;


import org.junit.gen5.engine.EngineAwareTestDescriptor;
import org.junit.gen5.engine.EngineExecutionListener; import org.junit.gen5.engine.EngineExecutionListener;
import org.junit.gen5.engine.ExecutionRequest; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.FilterResult; import org.junit.gen5.engine.FilterResult;
Expand Down Expand Up @@ -114,7 +113,7 @@ private Root discoverRoot(DiscoveryRequest discoveryRequest, String phase) {


LOG.fine(() -> String.format("Discovering tests during launcher %s phase in engine '%s'.", phase, LOG.fine(() -> String.format("Discovering tests during launcher %s phase in engine '%s'.", phase,
testEngine.getId())); testEngine.getId()));
EngineAwareTestDescriptor engineRoot = testEngine.discoverTests(discoveryRequest); TestDescriptor engineRoot = testEngine.discoverTests(discoveryRequest);
root.add(testEngine, engineRoot); root.add(testEngine, engineRoot);
} }
root.applyFilters(discoveryRequest); root.applyFilters(discoveryRequest);
Expand Down
7 changes: 4 additions & 3 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit5/AbstractJUnit5TestEngineTests.java
View file
Expand Up @@ -14,8 +14,9 @@
import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request; import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request;


import org.junit.gen5.api.BeforeEach; import org.junit.gen5.api.BeforeEach;
import org.junit.gen5.engine.*; import org.junit.gen5.engine.ExecutionEventRecorder;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.launcher.DiscoveryRequest; import org.junit.gen5.launcher.DiscoveryRequest;


/** /**
Expand All @@ -42,7 +43,7 @@ protected ExecutionEventRecorder executeTests(DiscoveryRequest request) {
return eventRecorder; return eventRecorder;
} }


protected EngineDescriptor discoverTests(DiscoveryRequest request) { protected TestDescriptor discoverTests(DiscoveryRequest request) {
return engine.discoverTests(request); return engine.discoverTests(request);
} }


Expand Down
11 changes: 5 additions & 6 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit5/DiscoveryTests.java
View file
Expand Up @@ -12,7 +12,6 @@


import static org.junit.gen5.api.Assertions.assertEquals; import static org.junit.gen5.api.Assertions.assertEquals;
import static org.junit.gen5.engine.discovery.ClassSelector.forClass; import static org.junit.gen5.engine.discovery.ClassSelector.forClass;
import static org.junit.gen5.engine.discovery.MethodSelector.forMethod;
import static org.junit.gen5.engine.discovery.UniqueIdSelector.forUniqueId; import static org.junit.gen5.engine.discovery.UniqueIdSelector.forUniqueId;
import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request; import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request;


Expand All @@ -21,8 +20,8 @@
import java.lang.reflect.Method; import java.lang.reflect.Method;


import org.junit.gen5.api.Test; import org.junit.gen5.api.Test;
import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.discovery.MethodSelector; import org.junit.gen5.engine.discovery.MethodSelector;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
import org.junit.gen5.launcher.DiscoveryRequest; import org.junit.gen5.launcher.DiscoveryRequest;


/** /**
Expand All @@ -35,15 +34,15 @@ public class DiscoveryTests extends AbstractJUnit5TestEngineTests {
@Test @Test
public void discoverTestClass() { public void discoverTestClass() {
DiscoveryRequest request = request().select(forClass(LocalTestCase.class)).build(); DiscoveryRequest request = request().select(forClass(LocalTestCase.class)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


@Test @Test
public void discoverByUniqueId() { public void discoverByUniqueId() {
DiscoveryRequest request = request().select( DiscoveryRequest request = request().select(
forUniqueId("junit5:org.junit.gen5.engine.junit5.DiscoveryTests$LocalTestCase#test1()")).build(); forUniqueId("junit5:org.junit.gen5.engine.junit5.DiscoveryTests$LocalTestCase#test1()")).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(2, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(2, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand All @@ -52,7 +51,7 @@ public void discoverByMethod() throws NoSuchMethodException {
Method testMethod = LocalTestCase.class.getDeclaredMethod("test3", new Class[0]); Method testMethod = LocalTestCase.class.getDeclaredMethod("test3", new Class[0]);


DiscoveryRequest request = request().select(MethodSelector.forMethod(LocalTestCase.class, testMethod)).build(); DiscoveryRequest request = request().select(MethodSelector.forMethod(LocalTestCase.class, testMethod)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(2, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(2, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand All @@ -62,7 +61,7 @@ public void discoverCompositeSpec() {
forUniqueId("junit5:org.junit.gen5.engine.junit5.DiscoveryTests$LocalTestCase#test2()"), forUniqueId("junit5:org.junit.gen5.engine.junit5.DiscoveryTests$LocalTestCase#test2()"),
forClass(LocalTestCase.class)).build(); forClass(LocalTestCase.class)).build();


EngineDescriptor engineDescriptor = discoverTests(spec); TestDescriptor engineDescriptor = discoverTests(spec);
assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand Down
12 changes: 8 additions & 4 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit5/NestedTestClassesTests.java
View file
Expand Up @@ -15,9 +15,13 @@
import static org.junit.gen5.engine.discovery.ClassSelector.forClass; import static org.junit.gen5.engine.discovery.ClassSelector.forClass;
import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request; import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request;


import org.junit.gen5.api.*; import org.junit.gen5.api.AfterEach;
import org.junit.gen5.api.Assertions;
import org.junit.gen5.api.BeforeEach;
import org.junit.gen5.api.Nested;
import org.junit.gen5.api.Test;
import org.junit.gen5.engine.ExecutionEventRecorder; import org.junit.gen5.engine.ExecutionEventRecorder;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.launcher.DiscoveryRequest; import org.junit.gen5.launcher.DiscoveryRequest;


/** /**
Expand All @@ -31,7 +35,7 @@ public class NestedTestClassesTests extends AbstractJUnit5TestEngineTests {
@Test @Test
public void nestedTestsAreCorrectlyDiscovered() { public void nestedTestsAreCorrectlyDiscovered() {
DiscoveryRequest request = request().select(forClass(TestCaseWithNesting.class)).build(); DiscoveryRequest request = request().select(forClass(TestCaseWithNesting.class)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand All @@ -50,7 +54,7 @@ public void nestedTestsAreExecuted() {
@Test @Test
public void doublyNestedTestsAreCorrectlyDiscovered() { public void doublyNestedTestsAreCorrectlyDiscovered() {
DiscoveryRequest request = request().select(forClass(TestCaseWithDoubleNesting.class)).build(); DiscoveryRequest request = request().select(forClass(TestCaseWithDoubleNesting.class)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(8, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(8, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand Down
10 changes: 6 additions & 4 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit5/StandardTestClassTests.java
View file
Expand Up @@ -10,15 +10,17 @@


package org.junit.gen5.engine.junit5; package org.junit.gen5.engine.junit5;


import static org.junit.gen5.api.Assertions.*; import static org.junit.gen5.api.Assertions.assertEquals;
import static org.junit.gen5.api.Assertions.assertTrue;
import static org.junit.gen5.api.Assertions.fail;
import static org.junit.gen5.engine.discovery.ClassSelector.forClass; import static org.junit.gen5.engine.discovery.ClassSelector.forClass;
import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request; import static org.junit.gen5.launcher.DiscoveryRequestBuilder.request;


import org.junit.gen5.api.AfterEach; import org.junit.gen5.api.AfterEach;
import org.junit.gen5.api.BeforeEach; import org.junit.gen5.api.BeforeEach;
import org.junit.gen5.api.Test; import org.junit.gen5.api.Test;
import org.junit.gen5.engine.ExecutionEventRecorder; import org.junit.gen5.engine.ExecutionEventRecorder;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.launcher.DiscoveryRequest; import org.junit.gen5.launcher.DiscoveryRequest;
import org.opentest4j.TestAbortedException; import org.opentest4j.TestAbortedException;


Expand All @@ -39,14 +41,14 @@ public void init() {
@Test @Test
public void standardTestClassIsCorrectlyDiscovered() { public void standardTestClassIsCorrectlyDiscovered() {
DiscoveryRequest request = request().select(forClass(MyStandardTestCase.class)).build(); DiscoveryRequest request = request().select(forClass(MyStandardTestCase.class)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(5, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


@Test @Test
public void moreThanOneTestClassIsCorrectlyDiscovered() { public void moreThanOneTestClassIsCorrectlyDiscovered() {
DiscoveryRequest request = request().select(forClass(SecondOfTwoTestCases.class)).build(); DiscoveryRequest request = request().select(forClass(SecondOfTwoTestCases.class)).build();
EngineDescriptor engineDescriptor = discoverTests(request); TestDescriptor engineDescriptor = discoverTests(request);
assertEquals(2 + 2, engineDescriptor.allDescendants().size(), "# resolved test descriptors"); assertEquals(2 + 2, engineDescriptor.allDescendants().size(), "# resolved test descriptors");
} }


Expand Down
4 changes: 2 additions & 2 deletions junit-tests/src/test/java/org/junit/gen5/engine/junit5/stubs/TestEngineStub.java
View file
Expand Up @@ -10,9 +10,9 @@


package org.junit.gen5.engine.junit5.stubs; package org.junit.gen5.engine.junit5.stubs;


import org.junit.gen5.engine.EngineAwareTestDescriptor;
import org.junit.gen5.engine.EngineDiscoveryRequest; import org.junit.gen5.engine.EngineDiscoveryRequest;
import org.junit.gen5.engine.ExecutionRequest; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.TestEngine; import org.junit.gen5.engine.TestEngine;


/** /**
Expand All @@ -28,7 +28,7 @@ public String getId() {
} }


@Override @Override
public EngineAwareTestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) { public TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) {
return null; return null;
} }


Expand Down
3 changes: 1 addition & 2 deletions ...ts/src/test/java/org/junit/gen5/engine/support/discovery/AbstractTestDescriptorTests.java
View file
Expand Up @@ -20,7 +20,6 @@


import org.junit.gen5.api.BeforeEach; import org.junit.gen5.api.BeforeEach;
import org.junit.gen5.api.Test; import org.junit.gen5.api.Test;
import org.junit.gen5.engine.EngineAwareTestDescriptor;
import org.junit.gen5.engine.EngineDiscoveryRequest; import org.junit.gen5.engine.EngineDiscoveryRequest;
import org.junit.gen5.engine.ExecutionRequest; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor; import org.junit.gen5.engine.TestDescriptor;
Expand All @@ -37,7 +36,7 @@ public void initTree() {
engineDescriptor = new EngineDescriptor(new TestEngine() { engineDescriptor = new EngineDescriptor(new TestEngine() {


@Override @Override
public EngineAwareTestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) { public TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) {
return engineDescriptor; return engineDescriptor;
} }


Expand Down
4 changes: 1 addition & 3 deletions junit-tests/src/test/java/org/junit/gen5/engine/support/hierarchical/DummyTestEngine.java
View file
Expand Up @@ -10,12 +10,10 @@


package org.junit.gen5.engine.support.hierarchical; package org.junit.gen5.engine.support.hierarchical;


import org.junit.gen5.engine.EngineAwareTestDescriptor;
import org.junit.gen5.engine.EngineDiscoveryRequest; import org.junit.gen5.engine.EngineDiscoveryRequest;
import org.junit.gen5.engine.ExecutionRequest; import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor; import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.support.descriptor.EngineDescriptor; import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
import org.junit.gen5.engine.support.hierarchical.HierarchicalTestEngine;


public final class DummyTestEngine extends HierarchicalTestEngine<DummyEngineExecutionContext> { public final class DummyTestEngine extends HierarchicalTestEngine<DummyEngineExecutionContext> {


Expand Down Expand Up @@ -43,7 +41,7 @@ public TestDescriptor addTest(String uniqueName, Runnable runnable) {
} }


@Override @Override
public EngineAwareTestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) { public TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) {
return root; return root;
} }


Expand Down
8 changes: 6 additions & 2 deletions junit4-engine/src/main/java/org/junit/gen5/engine/junit4/JUnit4TestEngine.java
View file
Expand Up @@ -12,7 +12,11 @@


import static org.junit.gen5.engine.TestExecutionResult.successful; import static org.junit.gen5.engine.TestExecutionResult.successful;


import org.junit.gen5.engine.*; import org.junit.gen5.engine.EngineDiscoveryRequest;
import org.junit.gen5.engine.EngineExecutionListener;
import org.junit.gen5.engine.ExecutionRequest;
import org.junit.gen5.engine.TestDescriptor;
import org.junit.gen5.engine.TestEngine;
import org.junit.gen5.engine.junit4.descriptor.RunnerTestDescriptor; import org.junit.gen5.engine.junit4.descriptor.RunnerTestDescriptor;
import org.junit.gen5.engine.junit4.discovery.JUnit4DiscoveryRequestResolver; import org.junit.gen5.engine.junit4.discovery.JUnit4DiscoveryRequestResolver;
import org.junit.gen5.engine.junit4.execution.RunnerExecutor; import org.junit.gen5.engine.junit4.execution.RunnerExecutor;
Expand All @@ -26,7 +30,7 @@ public String getId() {
} }


@Override @Override
public EngineAwareTestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) { public TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) {
EngineDescriptor engineDescriptor = new EngineDescriptor(this); EngineDescriptor engineDescriptor = new EngineDescriptor(this);
new JUnit4DiscoveryRequestResolver(engineDescriptor).resolve(discoveryRequest); new JUnit4DiscoveryRequestResolver(engineDescriptor).resolve(discoveryRequest);
return engineDescriptor; return engineDescriptor;
Expand Down
2 changes: 1 addition & 1 deletion junit5-engine/src/main/java/org/junit/gen5/engine/junit5/JUnit5TestEngine.java
View file
Expand Up @@ -36,7 +36,7 @@ public String getId() {
} }


@Override @Override
public JUnit5EngineDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) { public TestDescriptor discoverTests(EngineDiscoveryRequest discoveryRequest) {
Preconditions.notNull(discoveryRequest, "discovery request must not be null"); Preconditions.notNull(discoveryRequest, "discovery request must not be null");
JUnit5EngineDescriptor engineDescriptor = new JUnit5EngineDescriptor(this); JUnit5EngineDescriptor engineDescriptor = new JUnit5EngineDescriptor(this);
resolveDiscoveryRequest(discoveryRequest, engineDescriptor); resolveDiscoveryRequest(discoveryRequest, engineDescriptor);
Expand Down

0 comments on commit ab12dc8

Please sign in to comment.