Skip to content

Commit

Permalink
YARN-11336. Upgrade Junit 4 to 5 in hadoop-yarn-applications-catalog-…
Browse files Browse the repository at this point in the history 
…webapp (#4992)

Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
  • Loading branch information
@ashutoshcipher
ashutoshcipher and Ashutosh Gupta authored Oct 25, 2022
1 parent 454157a commit 21b7790
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 97 deletions.
118 changes: 67 additions & 51 deletions ...ications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,59 +39,75 @@
<javascript.test>*Spec</javascript.test>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependencies>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${powermock.version}</version>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.12</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
</exclusion>
</exclusions>
</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>
<artifactId>jersey-json</artifactId>
<exclusions>
Expand Down
31 changes: 16 additions & 15 deletions ...src/test/java/org/apache/hadoop/yarn/appcatalog/application/TestAppCatalogSolrClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
import org.apache.hadoop.yarn.appcatalog.model.AppStoreEntry;
import org.apache.hadoop.yarn.appcatalog.model.Application;
import org.apache.solr.client.solrj.SolrClient;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.powermock.api.mockito.PowerMockito;
import static org.powermock.api.mockito.PowerMockito.when;
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;

Expand All @@ -42,7 +43,7 @@ public class TestAppCatalogSolrClient {
private static SolrClient solrClient;
private static AppCatalogSolrClient spy;

@Before
@BeforeEach
public void setup() throws Exception {
String targetLocation = EmbeddedSolrServerFactory.class
.getProtectionDomain().getCodeSource().getLocation().getFile() + "/..";
Expand All @@ -55,7 +56,7 @@ public void setup() throws Exception {
.withNoArguments().thenReturn(solrClient);
}

@After
@AfterEach
public void teardown() throws Exception {
try {
solrClient.close();
Expand All @@ -64,7 +65,7 @@ public void teardown() throws Exception {
}

@Test
public void testRegister() throws Exception {
void testRegister() throws Exception {
Application example = new Application();
example.setOrganization("jenkins-ci.org");
example.setName("jenkins");
Expand All @@ -76,7 +77,7 @@ public void testRegister() throws Exception {
}

@Test
public void testSearch() throws Exception {
void testSearch() throws Exception {
Application example = new Application();
example.setOrganization("jenkins-ci.org");
example.setName("jenkins");
Expand All @@ -90,7 +91,7 @@ public void testSearch() throws Exception {
}

@Test
public void testNotFoundSearch() throws Exception {
void testNotFoundSearch() throws Exception {
Application example = new Application();
example.setOrganization("jenkins-ci.org");
example.setName("jenkins");
Expand All @@ -104,7 +105,7 @@ public void testNotFoundSearch() throws Exception {
}

@Test
public void testGetRecommendedApps() throws Exception {
void testGetRecommendedApps() throws Exception {
AppStoreEntry example = new AppStoreEntry();
example.setOrg("jenkins-ci.org");
example.setName("jenkins");
Expand All @@ -121,15 +122,15 @@ public void testGetRecommendedApps() throws Exception {
spy.register(example2);
List<AppStoreEntry> actual = spy.getRecommendedApps();
long previous = 1000L;
for (AppStoreEntry app: actual) {
assertTrue("Recommend app is not sort by download count.",
previous > app.getDownload());
for (AppStoreEntry app : actual) {
assertTrue(previous > app.getDownload(),
"Recommend app is not sort by download count.");
previous = app.getDownload();
}
}

@Test
public void testUpgradeApp() throws Exception {
void testUpgradeApp() throws Exception {
Application example = new Application();
String expected = "2.0";
String actual = "";
Expand All @@ -143,7 +144,7 @@ public void testUpgradeApp() throws Exception {
example.setVersion("2.0");
spy.upgradeApp(example);
List<AppEntry> appEntries = spy.listAppEntries();
actual = appEntries.get(appEntries.size() -1).getYarnfile().getVersion();
actual = appEntries.get(appEntries.size() - 1).getYarnfile().getVersion();
assertEquals(expected, actual);
}
}
25 changes: 13 additions & 12 deletions .../src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppDetailsControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@
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.Container;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import javax.ws.rs.Path;
import javax.ws.rs.core.Response;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -44,14 +45,14 @@ public class AppDetailsControllerTest {

private AppDetailsController controller;

@Before
@BeforeEach
public void setUp() throws Exception {
this.controller = new AppDetailsController();

}

@Test
public void testGetDetails() throws Exception {
void testGetDetails() throws Exception {
String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class);

Expand All @@ -63,7 +64,7 @@ public void testGetDetails() throws Exception {
}

@Test
public void testGetStatus() throws Exception {
void testGetStatus() throws Exception {
String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class);

Expand All @@ -84,7 +85,7 @@ public void testGetStatus() throws Exception {
}

@Test
public void testStopApp() throws Exception {
void testStopApp() throws Exception {
String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class);

Expand All @@ -103,7 +104,7 @@ public void testStopApp() throws Exception {
}

@Test
public void testRestartApp() throws Exception {
void testRestartApp() throws Exception {
String id = "application 1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class);

Expand All @@ -122,12 +123,12 @@ public void testRestartApp() throws Exception {
}

@Test
public void testPathAnnotation() throws Exception {
void testPathAnnotation() throws Exception {
assertNotNull(this.controller.getClass()
.getAnnotations());
assertThat("The controller has the annotation Path",
this.controller.getClass()
.isAnnotationPresent(Path.class));
.isAnnotationPresent(Path.class));

final Path path = this.controller.getClass()
.getAnnotation(Path.class);
Expand All @@ -136,7 +137,7 @@ public void testPathAnnotation() throws Exception {
}

@Test
public void testUpgradeApp() throws Exception {
void testUpgradeApp() throws Exception {
String id = "application1";
AppDetailsController ac = Mockito.mock(AppDetailsController.class);

Expand Down
19 changes: 10 additions & 9 deletions ...app/src/test/java/org/apache/hadoop/yarn/appcatalog/controller/AppListControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,18 @@

import org.apache.hadoop.yarn.appcatalog.model.AppEntry;
import org.apache.hadoop.yarn.service.api.records.Service;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import javax.ws.rs.Path;
import javax.ws.rs.core.Response;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.when;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -42,14 +43,14 @@ public class AppListControllerTest {

private AppListController controller;

@Before
@BeforeEach
public void setUp() throws Exception {
this.controller = new AppListController();

}

@Test
public void testGetList() throws Exception {
void testGetList() throws Exception {
AppListController ac = Mockito.mock(AppListController.class);

List<AppEntry> actual = new ArrayList<AppEntry>();
Expand All @@ -59,7 +60,7 @@ public void testGetList() throws Exception {
}

@Test
public void testDelete() throws Exception {
void testDelete() throws Exception {
String id = "application 1";
AppListController ac = Mockito.mock(AppListController.class);

Expand All @@ -70,7 +71,7 @@ public void testDelete() throws Exception {
}

@Test
public void testDeploy() throws Exception {
void testDeploy() throws Exception {
String id = "application 1";
AppListController ac = Mockito.mock(AppListController.class);
Service service = new Service();
Expand All @@ -81,7 +82,7 @@ public void testDeploy() throws Exception {
}

@Test
public void testPathAnnotation() throws Exception {
void testPathAnnotation() throws Exception {
assertNotNull(this.controller.getClass()
.getAnnotations());
assertThat("The controller has the annotation Path",
Expand Down
Loading

0 comments on commit 21b7790

Please sign in to comment.