Skip to content

Commit aa4c744

Browse files
Prabhu Josephaajisaka
Prabhu Joseph
authored and
aajisaka
committed
YARN-9470. Fix order of actual and expected expression in assert statements
Signed-off-by: Akira Ajisaka <[email protected]>
1 parent 6e4399e commit aa4c744

File tree

76 files changed

+501
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+501
-345
lines changed

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@
250250
<scope>test</scope>
251251
</dependency>
252252

253+
<dependency>
254+
<groupId>org.assertj</groupId>
255+
<artifactId>assertj-core</artifactId>
256+
<scope>test</scope>
257+
</dependency>
258+
253259
</dependencies>
254260

255261
</project>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import java.util.*;
6262
import java.util.concurrent.TimeoutException;
6363

64+
import static org.assertj.core.api.Assertions.assertThat;
6465
import static org.apache.hadoop.yarn.api.records.YarnApplicationState.FINISHED;
6566
import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.*;
6667
import static org.apache.hadoop.yarn.service.exceptions.LauncherExitCodes.EXIT_COMMAND_ARGUMENT_ERROR;
@@ -904,7 +905,7 @@ private void checkEachCompInstancesInOrder(Component component, String
904905

905906
int i = 0;
906907
for (String s : instances) {
907-
Assert.assertEquals(component.getName() + "-" + i, s);
908+
assertThat(s).isEqualTo(component.getName() + "-" + i);
908909
i++;
909910
}
910911
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/client/TestServiceCLI.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.util.Arrays;
5151
import java.util.List;
5252

53+
import static org.assertj.core.api.Assertions.assertThat;
5354
import static org.apache.hadoop.yarn.client.api.AppAdminClient.YARN_APP_ADMIN_CLIENT_PREFIX;
5455
import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.DEPENDENCY_TARBALL_PATH;
5556
import static org.apache.hadoop.yarn.service.conf.YarnServiceConf.YARN_SERVICE_BASE_PATH;
@@ -172,7 +173,7 @@ public void testInitiateServiceUpgrade() throws Exception {
172173
"-initiate", ExampleAppJson.resourceName(ExampleAppJson.APP_JSON),
173174
"-appTypes", DUMMY_APP_TYPE};
174175
int result = cli.run(ApplicationCLI.preProcessArgs(args));
175-
Assert.assertEquals(result, 0);
176+
assertThat(result).isEqualTo(0);
176177
}
177178

178179
@Test (timeout = 180000)
@@ -182,7 +183,7 @@ public void testInitiateAutoFinalizeServiceUpgrade() throws Exception {
182183
"-autoFinalize",
183184
"-appTypes", DUMMY_APP_TYPE};
184185
int result = cli.run(ApplicationCLI.preProcessArgs(args));
185-
Assert.assertEquals(result, 0);
186+
assertThat(result).isEqualTo(0);
186187
}
187188

188189
@Test
@@ -194,7 +195,7 @@ public void testUpgradeInstances() throws Exception {
194195
"-instances", "comp1-0,comp1-1",
195196
"-appTypes", DUMMY_APP_TYPE};
196197
int result = cli.run(ApplicationCLI.preProcessArgs(args));
197-
Assert.assertEquals(result, 0);
198+
assertThat(result).isEqualTo(0);
198199
}
199200

200201
@Test
@@ -206,7 +207,7 @@ public void testUpgradeComponents() throws Exception {
206207
"-components", "comp1,comp2",
207208
"-appTypes", DUMMY_APP_TYPE};
208209
int result = cli.run(ApplicationCLI.preProcessArgs(args));
209-
Assert.assertEquals(result, 0);
210+
assertThat(result).isEqualTo(0);
210211
}
211212

212213
@Test
@@ -218,7 +219,7 @@ public void testGetInstances() throws Exception {
218219
"-components", "comp1,comp2",
219220
"-appTypes", DUMMY_APP_TYPE};
220221
int result = cli.run(ApplicationCLI.preProcessArgs(args));
221-
Assert.assertEquals(result, 0);
222+
assertThat(result).isEqualTo(0);
222223
}
223224

