[cloudstack] branch 4.18 updated: engine/schema: use junit 4 (same as the rest of the project tests)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new 8bbe2f7cb22 engine/schema: use junit 4 (same as the rest of the 
project tests)
8bbe2f7cb22 is described below

commit 8bbe2f7cb2243a6c863422081239a7bdf2214a65
Author: dahn <d...@onecht.net>
AuthorDate: Thu Apr 27 11:36:27 2023 +0200

    engine/schema: use junit 4 (same as the rest of the project tests)
---
 engine/schema/pom.xml                              |  6 ------
 .../upgrade/DatabaseVersionHierarchyTest.java      | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index 45360bfaba1..da40a524c9b 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -57,12 +57,6 @@
             <artifactId>ini4j</artifactId>
             <version>${cs.ini.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${cs.junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git 
a/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
 
b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
index 3fb6bf5d63a..e6692bdbde1 100644
--- 
a/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
+++ 
b/engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
@@ -26,15 +26,15 @@ import com.cloud.upgrade.dao.Upgrade41520to41600;
 import com.cloud.upgrade.dao.Upgrade41720to41800;
 import com.cloud.upgrade.dao.Upgrade481to490;
 import org.apache.cloudstack.utils.CloudStackVersion;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 import java.io.InputStream;
 import java.sql.Connection;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.Assert.assertEquals;
 
-class DatabaseVersionHierarchyTest {
+public class DatabaseVersionHierarchyTest {
 
     private static DatabaseVersionHierarchy hierarchy;
 
@@ -71,8 +71,8 @@ class DatabaseVersionHierarchyTest {
 
     }
 
-    @BeforeAll
-    static void init() {
+    @BeforeClass
+    public static void init() {
         DatabaseVersionHierarchy.DatabaseVersionHierarchyBuilder builder = 
DatabaseVersionHierarchy.builder()
                 .next("0.0.5", new DummyUpgrade())
                 .next("1.0.0.0", new DummyUpgrade())
@@ -95,23 +95,23 @@ class DatabaseVersionHierarchyTest {
     }
 
     @Test
-    void getRecentVersionMiddle() {
+    public void getRecentVersionMiddle() {
         assertEquals("2.0.0", 
hierarchy.getRecentVersion(CloudStackVersion.parse("2.2.2")).toString());
     }
     @Test
-    void getRecentVersionEarly() {
+    public void getRecentVersionEarly() {
         assertEquals(null, 
hierarchy.getRecentVersion(CloudStackVersion.parse("0.0.2")));
     }
     @Test
-    void getRecentVersionStart() {
+    public void getRecentVersionStart() {
         assertEquals(null, 
hierarchy.getRecentVersion(CloudStackVersion.parse("0.0.5")));
     }
     @Test
-    void getRecentVersionJust() {
+    public void getRecentVersionJust() {
         assertEquals("0.0.5", 
hierarchy.getRecentVersion(CloudStackVersion.parse("0.0.9")).toString());
     }
     @Test
-    void getRecentVersionExact() {
+    public void getRecentVersionExact() {
         assertEquals("0.0.5", 
hierarchy.getRecentVersion(CloudStackVersion.parse("1.0.0.0")).toString());
     }
 }
\ No newline at end of file