#132: Moved extension related stuff to subpackage extension

junit-team · Jan 22, 2016 · a59b066 · a59b066
1 parent 270f35b
commit a59b066
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 19 deletions.
diff --git a/...execution/ExtensionPointSortingTests.java → ...extension/ExtensionPointSortingTests.java b/...execution/ExtensionPointSortingTests.java → ...extension/ExtensionPointSortingTests.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit5.execution;
+package org.junit.gen5.engine.junit5.extension;
 
 import static org.junit.gen5.api.Assertions.assertEquals;
 import static org.junit.gen5.api.Assertions.assertTrue;
@@ -25,6 +25,8 @@
 import org.junit.gen5.api.extension.ExtensionPoint;
 import org.junit.gen5.api.extension.ExtensionPointRegistry.Position;
 import org.junit.gen5.commons.util.ReflectionUtils;
+import org.junit.gen5.engine.junit5.extension.ExtensionPointSorter;
+import org.junit.gen5.engine.junit5.extension.RegisteredExtensionPoint;
 
 /**
  * Unit tests for {@link ExtensionPointSorter}.

diff --git a/...it5/execution/ExtensionRegistryTests.java → ...it5/extension/ExtensionRegistryTests.java b/...it5/execution/ExtensionRegistryTests.java → ...it5/extension/ExtensionRegistryTests.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit5.execution;
+package org.junit.gen5.engine.junit5.extension;
 
 import static org.junit.gen5.api.Assertions.assertEquals;
 import static org.junit.gen5.api.Assertions.assertTrue;
@@ -28,9 +28,6 @@
 import org.junit.gen5.api.extension.ExtensionRegistrar;
 import org.junit.gen5.api.extension.MethodParameterResolver;
 import org.junit.gen5.api.extension.TestExecutionCondition;
-import org.junit.gen5.engine.junit5.extension.DisabledCondition;
-import org.junit.gen5.engine.junit5.extension.TestInfoParameterResolver;
-import org.junit.gen5.engine.junit5.extension.TestReporterParameterResolver;
 
 /**
  * @since 5.0

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
@@ -39,11 +39,11 @@
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestTag;
 import org.junit.gen5.engine.junit5.execution.ConditionEvaluator;
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry;
 import org.junit.gen5.engine.junit5.execution.JUnit5EngineExecutionContext;
 import org.junit.gen5.engine.junit5.execution.MethodInvoker;
-import org.junit.gen5.engine.junit5.execution.RegisteredExtensionPoint;
 import org.junit.gen5.engine.junit5.execution.TestInstanceProvider;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
+import org.junit.gen5.engine.junit5.extension.RegisteredExtensionPoint;
 import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.engine.support.hierarchical.Container;
 

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
@@ -29,7 +29,7 @@
 import org.junit.gen5.commons.util.ExceptionUtils;
 import org.junit.gen5.commons.util.StringUtils;
 import org.junit.gen5.engine.TestTag;
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
 import org.junit.gen5.engine.support.descriptor.AbstractTestDescriptor;
 
 /**

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,11 +31,11 @@
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestTag;
 import org.junit.gen5.engine.junit5.execution.ConditionEvaluator;
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry;
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry.ApplicationOrder;
 import org.junit.gen5.engine.junit5.execution.JUnit5EngineExecutionContext;
 import org.junit.gen5.engine.junit5.execution.MethodInvoker;
-import org.junit.gen5.engine.junit5.execution.RegisteredExtensionPoint;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry.ApplicationOrder;
+import org.junit.gen5.engine.junit5.extension.RegisteredExtensionPoint;
 import org.junit.gen5.engine.support.descriptor.JavaSource;
 import org.junit.gen5.engine.support.hierarchical.Leaf;
 

diff --git a/...5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/JUnit5EngineDescriptor.java b/...5-engine/src/main/java/org/junit/gen5/engine/junit5/discovery/JUnit5EngineDescriptor.java
@@ -10,8 +10,8 @@
 
 package org.junit.gen5.engine.junit5.discovery;
 
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry;
 import org.junit.gen5.engine.junit5.execution.JUnit5EngineExecutionContext;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
 import org.junit.gen5.engine.support.descriptor.EngineDescriptor;
 import org.junit.gen5.engine.support.hierarchical.Container;
 

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/ConditionEvaluator.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/ConditionEvaluator.java
@@ -15,6 +15,7 @@
 import org.junit.gen5.api.extension.ContainerExtensionContext;
 import org.junit.gen5.api.extension.TestExecutionCondition;
 import org.junit.gen5.api.extension.TestExtensionContext;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
 
 /**
  * {@code ConditionEvaluator} evaluates {@link ContainerExecutionCondition}

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
@@ -13,6 +13,7 @@
 import org.junit.gen5.api.extension.ExtensionContext;
 import org.junit.gen5.commons.JUnitException;
 import org.junit.gen5.engine.EngineExecutionListener;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
 import org.junit.gen5.engine.support.hierarchical.EngineExecutionContext;
 
 /**

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/MethodInvoker.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/MethodInvoker.java
@@ -22,7 +22,8 @@
 import org.junit.gen5.api.extension.MethodParameterResolver;
 import org.junit.gen5.api.extension.ParameterResolutionException;
 import org.junit.gen5.commons.util.ReflectionUtils;
-import org.junit.gen5.engine.junit5.execution.ExtensionRegistry.ApplicationOrder;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry;
+import org.junit.gen5.engine.junit5.extension.ExtensionRegistry.ApplicationOrder;
 
 /**
  * {@code MethodInvoker} encapsulates the invocation of a method, including

diff --git a/...unit5/execution/ExtensionPointSorter.java → ...unit5/extension/ExtensionPointSorter.java b/...unit5/execution/ExtensionPointSorter.java → ...unit5/extension/ExtensionPointSorter.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit5.execution;
+package org.junit.gen5.engine.junit5.extension;
 
 import java.util.Comparator;
 import java.util.List;

diff --git a/...e/junit5/execution/ExtensionRegistry.java → ...e/junit5/extension/ExtensionRegistry.java b/...e/junit5/execution/ExtensionRegistry.java → ...e/junit5/extension/ExtensionRegistry.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit5.execution;
+package org.junit.gen5.engine.junit5.extension;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,9 +26,6 @@
 import org.junit.gen5.api.extension.ExtensionPointRegistry.Position;
 import org.junit.gen5.api.extension.ExtensionRegistrar;
 import org.junit.gen5.commons.util.ReflectionUtils;
-import org.junit.gen5.engine.junit5.extension.DisabledCondition;
-import org.junit.gen5.engine.junit5.extension.TestInfoParameterResolver;
-import org.junit.gen5.engine.junit5.extension.TestReporterParameterResolver;
 
 /**
  * An {@code ExtensionRegistry} holds all registered extensions (i.e.

diff --git a/...5/execution/RegisteredExtensionPoint.java → ...5/extension/RegisteredExtensionPoint.java b/...5/execution/RegisteredExtensionPoint.java → ...5/extension/RegisteredExtensionPoint.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit5.execution;
+package org.junit.gen5.engine.junit5.extension;
 
 import org.junit.gen5.api.extension.ExtensionPoint;
 import org.junit.gen5.api.extension.ExtensionPointRegistry.Position;