224225
@Test
@@ -229,7 +230,7 @@ public void testCancelUpgrade() throws Exception {
229230
String[] args = {"app", "-upgrade", "app-1",
230231
"-cancel", "-appTypes", DUMMY_APP_TYPE};
231232
int result = cli.run(ApplicationCLI.preProcessArgs(args));
232-
Assert.assertEquals(result, 0);
233+
assertThat(result).isEqualTo(0);
233234
}
234235

235236
@Test (timeout = 180000)

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/utils/TestServiceApiUtil.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import java.util.Collections;
4646
import java.util.List;
4747

48+
import static org.assertj.core.api.Assertions.assertThat;
4849
import static org.apache.hadoop.yarn.service.conf.RestApiConstants.DEFAULT_UNLIMITED_LIFETIME;
4950
import static org.apache.hadoop.yarn.service.exceptions.RestApiErrorMessages.*;
5051
import static org.junit.Assert.assertEquals;
@@ -268,7 +269,7 @@ public void testArtifacts() throws IOException {
268269
Assert.fail(NO_EXCEPTION_PREFIX + e.getMessage());
269270
}
270271

271-
assertEquals(app.getLifetime(), DEFAULT_UNLIMITED_LIFETIME);
272+
assertThat(app.getLifetime()).isEqualTo(DEFAULT_UNLIMITED_LIFETIME);
272273
}
273274

