Rename support.discovery to support.descriptor

Issue: #54
junit-team · Jan 18, 2016 · 763cf50 · 763cf50
1 parent 3414201
commit 763cf50
Show file tree

Hide file tree

Showing 39 changed files with 35 additions and 42 deletions.
diff --git a/...ort/discovery/AbstractTestDescriptor.java → ...rt/descriptor/AbstractTestDescriptor.java b/...ort/discovery/AbstractTestDescriptor.java → ...rt/descriptor/AbstractTestDescriptor.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.support.discovery;
+package org.junit.gen5.engine.support.descriptor;
 
 import static java.util.Collections.emptySet;
 

diff --git a/...e/support/discovery/EngineDescriptor.java → .../support/descriptor/EngineDescriptor.java b/...e/support/discovery/EngineDescriptor.java → .../support/descriptor/EngineDescriptor.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.support.discovery;
+package org.junit.gen5.engine.support.descriptor;
 
 import org.junit.gen5.engine.EngineAwareTestDescriptor;
 import org.junit.gen5.engine.TestEngine;

diff --git a/...e/support/discovery/FileSystemSource.java → .../support/descriptor/FileSystemSource.java b/...e/support/discovery/FileSystemSource.java → .../support/descriptor/FileSystemSource.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.support.discovery;
+package org.junit.gen5.engine.support.descriptor;
 
 import java.io.File;
 import java.io.Serializable;

diff --git a/.../engine/support/discovery/JavaSource.java → ...engine/support/descriptor/JavaSource.java b/.../engine/support/discovery/JavaSource.java → ...engine/support/descriptor/JavaSource.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.support.discovery;
+package org.junit.gen5.engine.support.descriptor;
 
 import static org.junit.gen5.commons.util.StringUtils.nullSafeToString;
 

diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Container.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Container.java
@@ -10,8 +10,6 @@
 
 package org.junit.gen5.engine.support.hierarchical;
 
