[Improvement-12333][Test] Migrate all UT cases from jUnit 4 to jUnit …

…5 in microbench and e2e module
apache · Oct 18, 2022 · 3dbbb65 · 3dbbb65
1 parent ac84504
commit 3dbbb65
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 52 deletions.
diff --git a/...duler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/CodeEditor.java b/...duler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/common/CodeEditor.java
@@ -19,7 +19,6 @@
  */
 package org.apache.dolphinscheduler.e2e.pages.common;
 
-import org.junit.rules.ExpectedException;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;

diff --git a/...2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java b/...2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/DolphinSchedulerExtension.java
@@ -42,16 +42,12 @@
 import org.junit.jupiter.api.extension.BeforeAllCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.ExtensionContext;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.remote.RemoteWebDriver;
 import org.testcontainers.Testcontainers;
 import org.testcontainers.containers.BrowserWebDriverContainer;
-import org.testcontainers.containers.ContainerState;
 import org.testcontainers.containers.DockerComposeContainer;
-import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 
@@ -70,7 +66,6 @@ final class DolphinSchedulerExtension implements BeforeAllCallback, AfterAllCall
     private RemoteWebDriver driver;
     private DockerComposeContainer<?> compose;
     private BrowserWebDriverContainer<?> browser;
-    private Network network;
     private HostAndPort address;
     private String rootPath;
 
@@ -92,8 +87,9 @@ public void beforeAll(ExtensionContext context) throws IOException {
 
         setBrowserContainerByOsName();
 
-        if (network != null) {
-            browser.withNetwork(network);
+        if (compose != null) {
+            Testcontainers.exposeHostPorts(compose.getServicePort("dolphinscheduler_1", 12345));
+            browser.withAccessToHost(true);
         }
         browser.start();
 
@@ -126,25 +122,7 @@ private void runInDockerContainer(ExtensionContext context) {
         compose = createDockerCompose(context);
         compose.start();
 
-        final ContainerState dsContainer = compose.getContainerByServiceName("dolphinscheduler_1")
-                .orElseThrow(() -> new RuntimeException("Failed to find a container named 'dolphinscheduler'"));
-        final String networkId = dsContainer.getContainerInfo().getNetworkSettings().getNetworks().keySet().iterator().next();
-        network = new Network() {
-            @Override
-            public String getId() {
-                return networkId;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public Statement apply(Statement base, Description description) {
-                return null;
-            }
-        };
-        address = HostAndPort.fromParts("dolphinscheduler", 12345);
+        address = HostAndPort.fromParts("host.testcontainers.internal", compose.getServicePort("dolphinscheduler_1", 12345));
         rootPath = "/dolphinscheduler/ui/";
     }
 
@@ -221,6 +199,7 @@ private DockerComposeContainer<?> createDockerCompose(ExtensionContext context)
         compose = new DockerComposeContainer<>(files)
             .withPull(true)
             .withTailChildContainers(true)
+            .withExposedService("dolphinscheduler_1", 12345)
             .withLogConsumer("dolphinscheduler_1", outputFrame -> LOGGER.info(outputFrame.getUtf8String()))
             .waitingFor("dolphinscheduler_1", Wait.forHealthcheck().withStartupTimeout(Duration.ofSeconds(180)));
 

diff --git a/...cheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/TestDescription.java b/...cheduler-e2e-core/src/main/java/org/apache/dolphinscheduler/e2e/core/TestDescription.java
@@ -21,8 +21,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import static org.junit.platform.commons.util.StringUtils.isBlank;
-
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
@@ -45,7 +43,7 @@ public String getTestId() {
     public String getFilesystemFriendlyName() {
         final String contextId = context.getUniqueId();
         try {
-            return (isBlank(contextId))
+            return (contextId == null || contextId.trim().isEmpty())
                     ? UNKNOWN_NAME
                     : URLEncoder.encode(contextId, UTF_8.toString());
         } catch (UnsupportedEncodingException e) {

diff --git a/dolphinscheduler-microbench/pom.xml b/dolphinscheduler-microbench/pom.xml
@@ -15,15 +15,14 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>dolphinscheduler</artifactId>
         <groupId>org.apache.dolphinscheduler</groupId>
+        <artifactId>dolphinscheduler</artifactId>
         <version>dev-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dolphinscheduler-microbench</artifactId>
     <packaging>jar</packaging>
@@ -35,6 +34,18 @@
         <uberjar.name>benchmarks</uberjar.name>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.dolphinscheduler</groupId>
+                <artifactId>dolphinscheduler-bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
 
         <dependency>
@@ -51,9 +62,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
         </dependency>
 
         <dependency>
@@ -67,18 +77,6 @@
 
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.dolphinscheduler</groupId>
-                <artifactId>dolphinscheduler-bom</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <build>
         <plugins>
             <plugin>
@@ -112,5 +110,4 @@
         </plugins>
     </build>
 
-
 </project>
diff --git a/...ench/src/main/java/org/apache/dolphinscheduler/microbench/base/AbstractBaseBenchmark.java b/...ench/src/main/java/org/apache/dolphinscheduler/microbench/base/AbstractBaseBenchmark.java
@@ -20,7 +20,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -122,4 +122,3 @@ private static int getForks() {
     }
 
 }
-