You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/29 06:08:23 UTC
[shardingsphere] branch master updated: Move RunnerParameters (#22496)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 34c5cba3bb9 Move RunnerParameters (#22496)
34c5cba3bb9 is described below
commit 34c5cba3bb9bc58c61496112ba44f533a63f9b94
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue Nov 29 14:08:17 2022 +0800
Move RunnerParameters (#22496)
---
.../runner/parallel/ParameterizedParallelRunnerScheduler.java | 4 ++--
.../apache/shardingsphere/test/runner}/param/RunnerParameters.java | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
index 701550f0aa0..b2be69368c8 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/parallel/ParameterizedParallelRunnerScheduler.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.integration.framework.runner.parallel;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.integration.framework.param.RunnerParameters;
+import org.apache.shardingsphere.test.runner.param.RunnerParameters;
import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
import org.apache.shardingsphere.test.runner.ParallelRunningStrategy.ParallelLevel;
import org.apache.shardingsphere.test.runner.executor.ParallelRunnerExecutorFactory;
@@ -35,7 +35,7 @@ public final class ParameterizedParallelRunnerScheduler extends ParallelRunnerSc
@Override
public void schedule(final Runnable childStatement) {
- ITParameterizedArray parameterizedArray = new RunnerParameters(childStatement).getParameterizedArray();
+ ITParameterizedArray parameterizedArray = (ITParameterizedArray) new RunnerParameters(childStatement).getParameterizedArray();
getExecutorFactory().getExecutor(parameterizedArray.getDatabaseType(), getParallelLevel()).execute(parameterizedArray, childStatement);
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/RunnerParameters.java
similarity index 86%
rename from test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java
rename to test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/RunnerParameters.java
index c1a4b682c46..40b727cd2e3 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java
+++ b/test/runner/src/main/java/org/apache/shardingsphere/test/runner/param/RunnerParameters.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.integration.framework.param;
+package org.apache.shardingsphere.test.runner.param;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.integration.framework.param.model.ITParameterizedArray;
import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
import java.lang.reflect.Field;
@@ -38,11 +37,11 @@ public final class RunnerParameters {
* @return parameterized array
*/
@SneakyThrows(ReflectiveOperationException.class)
- public ITParameterizedArray getParameterizedArray() {
+ public ParameterizedArray getParameterizedArray() {
Field parametersField = BlockJUnit4ClassRunnerWithParameters.class.getDeclaredField("parameters");
parametersField.setAccessible(true);
Object[] params = (Object[]) parametersField.get(getRunner());
- return (ITParameterizedArray) params[0];
+ return (ParameterizedArray) params[0];
}
@SneakyThrows(ReflectiveOperationException.class)