-import org.junit.gen5.engine.EngineExecutionContext;
-
 public interface Container<C extends EngineExecutionContext> extends Node<C> {
 
 	default C beforeAll(C context) throws Exception {

diff --git a/...t/gen5/engine/EngineExecutionContext.java → .../hierarchical/EngineExecutionContext.java b/...t/gen5/engine/EngineExecutionContext.java → .../hierarchical/EngineExecutionContext.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine;
+package org.junit.gen5.engine.support.hierarchical;
 
 public interface EngineExecutionContext {
 

diff --git a/...-api/src/main/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestEngine.java b/...-api/src/main/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestEngine.java
@@ -10,7 +10,6 @@
 
 package org.junit.gen5.engine.support.hierarchical;
 
-import org.junit.gen5.engine.EngineExecutionContext;
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestEngine;
 

diff --git a/...pi/src/main/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestExecutor.java b/...pi/src/main/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestExecutor.java
@@ -12,7 +12,6 @@
 
 import static org.junit.gen5.engine.support.hierarchical.BlacklistedExceptions.rethrowIfBlacklisted;
 
-import org.junit.gen5.engine.EngineExecutionContext;
 import org.junit.gen5.engine.EngineExecutionListener;
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestDescriptor;

diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Leaf.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Leaf.java
@@ -10,8 +10,6 @@
 
 package org.junit.gen5.engine.support.hierarchical;
 
-import org.junit.gen5.engine.EngineExecutionContext;
-
 public interface Leaf<C extends EngineExecutionContext> extends Node<C> {
 	C execute(C context) throws Exception;
 }
diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Node.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/support/hierarchical/Node.java
@@ -12,8 +12,6 @@
 
 import java.util.Optional;
 
-import org.junit.gen5.engine.EngineExecutionContext;
-
 public interface Node<C extends EngineExecutionContext> {
 
 	default C prepare(C context) throws Exception {

diff --git a/junit-launcher/src/main/java/org/junit/gen5/launcher/RootTestDescriptor.java b/junit-launcher/src/main/java/org/junit/gen5/launcher/RootTestDescriptor.java
@@ -16,7 +16,7 @@
 
 import org.junit.gen5.commons.util.Preconditions;
 import org.junit.gen5.engine.*;
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 
 /**
  * @since 5.0

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/ExecutionEventConditions.java b/junit-tests/src/test/java/org/junit/gen5/engine/ExecutionEventConditions.java
@@ -25,7 +25,7 @@
 import org.assertj.core.api.SoftAssertions;
 import org.junit.gen5.engine.ExecutionEvent.Type;
 import org.junit.gen5.engine.TestExecutionResult.Status;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 
 /**
  * Collection of AssertJ conditions for {@link ExecutionEvent}.

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/TestDescriptorStub.java b/junit-tests/src/test/java/org/junit/gen5/engine/TestDescriptorStub.java
@@ -10,7 +10,7 @@
 
 package org.junit.gen5.engine;
 
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 
 final class TestDescriptorStub extends AbstractTestDescriptor {
 

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit4/JUnit4TestEngineDiscoveryTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit4/JUnit4TestEngineDiscoveryTests.java
@@ -55,7 +55,7 @@
 import org.junit.gen5.engine.junit4.samples.junit4.PlainJUnit4TestCaseWithTwoTestMethods;
 import org.junit.gen5.engine.junit4.samples.junit4.SingleFailingTheoryTestCase;
 import org.junit.gen5.engine.junit4.samples.junit4.TestCaseRunWithJUnit5;
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.launcher.DiscoveryRequest;
 import org.junit.runner.manipulation.Filter;
 

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit5/AbstractJUnit5TestEngineTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit5/AbstractJUnit5TestEngineTests.java
@@ -15,7 +15,7 @@
 
 import org.junit.gen5.api.BeforeEach;
 import org.junit.gen5.engine.*;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.launcher.DiscoveryRequest;
 
 /**

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit5/DiscoveryTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit5/DiscoveryTests.java
@@ -22,7 +22,7 @@
 
 import org.junit.gen5.api.Test;
 import org.junit.gen5.engine.discovery.MethodSelector;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.launcher.DiscoveryRequest;
 
 /**

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit5/NestedTestClassesTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit5/NestedTestClassesTests.java
@@ -17,7 +17,7 @@
 
 import org.junit.gen5.api.*;
 import org.junit.gen5.engine.ExecutionEventRecorder;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.launcher.DiscoveryRequest;
 
 /**

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit5/StandardTestClassTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit5/StandardTestClassTests.java
@@ -18,7 +18,7 @@
 import org.junit.gen5.api.BeforeEach;
 import org.junit.gen5.api.Test;
 import org.junit.gen5.engine.ExecutionEventRecorder;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.launcher.DiscoveryRequest;
 import org.opentest4j.TestAbortedException;
 

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/junit5/descriptor/JUnit5TestableTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/junit5/descriptor/JUnit5TestableTests.java
@@ -16,7 +16,7 @@
 import java.math.BigDecimal;
 
 import org.junit.gen5.api.Test;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.engine.support.hierarchical.DummyTestEngine;
 
 public class JUnit5TestableTests {

diff --git a/...ts/src/test/java/org/junit/gen5/engine/support/discovery/AbstractTestDescriptorTests.java b/...ts/src/test/java/org/junit/gen5/engine/support/discovery/AbstractTestDescriptorTests.java
@@ -25,6 +25,8 @@
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestEngine;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 
 public class AbstractTestDescriptorTests {
 

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/support/discovery/FileSystemSourceTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/support/discovery/FileSystemSourceTests.java
@@ -22,7 +22,8 @@
 
 import org.junit.gen5.api.Test;
 import org.junit.gen5.commons.util.PreconditionViolationException;
-import org.junit.gen5.engine.support.discovery.FileSystemSource.FilePosition;
+import org.junit.gen5.engine.support.descriptor.FileSystemSource;
+import org.junit.gen5.engine.support.descriptor.FileSystemSource.FilePosition;
 
 class FileSystemSourceTests {
 

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/support/discovery/JavaSourceTests.java b/junit-tests/src/test/java/org/junit/gen5/engine/support/discovery/JavaSourceTests.java
@@ -19,6 +19,7 @@
 
 import org.junit.gen5.api.Test;
 import org.junit.gen5.api.TestInfo;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 
 class JavaSourceTests {
 

diff --git a/...src/test/java/org/junit/gen5/engine/support/hierarchical/DummyEngineExecutionContext.java b/...src/test/java/org/junit/gen5/engine/support/hierarchical/DummyEngineExecutionContext.java
@@ -10,7 +10,5 @@
 
 package org.junit.gen5.engine.support.hierarchical;
 
-import org.junit.gen5.engine.EngineExecutionContext;
-
 class DummyEngineExecutionContext implements EngineExecutionContext {
 }
diff --git a/...t-tests/src/test/java/org/junit/gen5/engine/support/hierarchical/DummyTestDescriptor.java b/...t-tests/src/test/java/org/junit/gen5/engine/support/hierarchical/DummyTestDescriptor.java
@@ -10,7 +10,7 @@
 
 package org.junit.gen5.engine.support.hierarchical;
 
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.gen5.engine.support.hierarchical.Leaf;
 
 class DummyTestDescriptor extends AbstractTestDescriptor implements Leaf<DummyEngineExecutionContext> {

diff --git a/junit-tests/src/test/java/org/junit/gen5/engine/support/hierarchical/DummyTestEngine.java b/junit-tests/src/test/java/org/junit/gen5/engine/support/hierarchical/DummyTestEngine.java
@@ -14,7 +14,7 @@
 import org.junit.gen5.engine.EngineDiscoveryRequest;
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestDescriptor;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.engine.support.hierarchical.HierarchicalTestEngine;
 
 public final class DummyTestEngine extends HierarchicalTestEngine<DummyEngineExecutionContext> {

diff --git a/...c/test/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestExecutorTests.java b/...c/test/java/org/junit/gen5/engine/support/hierarchical/HierarchicalTestExecutorTests.java
@@ -24,11 +24,10 @@
 
 import org.junit.gen5.api.BeforeEach;
 import org.junit.gen5.api.Test;
-import org.junit.gen5.engine.EngineExecutionContext;
 import org.junit.gen5.engine.EngineExecutionListener;
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.TestExecutionResult;
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InOrder;
 import org.mockito.Mockito;

diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/JUnit4TestEngine.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/JUnit4TestEngine.java
@@ -16,7 +16,7 @@
 import org.junit.gen5.engine.junit4.descriptor.RunnerTestDescriptor;
 import org.junit.gen5.engine.junit4.discovery.JUnit4DiscoveryRequestResolver;
 import org.junit.gen5.engine.junit4.execution.RunnerExecutor;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 
 public class JUnit4TestEngine implements TestEngine {
 

diff --git a/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/JUnit4TestDescriptor.java b/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/JUnit4TestDescriptor.java
@@ -23,7 +23,7 @@
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestSource;
 import org.junit.gen5.engine.TestTag;
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 import org.junit.runner.Description;
 
 /**

diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/JavaSourceExtractor.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/JavaSourceExtractor.java
@@ -19,7 +19,7 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.runner.Description;
 
 class JavaSourceExtractor {

diff --git a/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/RunnerTestDescriptor.java b/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/RunnerTestDescriptor.java
@@ -13,7 +13,7 @@
 import java.util.Optional;
 
 import org.junit.gen5.engine.TestDescriptor;
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.runner.Request;
 import org.junit.runner.Runner;
 

diff --git a/.../src/main/java/org/junit/gen5/engine/junit4/discovery/JUnit4DiscoveryRequestResolver.java b/.../src/main/java/org/junit/gen5/engine/junit4/discovery/JUnit4DiscoveryRequestResolver.java
@@ -19,7 +19,7 @@
 import org.junit.gen5.engine.EngineDiscoveryRequest;
 import org.junit.gen5.engine.FilterResult;
 import org.junit.gen5.engine.discovery.ClassFilter;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 
 public class JUnit4DiscoveryRequestResolver {
 

diff --git a/...engine/src/main/java/org/junit/gen5/engine/junit4/discovery/TestClassRequestResolver.java b/...engine/src/main/java/org/junit/gen5/engine/junit4/discovery/TestClassRequestResolver.java
@@ -24,7 +24,7 @@
 
 import org.junit.gen5.engine.junit4.descriptor.JUnit4TestDescriptor;
 import org.junit.gen5.engine.junit4.descriptor.RunnerTestDescriptor;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/ClassTestDescriptor.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/ClassTestDescriptor.java
@@ -44,7 +44,7 @@
 import org.junit.gen5.engine.junit5.execution.RegisteredExtensionPoint;
 import org.junit.gen5.engine.junit5.execution.TestExtensionRegistry;
 import org.junit.gen5.engine.junit5.execution.TestInstanceProvider;
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.engine.support.hierarchical.Container;
 
 /**

diff --git a/...gine/src/main/java/org/junit/gen5/engine/junit5/descriptor/DiscoverySelectorResolver.java b/...gine/src/main/java/org/junit/gen5/engine/junit5/descriptor/DiscoverySelectorResolver.java
@@ -24,7 +24,7 @@
 import org.junit.gen5.engine.junit5.discovery.IsNestedTestClass;
 import org.junit.gen5.engine.junit5.discovery.IsScannableTestClass;
 import org.junit.gen5.engine.junit5.discovery.IsTestMethod;
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 
 /**
  * @since 5.0

diff --git a/...-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/JUnit5EngineDescriptor.java b/...-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/JUnit5EngineDescriptor.java
@@ -13,7 +13,7 @@
 import org.junit.gen5.engine.TestEngine;
 import org.junit.gen5.engine.junit5.execution.JUnit5EngineExecutionContext;
 import org.junit.gen5.engine.junit5.execution.TestExtensionRegistry;
-import org.junit.gen5.engine.support.discovery.EngineDescriptor;
+import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.engine.support.hierarchical.Container;
 
 public class JUnit5EngineDescriptor extends EngineDescriptor implements Container<JUnit5EngineExecutionContext> {

diff --git a/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/JUnit5TestDescriptor.java b/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/JUnit5TestDescriptor.java
@@ -30,7 +30,7 @@
 import org.junit.gen5.commons.util.StringUtils;
 import org.junit.gen5.engine.TestTag;
 import org.junit.gen5.engine.junit5.execution.TestExtensionRegistry;
-import org.junit.gen5.engine.support.discovery.AbstractTestDescriptor;
+import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 
 /**
  * @since 5.0

diff --git a/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/MethodTestDescriptor.java b/...t5-engine/src/main/java/org/junit/gen5/engine/junit5/descriptor/MethodTestDescriptor.java
@@ -31,7 +31,7 @@
 import org.junit.gen5.engine.junit5.execution.MethodInvoker;
 import org.junit.gen5.engine.junit5.execution.RegisteredExtensionPoint;
 import org.junit.gen5.engine.junit5.execution.TestExtensionRegistry;
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.engine.support.hierarchical.Leaf;
 
 /**

diff --git a/...ne/src/main/java/org/junit/gen5/engine/junit5/execution/JUnit5EngineExecutionContext.java b/...ne/src/main/java/org/junit/gen5/engine/junit5/execution/JUnit5EngineExecutionContext.java
@@ -12,8 +12,8 @@
 
 import org.junit.gen5.api.extension.ExtensionContext;
 import org.junit.gen5.commons.JUnitException;
-import org.junit.gen5.engine.EngineExecutionContext;
 import org.junit.gen5.engine.EngineExecutionListener;
+import org.junit.gen5.engine.support.hierarchical.EngineExecutionContext;
 
 /**
  * @since 5.0

diff --git a/surefire-junit5/src/main/java/org/junit/gen5/surefire/RunListenerAdapter.java b/surefire-junit5/src/main/java/org/junit/gen5/surefire/RunListenerAdapter.java
@@ -20,7 +20,7 @@
 import org.apache.maven.surefire.report.SimpleReportEntry;
 import org.apache.maven.surefire.report.StackTraceWriter;
 import org.junit.gen5.engine.TestExecutionResult;
-import org.junit.gen5.engine.support.discovery.JavaSource;
+import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.launcher.TestExecutionListener;
 import org.junit.gen5.launcher.TestIdentifier;