Prevent unit tests and E2E from using host ports 7181, 8181, `900…

…0` and `9181`
apache · Jul 27, 2024 · 24d3d2e · 24d3d2e
1 parent 9bceb88
commit 24d3d2e
Show file tree

Hide file tree

Showing 32 changed files with 119 additions and 124 deletions.
diff --git a/...test/java/org/apache/shardingsphere/elasticjob/bootstrap/type/OneOffJobBootstrapTest.java b/...test/java/org/apache/shardingsphere/elasticjob/bootstrap/type/OneOffJobBootstrapTest.java
@@ -41,9 +41,7 @@
 
 class OneOffJobBootstrapTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(7181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), OneOffJobBootstrapTest.class.getSimpleName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static final int SHARDING_TOTAL_COUNT = 3;
 
@@ -52,7 +50,8 @@ class OneOffJobBootstrapTest {
     @BeforeAll
     static void init() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), OneOffJobBootstrapTest.class.getSimpleName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
         zkRegCenter.init();
     }
 

diff --git a/...n/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotService.java b/...n/java/org/apache/shardingsphere/elasticjob/kernel/internal/snapshot/SnapshotService.java
@@ -53,7 +53,7 @@ public final class SnapshotService {
     private volatile boolean closed;
 
     public SnapshotService(final CoordinatorRegistryCenter regCenter, final int port) {
-        Preconditions.checkArgument(port >= 0 && port <= 0xFFFF, "Port value out of range: " + port);
+        Preconditions.checkArgument(port >= -1 && port <= 0xFFFF, "Port value out of range: " + port);
         this.regCenter = regCenter;
         this.port = port;
     }

diff --git a/...e/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactoryTest.java b/...e/src/test/java/org/apache/shardingsphere/elasticjob/lifecycle/api/JobAPIFactoryTest.java
@@ -26,7 +26,7 @@
 
 class JobAPIFactoryTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(8181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     @BeforeAll
     static void setUp() {

diff --git a/...rg/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImplTest.java b/...rg/apache/shardingsphere/elasticjob/lifecycle/internal/operate/JobOperateAPIImplTest.java
@@ -36,8 +36,6 @@
 @ExtendWith(MockitoExtension.class)
 class JobOperateAPIImplTest {
 
-    static final int DUMP_PORT = 9000;
-
     private JobOperateAPI jobOperateAPI;
 
     // TODO We should not use `Mock.Strictness.LENIENT` here, but the default. This is a flaw in the unit test design.

diff --git a/...rg/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactoryTest.java b/...rg/apache/shardingsphere/elasticjob/lifecycle/internal/reg/RegistryCenterFactoryTest.java
@@ -32,7 +32,7 @@
 
 class RegistryCenterFactoryTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(8181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     @BeforeAll
     static void setUp() {

diff --git a/...java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java b/...java/org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperElectionServiceTest.java
@@ -43,7 +43,7 @@
 @ExtendWith(MockitoExtension.class)
 class ZookeeperElectionServiceTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static final String HOST_AND_PORT = "localhost:8899";
 

diff --git a/...e/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java b/...e/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterExecuteInLeaderTest.java
@@ -33,18 +33,16 @@
 
 class ZookeeperRegistryCenterExecuteInLeaderTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
-            new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterExecuteInLeaderTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterExecuteInLeaderTest.class.getName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
         zkRegCenter.init();
     }
 

diff --git a/...rg/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java b/...rg/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterForAuthTest.java
@@ -33,21 +33,20 @@
 
 class ZookeeperRegistryCenterForAuthTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static final String NAME_SPACE = ZookeeperRegistryCenterForAuthTest.class.getName();
 
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), NAME_SPACE);
-
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        ZOOKEEPER_CONFIGURATION.setDigest("digest:password");
-        ZOOKEEPER_CONFIGURATION.setSessionTimeoutMilliseconds(5000);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(5000);
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), NAME_SPACE);
+        zookeeperConfiguration.setDigest("digest:password");
+        zookeeperConfiguration.setSessionTimeoutMilliseconds(5000);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(5000);
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
         zkRegCenter.init();
         RegistryCenterEnvironmentPreparer.persist(zkRegCenter);
     }

