Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-11336. Upgrade Junit 4 to 5 in hadoop-yarn-applications-catalog-webapp (#4992) 

Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Ashutosh Gupta 2022-10-25 08:52:31 +01:00 committed by GitHub
parent 454157a384
commit 21b7790866
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 117 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
View File

@ -39,59 +39,75 @@
<javascript.test>*Spec</javascript.test> <javascript.test>*Spec</javascript.test>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>io.swagger</groupId>
<artifactId>junit</artifactId> <artifactId>swagger-annotations</artifactId>
<scope>test</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.mockito</groupId>
<groupId>io.swagger</groupId> <artifactId>mockito-all</artifactId>
<artifactId>swagger-annotations</artifactId> <version>1.9.5</version>
</dependency> <scope>test</scope>
<dependency> </dependency>
<groupId>org.mockito</groupId> <dependency>
<artifactId>mockito-all</artifactId> <groupId>org.powermock</groupId>
<version>1.9.5</version> <artifactId>powermock-module-junit4</artifactId>
<scope>test</scope> <version>${powermock.version}</version>
</dependency> <scope>test</scope>
<dependency> <exclusions>
<groupId>org.powermock</groupId> <exclusion>
<artifactId>powermock-module-junit4</artifactId> <groupId>junit</groupId>
<version>${powermock.version}</version> <artifactId>junit</artifactId>
<scope>test</scope> </exclusion>
</dependency> </exclusions>
<dependency> </dependency>
<groupId>org.powermock</groupId> <dependency>
<artifactId>powermock-api-mockito</artifactId> <groupId>org.powermock</groupId>
<version>${powermock.version}</version> <artifactId>powermock-api-mockito</artifactId>
<exclusions> <version>${powermock.version}</version>
<exclusion> <exclusions>
<groupId>org.mockito</groupId> <exclusion>
<artifactId>mockito-all</artifactId> <groupId>org.mockito</groupId>
</exclusion> <artifactId>mockito-all</artifactId>
</exclusions> </exclusion>
<scope>test</scope> </exclusions>
</dependency> <scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>2.12</version> <version>2.12</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.javassist</groupId> <groupId>org.javassist</groupId>
<artifactId>javassist</artifactId> <artifactId>javassist</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId> <artifactId>jackson-jaxrs-base</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.github.pjfanning</groupId> <groupId>com.github.pjfanning</groupId>
<artifactId>jersey-json</artifactId> <artifactId>jersey-json</artifactId>
<exclusions> <exclusions>

31
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
View File

@ -22,14 +22,15 @@ import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry; import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
import org.apache.hadoop.yarn.appcatalog.model.Application; import org.apache.hadoop.yarn.appcatalog.model.Application;
import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrClient;
import org.junit.After; import org.junit.jupiter.api.AfterEach;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.powermock.api.mockito.PowerMockito; import org.powermock.api.mockito.PowerMockito;
import static org.powermock.api.mockito.PowerMockito.when; import static org.powermock.api.mockito.PowerMockito.when;
import static org.powermock.api.support.membermodification.MemberMatcher.method; import static org.powermock.api.support.membermodification.MemberMatcher.method;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List; import java.util.List;
@ -42,7 +43,7 @@ public class TestAppCatalogSolrClient {
private static SolrClient solrClient; private static SolrClient solrClient;
private static AppCatalogSolrClient spy; private static AppCatalogSolrClient spy;
@Before @BeforeEach
public void setup() throws Exception { public void setup() throws Exception {
String targetLocation = EmbeddedSolrServerFactory.class String targetLocation = EmbeddedSolrServerFactory.class
.getProtectionDomain().getCodeSource().getLocation().getFile() + "/.."; .getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
@ -55,7 +56,7 @@ public class TestAppCatalogSolrClient {
.withNoArguments().thenReturn(solrClient); .withNoArguments().thenReturn(solrClient);
} }
@After @AfterEach
public void teardown() throws Exception { public void teardown() throws Exception {
try { try {
solrClient.close(); solrClient.close();
@ -64,7 +65,7 @@ public class TestAppCatalogSolrClient {
} }
@Test @Test
public void testRegister() throws Exception { void testRegister() throws Exception {
Application example = new Application(); Application example = new Application();
example.setOrganization("jenkins-ci.org"); example.setOrganization("jenkins-ci.org");
example.setName("jenkins"); example.setName("jenkins");
@ -76,7 +77,7 @@ public class TestAppCatalogSolrClient {
} }
@Test @Test
public void testSearch() throws Exception { void testSearch() throws Exception {
Application example = new Application(); Application example = new Application();
example.setOrganization("jenkins-ci.org"); example.setOrganization("jenkins-ci.org");
example.setName("jenkins"); example.setName("jenkins");
@ -90,7 +91,7 @@ public class TestAppCatalogSolrClient {
} }
@Test @Test
public void testNotFoundSearch() throws Exception { void testNotFoundSearch() throws Exception {
Application example = new Application(); Application example = new Application();
example.setOrganization("jenkins-ci.org"); example.setOrganization("jenkins-ci.org");
example.setName("jenkins"); example.setName("jenkins");
@ -104,7 +105,7 @@ public class TestAppCatalogSolrClient {
} }
@Test @Test
public void testGetRecommendedApps() throws Exception { void testGetRecommendedApps() throws Exception {
AppStoreEntry example = new AppStoreEntry(); AppStoreEntry example = new AppStoreEntry();
example.setOrg("jenkins-ci.org"); example.setOrg("jenkins-ci.org");
example.setName("jenkins"); example.setName("jenkins");
@ -121,15 +122,15 @@ public class TestAppCatalogSolrClient {
spy.register(example2); spy.register(example2);
List<AppStoreEntry> actual = spy.getRecommendedApps(); List<AppStoreEntry> actual = spy.getRecommendedApps();
long previous = 1000L; long previous = 1000L;
for (AppStoreEntry app: actual) { for (AppStoreEntry app : actual) {
assertTrue("Recommend app is not sort by download count.", assertTrue(previous > app.getDownload(),
previous > app.getDownload()); "Recommend app is not sort by download count.");
previous = app.getDownload(); previous = app.getDownload();
} }
} }
@Test @Test
public void testUpgradeApp() throws Exception { void testUpgradeApp() throws Exception {
Application example = new Application(); Application example = new Application();
String expected = "2.0"; String expected = "2.0";
String actual = ""; String actual = "";
@ -143,7 +144,7 @@ public class TestAppCatalogSolrClient {
example.setVersion("2.0"); example.setVersion("2.0");
spy.upgradeApp(example); spy.upgradeApp(example);
List<AppEntry> appEntries = spy.listAppEntries(); List<AppEntry> appEntries = spy.listAppEntries();
actual = appEntries.get(appEntries.size() -1).getYarnfile().getVersion(); actual = appEntries.get(appEntries.size() - 1).getYarnfile().getVersion();
assertEquals(expected, actual); assertEquals(expected, actual);
} }
} }

25
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
View File

@ -22,8 +22,8 @@ import org.apache.hadoop.yarn.service.api.records.Service;
import org.apache.hadoop.yarn.appcatalog.model.AppEntry; import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
import org.apache.hadoop.yarn.service.api.records.Component; import org.apache.hadoop.yarn.service.api.records.Component;
import org.apache.hadoop.yarn.service.api.records.Container; import org.apache.hadoop.yarn.service.api.records.Container;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -31,8 +31,9 @@ import javax.ws.rs.core.Response;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is; import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -44,14 +45,14 @@ public class AppDetailsControllerTest {
private AppDetailsController controller; private AppDetailsController controller;
@Before @BeforeEach
public void setUp() throws Exception { public void setUp() throws Exception {
this.controller = new AppDetailsController(); this.controller = new AppDetailsController();
} }
@Test @Test
public void testGetDetails() throws Exception { void testGetDetails() throws Exception {
String id = "application 1"; String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class); AppDetailsController ac = Mockito.mock(AppDetailsController.class);
@ -63,7 +64,7 @@ public class AppDetailsControllerTest {
} }
@Test @Test
public void testGetStatus() throws Exception { void testGetStatus() throws Exception {
String id = "application 1"; String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class); AppDetailsController ac = Mockito.mock(AppDetailsController.class);
@ -84,7 +85,7 @@ public class AppDetailsControllerTest {
} }
@Test @Test
public void testStopApp() throws Exception { void testStopApp() throws Exception {
String id = "application 1"; String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class); AppDetailsController ac = Mockito.mock(AppDetailsController.class);
@ -103,7 +104,7 @@ public class AppDetailsControllerTest {
} }
@Test @Test
public void testRestartApp() throws Exception { void testRestartApp() throws Exception {
String id = "application 1"; String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class); AppDetailsController ac = Mockito.mock(AppDetailsController.class);
@ -122,12 +123,12 @@ public class AppDetailsControllerTest {
} }
@Test @Test
public void testPathAnnotation() throws Exception { void testPathAnnotation() throws Exception {
assertNotNull(this.controller.getClass() assertNotNull(this.controller.getClass()
.getAnnotations()); .getAnnotations());
assertThat("The controller has the annotation Path", assertThat("The controller has the annotation Path",
this.controller.getClass() this.controller.getClass()
.isAnnotationPresent(Path.class)); .isAnnotationPresent(Path.class));
final Path path = this.controller.getClass() final Path path = this.controller.getClass()
.getAnnotation(Path.class); .getAnnotation(Path.class);
@ -136,7 +137,7 @@ public class AppDetailsControllerTest {
} }
@Test @Test
public void testUpgradeApp() throws Exception { void testUpgradeApp() throws Exception {
String id = "application1"; String id = "application1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class); AppDetailsController ac = Mockito.mock(AppDetailsController.class);

19
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
View File

@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.appcatalog.controller;
import org.apache.hadoop.yarn.appcatalog.model.AppEntry; import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
import org.apache.hadoop.yarn.service.api.records.Service; import org.apache.hadoop.yarn.service.api.records.Service;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -29,8 +29,9 @@ import javax.ws.rs.core.Response;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is; import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -42,14 +43,14 @@ public class AppListControllerTest {
private AppListController controller; private AppListController controller;
@Before @BeforeEach
public void setUp() throws Exception { public void setUp() throws Exception {
this.controller = new AppListController(); this.controller = new AppListController();
} }
@Test @Test
public void testGetList() throws Exception { void testGetList() throws Exception {
AppListController ac = Mockito.mock(AppListController.class); AppListController ac = Mockito.mock(AppListController.class);
List<AppEntry> actual = new ArrayList<AppEntry>(); List<AppEntry> actual = new ArrayList<AppEntry>();
@ -59,7 +60,7 @@ public class AppListControllerTest {
} }
@Test @Test
public void testDelete() throws Exception { void testDelete() throws Exception {
String id = "application 1"; String id = "application 1";
AppListController ac = Mockito.mock(AppListController.class); AppListController ac = Mockito.mock(AppListController.class);
@ -70,7 +71,7 @@ public class AppListControllerTest {
} }
@Test @Test
public void testDeploy() throws Exception { void testDeploy() throws Exception {
String id = "application 1"; String id = "application 1";
AppListController ac = Mockito.mock(AppListController.class); AppListController ac = Mockito.mock(AppListController.class);
Service service = new Service(); Service service = new Service();
@ -81,7 +82,7 @@ public class AppListControllerTest {
} }
@Test @Test
public void testPathAnnotation() throws Exception { void testPathAnnotation() throws Exception {
assertNotNull(this.controller.getClass() assertNotNull(this.controller.getClass()
.getAnnotations()); .getAnnotations());
assertThat("The controller has the annotation Path", assertThat("The controller has the annotation Path",

21
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppStoreControllerTest.java
View File

@ -20,8 +20,8 @@ package org.apache.hadoop.yarn.appcatalog.controller;
import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry; import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
import org.apache.hadoop.yarn.appcatalog.model.Application; import org.apache.hadoop.yarn.appcatalog.model.Application;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import org.mockito.Mockito; import org.mockito.Mockito;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -29,8 +29,9 @@ import javax.ws.rs.core.Response;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is; import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.*; import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -42,14 +43,14 @@ public class AppStoreControllerTest {
private AppStoreController controller; private AppStoreController controller;
@Before @BeforeEach
public void setUp() throws Exception { public void setUp() throws Exception {
this.controller = new AppStoreController(); this.controller = new AppStoreController();
} }
@Test @Test
public void testGetRecommended() throws Exception { void testGetRecommended() throws Exception {
AppStoreController ac = Mockito.mock(AppStoreController.class); AppStoreController ac = Mockito.mock(AppStoreController.class);
List<AppStoreEntry> actual = new ArrayList<AppStoreEntry>(); List<AppStoreEntry> actual = new ArrayList<AppStoreEntry>();
when(ac.get()).thenReturn(actual); when(ac.get()).thenReturn(actual);
@ -58,7 +59,7 @@ public class AppStoreControllerTest {
} }
@Test @Test
public void testSearch() throws Exception { void testSearch() throws Exception {
String keyword = "jenkins"; String keyword = "jenkins";
AppStoreController ac = Mockito.mock(AppStoreController.class); AppStoreController ac = Mockito.mock(AppStoreController.class);
List<AppStoreEntry> expected = new ArrayList<AppStoreEntry>(); List<AppStoreEntry> expected = new ArrayList<AppStoreEntry>();
@ -68,7 +69,7 @@ public class AppStoreControllerTest {
} }
@Test @Test
public void testRegister() throws Exception { void testRegister() throws Exception {
AppStoreController ac = Mockito.mock(AppStoreController.class); AppStoreController ac = Mockito.mock(AppStoreController.class);
Application app = new Application(); Application app = new Application();
app.setName("jenkins"); app.setName("jenkins");
@ -82,12 +83,12 @@ public class AppStoreControllerTest {
} }
@Test @Test
public void testPathAnnotation() throws Exception { void testPathAnnotation() throws Exception {
assertNotNull(this.controller.getClass() assertNotNull(this.controller.getClass()
.getAnnotations()); .getAnnotations());
assertThat("The controller has the annotation Path", assertThat("The controller has the annotation Path",
this.controller.getClass() this.controller.getClass()
.isAnnotationPresent(Path.class)); .isAnnotationPresent(Path.class));
final Path path = this.controller.getClass() final Path path = this.controller.getClass()
.getAnnotation(Path.class); .getAnnotation(Path.class);