Prevent unit tests and E2E from using host ports 7181 and 9000

apache · Jul 27, 2024 · e755c04 · e755c04
1 parent 9bceb88
commit e755c04
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 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,7 +41,7 @@
 
 class OneOffJobBootstrapTest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(7181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(-1);
 
     private static final ZookeeperConfiguration ZOOKEEPER_CONFIGURATION = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), OneOffJobBootstrapTest.class.getSimpleName());
 

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/.../java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/BaseAnnotationE2ETest.java b/.../java/org/apache/shardingsphere/elasticjob/test/e2e/annotation/BaseAnnotationE2ETest.java
@@ -39,7 +39,7 @@
 @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(-1);
 
     private static final ZookeeperConfiguration ZOOKEEPER_CONFIG = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), "zkRegTestCenter");
 

diff --git a/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/BaseE2ETest.java b/test/e2e/src/test/java/org/apache/shardingsphere/elasticjob/test/e2e/raw/BaseE2ETest.java
@@ -38,7 +38,7 @@
 @Getter(AccessLevel.PROTECTED)
 public abstract class BaseE2ETest {
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(7181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(-1);
 
     private static final ZookeeperConfiguration ZOOKEEPER_CONFIG = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), "zkRegTestCenter");
 

diff --git a/...va/org/apache/shardingsphere/elasticjob/test/e2e/snapshot/BaseSnapshotServiceE2ETest.java b/...va/org/apache/shardingsphere/elasticjob/test/e2e/snapshot/BaseSnapshotServiceE2ETest.java
@@ -35,9 +35,9 @@
 
 public abstract class BaseSnapshotServiceE2ETest {
 
-    static final int DUMP_PORT = 9000;
+    static final int DUMP_PORT = -1;
 
-    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(7181);
+    private static final EmbedTestingServer EMBED_TESTING_SERVER = new EmbedTestingServer(-1);
 
     private static final ZookeeperConfiguration ZOOKEEPER_CONFIG = new ZookeeperConfiguration(EMBED_TESTING_SERVER.getConnectionString(), "zkRegTestCenter");
 

diff --git a/...util/src/main/java/org/apache/shardingsphere/elasticjob/test/util/EmbedTestingServer.java b/...util/src/main/java/org/apache/shardingsphere/elasticjob/test/util/EmbedTestingServer.java
@@ -132,6 +132,6 @@ private boolean isIgnoredException(final Throwable cause) {
      * @return connection string
      */
     public String getConnectionString() {
-        return "localhost:" + port;
+        return testingServer.getConnectString();
     }
 }