diff --git a/...che/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java b/...che/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterMiscellaneousTest.java
@@ -30,18 +30,18 @@
 
 class ZookeeperRegistryCenterMiscellaneousTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
-            new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterMiscellaneousTest.class.getName());
+    private static ZookeeperConfiguration zookeeperConfiguration;
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
+        zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterMiscellaneousTest.class.getName());
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
         zkRegCenter.init();
         zkRegCenter.addCacheData("/test");
     }
@@ -64,7 +64,7 @@ void assertGetRawCache() {
 
     @Test
     void assertGetZkConfig() {
-        ZookeeperRegistryCenter zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        assertThat(zkRegCenter.getZkConfig(), is(ZOOKEEPER_CONFIGURATION));
+        ZookeeperRegistryCenter zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        assertThat(zkRegCenter.getZkConfig(), is(zookeeperConfiguration));
     }
 }
diff --git a/...org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java b/...org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterModifyTest.java
@@ -37,17 +37,16 @@
 
 class ZookeeperRegistryCenterModifyTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterModifyTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterModifyTest.class.getName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
         zkRegCenter.init();
         RegistryCenterEnvironmentPreparer.persist(zkRegCenter);
     }

diff --git a/...he/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java b/...he/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithCacheTest.java
@@ -29,18 +29,16 @@
 
 class ZookeeperRegistryCenterQueryWithCacheTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
-            new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterQueryWithCacheTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterQueryWithCacheTest.class.getName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
         zkRegCenter.init();
         RegistryCenterEnvironmentPreparer.persist(zkRegCenter);
         zkRegCenter.addCacheData("/test");

diff --git a/...shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java b/...shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterQueryWithoutCacheTest.java
@@ -34,18 +34,16 @@
 
 class ZookeeperRegistryCenterQueryWithoutCacheTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
-            new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterQueryWithoutCacheTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterQueryWithoutCacheTest.class.getName());
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
         zkRegCenter.init();
         RegistryCenterEnvironmentPreparer.persist(zkRegCenter);
         zkRegCenter.addCacheData("/other");

diff --git a/...pache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java b/...pache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterTransactionTest.java
@@ -34,18 +34,16 @@
 
 class ZookeeperRegistryCenterTransactionTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION =
-            new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterTransactionTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterTransactionTest.class.getName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
         zkRegCenter.init();
     }
 

diff --git a/.../org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java b/.../org/apache/shardingsphere/elasticjob/reg/zookeeper/ZookeeperRegistryCenterWatchTest.java
@@ -37,17 +37,16 @@
 
 class ZookeeperRegistryCenterWatchTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(9181);
-
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterWatchTest.class.getName());
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
     private static ZookeeperRegistryCenter zkRegCenter;
 
     @BeforeAll
     static void setUp() {
         EMBED_TESTING_SERVER.start();
-        zkRegCenter = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIGURATION);
-        ZOOKEEPER_CONFIGURATION.setConnectionTimeoutMilliseconds(30000);
+        ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), ZookeeperRegistryCenterWatchTest.class.getName());
+        zkRegCenter = new ZookeeperRegistryCenter(zookeeperConfiguration);
+        zookeeperConfiguration.setConnectionTimeoutMilliseconds(30000);
         zkRegCenter.init();
         RegistryCenterEnvironmentPreparer.persist(zkRegCenter);
     }

