From 037ecb3f1ecab2803caaaed36d40c1c424fb6618 Mon Sep 17 00:00:00 2001
From: tristaZero <hannkenn@163.com>
Date: Wed, 29 Aug 2018 10:30:09 +0800
Subject: [PATCH] move tests

---
 .../api}/yaml/fixture/SingleAlgorithm.java    |  2 +-
 .../reg/newzk/client/cache/PathTreeTest.java  | 20 ++++++++++---------
 .../reg/newzk/client/retry/TestCallable.java  |  6 +++---
 .../zookeeper/SyncRetryStrategyTest.java      | 20 +++++++++----------
 .../client/zookeeper/base/StartWaitTest.java  |  9 ++++-----
 .../sharding-orchestration-spring/pom.xml     |  2 +-
 6 files changed, 30 insertions(+), 29 deletions(-)
 rename sharding-orchestration/{sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration => sharding-orchestration-jdbc/src/test/java/io/shardingsphere/jdbc/orchestration/api}/yaml/fixture/SingleAlgorithm.java (95%)
 rename sharding-orchestration/{sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc => sharding-orchestration-reg/src/test/java/io/shardingsphere}/orchestration/reg/newzk/client/cache/PathTreeTest.java (91%)
 rename sharding-orchestration/{sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc => sharding-orchestration-reg/src/test/java/io/shardingsphere}/orchestration/reg/newzk/client/retry/TestCallable.java (86%)
 rename sharding-orchestration/{sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc => sharding-orchestration-reg/src/test/java/io/shardingsphere}/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java (92%)
 rename sharding-orchestration/{sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc => sharding-orchestration-reg/src/test/java/io/shardingsphere}/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java (82%)

diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/yaml/fixture/SingleAlgorithm.java b/sharding-orchestration/sharding-orchestration-jdbc/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java
similarity index 95%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/yaml/fixture/SingleAlgorithm.java
rename to sharding-orchestration/sharding-orchestration-jdbc/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java
index a1974b2c78..f0cf4ab7a0 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/yaml/fixture/SingleAlgorithm.java
+++ b/sharding-orchestration/sharding-orchestration-jdbc/src/test/java/io/shardingsphere/jdbc/orchestration/api/yaml/fixture/SingleAlgorithm.java
@@ -15,7 +15,7 @@
  * </p>
  */
 
-package io.shardingsphere.jdbc.orchestration.yaml.fixture;
+package io.shardingsphere.jdbc.orchestration.api.yaml.fixture;
 
 import io.shardingsphere.core.api.algorithm.sharding.PreciseShardingValue;
 import io.shardingsphere.core.api.algorithm.sharding.standard.PreciseShardingAlgorithm;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/cache/PathTreeTest.java b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/cache/PathTreeTest.java
similarity index 91%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/cache/PathTreeTest.java
rename to sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/cache/PathTreeTest.java
index 22556d9afc..43e00dfacf 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/cache/PathTreeTest.java
+++ b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/cache/PathTreeTest.java
@@ -15,16 +15,16 @@
  * </p>
  */
 
-package io.shardingsphere.jdbc.orchestration.reg.newzk.client.cache;
+package io.shardingsphere.orchestration.reg.newzk.client.cache;
 
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.action.IClient;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.utility.ZookeeperConstants;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.ClientFactory;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.base.BaseTest;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.base.TestSupport;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.section.ZookeeperEventListener;
-import io.shardingsphere.jdbc.orchestration.util.EmbedTestingServer;
-import java.io.IOException;
+
+import io.shardingsphere.orchestration.reg.newzk.client.action.IClient;
+import io.shardingsphere.orchestration.reg.newzk.client.util.EmbedTestingServer;
+import io.shardingsphere.orchestration.reg.newzk.client.utility.ZookeeperConstants;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.ClientFactory;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.base.BaseTest;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.base.TestSupport;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.section.ZookeeperEventListener;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
@@ -34,6 +34,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
+
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNull;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/retry/TestCallable.java b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/retry/TestCallable.java
similarity index 86%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/retry/TestCallable.java
rename to sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/retry/TestCallable.java
index 0056ed3576..4a38639b50 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/retry/TestCallable.java
+++ b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/retry/TestCallable.java
@@ -15,10 +15,10 @@
  * </p>
  */
 
-package io.shardingsphere.jdbc.orchestration.reg.newzk.client.retry;
+package io.shardingsphere.orchestration.reg.newzk.client.retry;
 
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.action.IProvider;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.provider.BaseProvider;
+import io.shardingsphere.orchestration.reg.newzk.client.action.IProvider;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.provider.BaseProvider;
 import org.apache.zookeeper.KeeperException;
 
 public abstract class TestCallable extends RetryCallable {
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java
similarity index 92%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java
rename to sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java
index 9e3d58a33a..0dc03837a5 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java
+++ b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/SyncRetryStrategyTest.java
@@ -15,17 +15,17 @@
  * </p>
  */
 
-package io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper;
+package io.shardingsphere.orchestration.reg.newzk.client.zookeeper;
 
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.action.IClient;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.action.IProvider;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.retry.DelayRetryPolicy;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.retry.TestCallable;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.retry.TestResultCallable;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.utility.PathUtil;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.base.TestSupport;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.section.StrategyType;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.strategy.UsualStrategy;
+import io.shardingsphere.orchestration.reg.newzk.client.action.IClient;
+import io.shardingsphere.orchestration.reg.newzk.client.action.IProvider;
+import io.shardingsphere.orchestration.reg.newzk.client.retry.DelayRetryPolicy;
+import io.shardingsphere.orchestration.reg.newzk.client.retry.TestCallable;
+import io.shardingsphere.orchestration.reg.newzk.client.retry.TestResultCallable;
+import io.shardingsphere.orchestration.reg.newzk.client.utility.PathUtil;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.base.TestSupport;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.section.StrategyType;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.strategy.UsualStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
diff --git a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java
similarity index 82%
rename from sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java
rename to sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java
index 34f953ea98..a0bdde43ac 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/test/java/io/shardingsphere/jdbc/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java
+++ b/sharding-orchestration/sharding-orchestration-reg/src/test/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/base/StartWaitTest.java
@@ -15,11 +15,10 @@
  * </p>
  */
 
-package io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.base;
-
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.action.IClient;
-import io.shardingsphere.jdbc.orchestration.reg.newzk.client.zookeeper.section.ClientContext;
-import io.shardingsphere.jdbc.orchestration.util.EmbedTestingServer;
+package io.shardingsphere.orchestration.reg.newzk.client.zookeeper.base;
+import io.shardingsphere.orchestration.reg.newzk.client.zookeeper.section.ClientContext;
+import io.shardingsphere.orchestration.reg.newzk.client.action.IClient;
+import io.shardingsphere.orchestration.reg.newzk.client.util.EmbedTestingServer;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/sharding-orchestration/sharding-orchestration-spring/pom.xml b/sharding-orchestration/sharding-orchestration-spring/pom.xml
index 0d7601af3e..754b69d6c7 100644
--- a/sharding-orchestration/sharding-orchestration-spring/pom.xml
+++ b/sharding-orchestration/sharding-orchestration-spring/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>io.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-orchestration</artifactId>
+            <artifactId>sharding-orchestration-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-- 
GitLab