274275
private static Resource createValidResource() {

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@
8484
<artifactId>junit</artifactId>
8585
<scope>test</scope>
8686
</dependency>
87+
<dependency>
88+
<groupId>org.assertj</groupId>
89+
<artifactId>assertj-core</artifactId>
90+
<scope>test</scope>
91+
</dependency>
8792
<!-- 'mvn dependency:analyze' fails to detect use of this dependency -->
8893
<dependency>
8994
<groupId>org.apache.hadoop</groupId>

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/async/impl/TestAMRMClientAsync.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.client.api.async.impl;
2020

21+
import static org.assertj.core.api.Assertions.assertThat;
2122
import static org.mockito.ArgumentMatchers.any;
2223
import static org.mockito.ArgumentMatchers.anyFloat;
2324
import static org.mockito.ArgumentMatchers.anyInt;
@@ -596,7 +597,7 @@ public float getProgress() {
596597

597598
@Override
598599
public void onError(Throwable e) {
599-
Assert.assertEquals(e.getMessage(), "Exception from callback handler");
600+
assertThat(e).hasMessage("Exception from callback handler");
600601
callStopAndNotify();
601602
}
602603

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.client.api.impl;
2020

21+
import static org.assertj.core.api.Assertions.assertThat;
2122
import static org.mockito.ArgumentMatchers.any;
2223
import static org.mockito.Mockito.mock;
2324
import static org.mockito.Mockito.when;
@@ -84,7 +85,7 @@ public void testGetApplications() throws YarnException, IOException {
8485
Assert.assertEquals(reports, expectedReports);
8586

8687
reports = client.getApplications();
87-
Assert.assertEquals(reports.size(), 4);
88+
assertThat(reports).hasSize(4);
8889
client.stop();
8990
}
9091

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAHSv2ClientImpl.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.client.api.impl;
2020

21+
import static org.assertj.core.api.Assertions.assertThat;
2122
import static org.mockito.Mockito.mock;
2223
import static org.mockito.Mockito.when;
2324

@@ -80,14 +81,14 @@ public void testGetContainerReport() throws IOException, YarnException {
8081
when(spyTimelineReaderClient.getApplicationEntity(appId, "ALL", null))
8182
.thenReturn(createApplicationTimelineEntity(appId, true, false));
8283
ContainerReport report = client.getContainerReport(containerId);
83-
Assert.assertEquals(report.getContainerId(), containerId);
84-
Assert.assertEquals(report.getAssignedNode().getHost(), "test host");
85-
Assert.assertEquals(report.getAssignedNode().getPort(), 100);
86-
Assert.assertEquals(report.getAllocatedResource().getVirtualCores(), 8);
87-
Assert.assertEquals(report.getCreationTime(), 123456);
88-
Assert.assertEquals(report.getLogUrl(),
89-
"https://localhost:8188/ahs/logs/test host:100/"
90-
+ "container_0_0001_01_000001/container_0_0001_01_000001/user1");
84+
assertThat(report.getContainerId()).isEqualTo(containerId);
85+
assertThat(report.getAssignedNode().getHost()).isEqualTo("test host");
86+
assertThat(report.getAssignedNode().getPort()).isEqualTo(100);
87+
assertThat(report.getAllocatedResource().getVirtualCores()).isEqualTo(8);
88+
assertThat(report.getCreationTime()).isEqualTo(123456);
89+
assertThat(report.getLogUrl()).isEqualTo("https://localhost:8188/ahs/logs/"
90+
+ "test host:100/container_0_0001_01_000001/"
91+
+ "container_0_0001_01_000001/user1");
9192
}
9293

9394
@Test
@@ -100,10 +101,10 @@ public void testGetAppAttemptReport() throws IOException, YarnException {
100101
.thenReturn(createAppAttemptTimelineEntity(appAttemptId));
101102
ApplicationAttemptReport report =
102103
client.getApplicationAttemptReport(appAttemptId);
103-
Assert.assertEquals(report.getApplicationAttemptId(), appAttemptId);
104-
Assert.assertEquals(report.getFinishTime(), Integer.MAX_VALUE + 2L);
105-
Assert.assertEquals(report.getOriginalTrackingUrl(),
106-
"test original tracking url");
104+
assertThat(report.getApplicationAttemptId()).isEqualTo(appAttemptId);
105+
assertThat(report.getFinishTime()).isEqualTo(Integer.MAX_VALUE + 2L);
106+
assertThat(report.getOriginalTrackingUrl()).
107+
isEqualTo("test original tracking url");
107108
}
108109

109110
@Test
@@ -112,11 +113,12 @@ public void testGetAppReport() throws IOException, YarnException {
112113
when(spyTimelineReaderClient.getApplicationEntity(appId, "ALL", null))
113114
.thenReturn(createApplicationTimelineEntity(appId, false, false));
114115
ApplicationReport report = client.getApplicationReport(appId);
115-
Assert.assertEquals(report.getApplicationId(), appId);
116-
Assert.assertEquals(report.getAppNodeLabelExpression(), "test_node_label");
116+
assertThat(report.getApplicationId()).isEqualTo(appId);
117+
assertThat(report.getAppNodeLabelExpression()).
118+
isEqualTo("test_node_label");
117119
Assert.assertTrue(report.getApplicationTags().contains("Test_APP_TAGS_1"));
118-
Assert.assertEquals(report.getYarnApplicationState(),
119-
YarnApplicationState.FINISHED);
120+
assertThat(report.getYarnApplicationState()).
121+
isEqualTo(YarnApplicationState.FINISHED);
120122
}
121123

122124
private static TimelineEntity createApplicationTimelineEntity(

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.apache.hadoop.yarn.client.api.impl;
2020

21+
import static org.assertj.core.api.Assertions.assertThat;
2122
import static org.junit.Assert.assertEquals;
2223
import static org.junit.Assert.assertNotNull;
2324
import static org.junit.Assert.assertNull;
@@ -1616,7 +1617,7 @@ private void waitForContainerCompletion(int numIterations,
16161617
for(ContainerStatus cStatus :allocResponse
16171618
.getCompletedContainersStatuses()) {
16181619
if(releases.contains(cStatus.getContainerId())) {
1619-
assertEquals(cStatus.getState(), ContainerState.COMPLETE);
1620+
assertThat(cStatus.getState()).isEqualTo(ContainerState.COMPLETE);
16201621
assertEquals(-100, cStatus.getExitStatus());
16211622
releases.remove(cStatus.getContainerId());
16221623
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestOpportunisticContainerAllocationE2E.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
import java.util.Set;
8282
import java.util.TreeSet;
8383

84+
import static org.assertj.core.api.Assertions.assertThat;
8485
import static org.junit.Assert.assertEquals;
8586
import static org.junit.Assert.assertNotNull;
8687

@@ -657,7 +658,7 @@ public void testMixedAllocationAndRelease() throws YarnException,
657658
for (ContainerStatus cStatus : allocResponse
658659
.getCompletedContainersStatuses()) {
659660
if (releases.contains(cStatus.getContainerId())) {
660-
assertEquals(cStatus.getState(), ContainerState.COMPLETE);
661+
assertThat(cStatus.getState()).isEqualTo(ContainerState.COMPLETE);
661662
assertEquals(-100, cStatus.getExitStatus());
662663
releases.remove(cStatus.getContainerId());
663664
}

0 commit comments

Comments
 (0)