diff --git a/...st/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperPropertiesTest.java b/...st/java/org/apache/shardingsphere/elasticjob/spring/boot/reg/ZookeeperPropertiesTest.java
@@ -28,7 +28,7 @@ class ZookeeperPropertiesTest {
     @Test
     void assertToZookeeperConfiguration() {
         ZookeeperProperties properties = new ZookeeperProperties();
-        properties.setServerLists("localhost:18181");
+        properties.setServerLists("127.0.0.1:18181");
         properties.setNamespace("test");
         properties.setBaseSleepTimeMilliseconds(2000);
         properties.setMaxSleepTimeMilliseconds(4000);

diff --git a/spring/boot-starter/src/test/resources/application-elasticjob.yml b/spring/boot-starter/src/test/resources/application-elasticjob.yml
@@ -27,7 +27,7 @@ elasticjob:
     type: RDB
     excludeJobNames: [customTestJob]
   regCenter:
-    serverLists: localhost:18181
+    serverLists: 127.0.0.1:18181
     namespace: elasticjob-spring-boot-starter
   jobs:
     customTestJob:

diff --git a/spring/boot-starter/src/test/resources/application-snapshot.yml b/spring/boot-starter/src/test/resources/application-snapshot.yml
@@ -19,5 +19,5 @@ elasticjob:
   dump:
     port: 0
   regCenter:
-    serverLists: localhost:18181
+    serverLists: 127.0.0.1:18181
     namespace: elasticjob-spring-boot-starter
diff --git a/spring/boot-starter/src/test/resources/application-tracing.yml b/spring/boot-starter/src/test/resources/application-tracing.yml
@@ -17,5 +17,5 @@
 
 elasticjob:
   regCenter:
-    serverLists: localhost:18181
+    serverLists: 127.0.0.1:18181
     namespace: elasticjob-spring-boot-starter
diff --git a/spring/namespace/src/test/resources/conf/job/conf.properties b/spring/namespace/src/test/resources/conf/job/conf.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-regCenter.serverLists=localhost:3181
+regCenter.serverLists=127.0.0.1:3181
 regCenter.namespace=elasticjob-spring-test
 regCenter.baseSleepTimeMilliseconds=1000
 regCenter.maxSleepTimeMilliseconds=3000

diff --git a/spring/namespace/src/test/resources/conf/reg/conf.properties b/spring/namespace/src/test/resources/conf/reg/conf.properties
@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-regCenter1.serverLists=localhost:3181
+regCenter1.serverLists=127.0.0.1:3181
 regCenter1.namespace=regCenter1
 regCenter1.baseSleepTimeMilliseconds=1000
 regCenter1.maxSleepTimeMilliseconds=3000
 regCenter1.maxRetries=3
 
-regCenter2.serverLists=localhost:3181
+regCenter2.serverLists=127.0.0.1:3181
 regCenter2.namespace=regCenter2
 regCenter2.baseSleepTimeMilliseconds=1000
 regCenter2.maxSleepTimeMilliseconds=3000

diff --git a/.../java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/BaseAnnotationE2ETest.java b/.../java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/BaseAnnotationE2ETest.java
@@ -39,12 +39,12 @@
 @Getter(AccessLevel.PROTECTED)
 public abstract class BaseAnnotationE2ETest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(7181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer();
 
-    private static final ZookeeperConfiguration ZOOKEEPER_CONFIG = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), "zkRegTestCenter");
+    private static ZookeeperConfiguration zookeeperConfig;
 
     @Getter(AccessLevel.PROTECTED)
-    private static final CoordinatorRegistryCenter REGISTRY_CENTER = new ZookeeperRegistryCenter(ZOOKEEPER_CONFIG);
+    private static CoordinatorRegistryCenter registryCenter;
 
     private final ElasticJob elasticJob;
 
@@ -61,15 +61,15 @@ protected BaseAnnotationE2ETest(final TestType type, final ElasticJob elasticJob
         jobConfiguration = JobAnnotationBuilder.generateJobConfiguration(elasticJob.getClass());
         jobName = jobConfiguration.getJobName();
         jobBootstrap = createJobBootstrap(type, elasticJob);
-        leaderService = new LeaderService(REGISTRY_CENTER, jobName);
+        leaderService = new LeaderService(registryCenter, jobName);
     }
 
     private JobBootstrap createJobBootstrap(final TestType type, final ElasticJob elasticJob) {
         switch (type) {
             case SCHEDULE:
-                return new ScheduleJobBootstrap(REGISTRY_CENTER, elasticJob);
+                return new ScheduleJobBootstrap(registryCenter, elasticJob);
             case ONE_OFF:
-                return new OneOffJobBootstrap(REGISTRY_CENTER, elasticJob);
+                return new OneOffJobBootstrap(registryCenter, elasticJob);
             default:
                 throw new RuntimeException(String.format("Cannot support `%s`", type));
         }
@@ -78,8 +78,10 @@ private JobBootstrap createJobBootstrap(final TestType type, final ElasticJob el
     @BeforeAll
     static void init() {
         EMBED_TESTING_SERVER.start();
-        ZOOKEEPER_CONFIG.setConnectionTimeoutMilliseconds(30000);
-        REGISTRY_CENTER.init();
+        zookeeperConfig = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), "zkRegTestCenter");
+        registryCenter = new ZookeeperRegistryCenter(zookeeperConfig);
+        zookeeperConfig.setConnectionTimeoutMilliseconds(30000);
+        registryCenter.init();
     }
 
     @BeforeEach

diff --git a/...ava/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java b/...ava/org/apache/shardingsphere/elasticjob/test/e2e/annotation/OneOffEnabledJobE2ETest.java
@@ -46,20 +46,20 @@ class OneOffEnabledJobE2ETest extends BaseAnnotationE2ETest {
     void assertEnabledRegCenterInfo() {
         assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(getJobName()), is(1));
         assertThat(JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp(), is(IpUtils.getIp()));
-        JobConfiguration jobConfig = YamlEngine.unmarshal(getREGISTRY_CENTER().get("/" + getJobName() + "/config"), JobConfigurationPOJO.class).toJobConfiguration();
+        JobConfiguration jobConfig = YamlEngine.unmarshal(getRegistryCenter().get("/" + getJobName() + "/config"), JobConfigurationPOJO.class).toJobConfiguration();
         assertThat(jobConfig.getShardingTotalCount(), is(1));
         assertNull(jobConfig.getCron());
-        assertThat(getREGISTRY_CENTER().get("/" + getJobName() + "/servers/" + JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp()), is(ServerStatus.ENABLED.name()));
-        assertThat(getREGISTRY_CENTER().get("/" + getJobName() + "/leader/election/instance"), is(JobRegistry.getInstance().getJobInstance(getJobName()).getJobInstanceId()));
-        assertTrue(getREGISTRY_CENTER().isExisted("/" + getJobName() + "/instances/" + JobRegistry.getInstance().getJobInstance(getJobName()).getJobInstanceId()));
-        getREGISTRY_CENTER().remove("/" + getJobName() + "/leader/election");
+        assertThat(getRegistryCenter().get("/" + getJobName() + "/servers/" + JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp()), is(ServerStatus.ENABLED.name()));
+        assertThat(getRegistryCenter().get("/" + getJobName() + "/leader/election/instance"), is(JobRegistry.getInstance().getJobInstance(getJobName()).getJobInstanceId()));
+        assertTrue(getRegistryCenter().isExisted("/" + getJobName() + "/instances/" + JobRegistry.getInstance().getJobInstance(getJobName()).getJobInstanceId()));
+        getRegistryCenter().remove("/" + getJobName() + "/leader/election");
         assertTrue(getLeaderService().isLeaderUntilBlock());
     }
 
     @Test
     void assertJobInit() {
         Awaitility.await().atMost(1L, TimeUnit.MINUTES).untilAsserted(() -> MatcherAssert.assertThat(((AnnotationUnShardingJob) getElasticJob()).isCompleted(), is(true)));
-        assertTrue(getREGISTRY_CENTER().isExisted("/" + getJobName() + "/sharding"));
+        assertTrue(getRegistryCenter().isExisted("/" + getJobName() + "/sharding"));
     }
 
 }