From 6337058aa68146c15e8fc47217798d9ec7068c92 Mon Sep 17 00:00:00 2001
From: Ashutosh Gupta <ashugpt@amazon.com>
Date: Mon, 10 Oct 2022 01:00:41 +0100
Subject: [PATCH 1/2] YARN-11337. Upgrade Junit 4 to 5 in
 hadoop-yarn-applications-mawo

---
 .../pom.xml                                   | 25 +++++++++++-------
 .../server/common/TestMaWoConfiguration.java  | 26 ++++++++++---------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
index 2809c75ffd84f..dcf6212336649 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
@@ -31,23 +31,28 @@
   </properties>
 
   <dependencies>
+
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
     </dependency>
-
-      <dependency>
-          <groupId>org.apache.hadoop</groupId>
-          <artifactId>hadoop-common</artifactId>
-          <type>test-jar</type>
-          <scope>test</scope>
-      </dependency>
 
     <dependency>
       <groupId>com.google.inject</groupId>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
index e189bcb8f435c..5796340f4bf70 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
@@ -19,8 +19,10 @@
 package org.apache.hadoop.applications.mawo.server.common;
 
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Test MaWo configuration.
@@ -31,29 +33,29 @@ public class TestMaWoConfiguration {
    * Validate default MaWo Configurations.
    */
   @Test
-  public void testMaWoConfiguration() {
+  void testMaWoConfiguration() {
 
     MawoConfiguration mawoConf = new MawoConfiguration();
 
     // validate Rpc server port
-    Assert.assertEquals(mawoConf.getRpcServerPort(), 5120);
+    assertEquals(mawoConf.getRpcServerPort(), 5120);
 
     // validate Rpc hostname
-    Assert.assertTrue("localhost".equals(mawoConf.getRpcHostName()));
+    assertEquals("localhost", mawoConf.getRpcHostName());
 
     // validate job queue storage conf
     boolean jobQueueStorage = mawoConf.getJobQueueStorageEnabled();
-    Assert.assertTrue(jobQueueStorage);
+    assertTrue(jobQueueStorage);
 
     // validate default teardownWorkerValidity Interval
-    Assert.assertEquals(mawoConf.getTeardownWorkerValidityInterval(), 120000);
+    assertEquals(mawoConf.getTeardownWorkerValidityInterval(), 120000);
 
     // validate Zk related configs
-    Assert.assertTrue("/tmp/mawoRoot".equals(mawoConf.getZKParentPath()));
-    Assert.assertTrue("localhost:2181".equals(mawoConf.getZKAddress()));
-    Assert.assertEquals(1000, mawoConf.getZKRetryIntervalMS());
-    Assert.assertEquals(10000, mawoConf.getZKSessionTimeoutMS());
-    Assert.assertEquals(1000, mawoConf.getZKRetriesNum());
+    assertEquals("/tmp/mawoRoot", mawoConf.getZKParentPath());
+    assertEquals("localhost:2181", mawoConf.getZKAddress());
+    assertEquals(1000, mawoConf.getZKRetryIntervalMS());
+    assertEquals(10000, mawoConf.getZKSessionTimeoutMS());
+    assertEquals(1000, mawoConf.getZKRetriesNum());
   }
 
 

From 155a1be4a0f4eff8bd63c3f3e670b72c1c139d9b Mon Sep 17 00:00:00 2001
From: Ashutosh Gupta <ashugpt@amazon.com>
Date: Tue, 25 Oct 2022 09:52:45 +0100
Subject: [PATCH 2/2] Adding junit-platform-launcher and addressing comments

---
 .../hadoop-yarn-applications-mawo-core/pom.xml               | 5 +++++
 .../mawo/server/common/TestMaWoConfiguration.java            | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
index dcf6212336649..770fceaaa3678 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>com.google.inject</groupId>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
index 5796340f4bf70..edfed8db1d7b9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-mawo/hadoop-yarn-applications-mawo-core/src/test/java/org/apache/hadoop/applications/mawo/server/common/TestMaWoConfiguration.java
@@ -38,7 +38,7 @@ void testMaWoConfiguration() {
     MawoConfiguration mawoConf = new MawoConfiguration();
 
     // validate Rpc server port
-    assertEquals(mawoConf.getRpcServerPort(), 5120);
+    assertEquals(5120, mawoConf.getRpcServerPort());
 
     // validate Rpc hostname
     assertEquals("localhost", mawoConf.getRpcHostName());
@@ -48,7 +48,7 @@ void testMaWoConfiguration() {
     assertTrue(jobQueueStorage);
 
     // validate default teardownWorkerValidity Interval
-    assertEquals(mawoConf.getTeardownWorkerValidityInterval(), 120000);
+    assertEquals(120000, mawoConf.getTeardownWorkerValidityInterval());
 
     // validate Zk related configs
     assertEquals("/tmp/mawoRoot", mawoConf.getZKParentPath());