Skip to content

Commit c135561

Browse files
slfan1989slfan1989
committed
YARN-11262. Fix CheckStyle.
1 parent ad72281 commit c135561

7 files changed

Lines changed: 46 additions & 38 deletions

File tree

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterLauncher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ public void testAMCleanupBeforeLaunch() throws Exception {
316316
attempt, AMLauncherEventType.LAUNCH, rm.getConfig()) {
317317
@Override
318318
public void onAMLaunchFailed(ContainerId containerId, Exception e) {
319-
assertFalse(
320-
e instanceof NullPointerException, "NullPointerException happens "
321-
+ " while launching " + containerId);
319+
assertFalse(e instanceof NullPointerException,
320+
"NullPointerException happens "
321+
+ " while launching " + containerId);
322322
}
323323
@Override
324324
protected ContainerManagementProtocol getContainerMgrProxy(

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMTimelineService.java‎

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

1919
package org.apache.hadoop.yarn.server.resourcemanager;
2020

21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertFalse;
23+
2124
import java.util.List;
2225

2326
import org.apache.hadoop.conf.Configuration;
@@ -28,7 +31,6 @@
2831
import org.apache.hadoop.yarn.server.resourcemanager.recovery.MemoryRMStateStore;
2932
import org.apache.hadoop.yarn.server.timelineservice.storage.FileSystemTimelineWriterImpl;
3033
import org.apache.hadoop.yarn.server.timelineservice.storage.TimelineWriter;
31-
import org.junit.jupiter.api.Assertions;
3234
import org.junit.jupiter.api.Test;
3335

3436
/**
@@ -41,7 +43,7 @@ public class TestRMTimelineService {
4143
private void setup(boolean v1Enabled, boolean v2Enabled,
4244
boolean systemMetricEnabled) {
4345
Configuration conf = new YarnConfiguration(new Configuration(false));
44-
Assertions.assertFalse(YarnConfiguration.timelineServiceEnabled(conf));
46+
assertFalse(YarnConfiguration.timelineServiceEnabled(conf));
4547

4648
conf.setBoolean(YarnConfiguration.SYSTEM_METRICS_PUBLISHER_ENABLED,
4749
systemMetricEnabled);
@@ -87,11 +89,11 @@ private void validate(boolean v1Enabled, boolean v2Enabled,
8789
}
8890

8991
if(systemMetricEnabled) {
90-
Assertions.assertEquals(v1Enabled, v1PublisherServiceFound);
91-
Assertions.assertEquals(v2Enabled, v2PublisherServiceFound);
92+
assertEquals(v1Enabled, v1PublisherServiceFound);
93+
assertEquals(v2Enabled, v2PublisherServiceFound);
9294
} else {
93-
Assertions.assertEquals(false, v1PublisherServiceFound);
94-
Assertions.assertEquals(false, v2PublisherServiceFound);
95+
assertEquals(false, v1PublisherServiceFound);
96+
assertEquals(false, v2PublisherServiceFound);
9597
}
9698
}
9799

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManagerMXBean.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717
*/
1818
package org.apache.hadoop.yarn.server.resourcemanager;
1919

20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
2022
import org.slf4j.Logger;
2123
import org.slf4j.LoggerFactory;
2224
import org.apache.hadoop.conf.Configuration;
2325
import org.apache.hadoop.security.UserGroupInformation;
2426
import org.apache.hadoop.yarn.conf.YarnConfiguration;
25-
import org.junit.jupiter.api.Assertions;
2627
import org.junit.jupiter.api.Test;
2728

2829
import javax.management.MBeanServer;
@@ -50,7 +51,7 @@ public void testResourceManagerMXBean() throws Exception {
5051
// Get attribute "SecurityEnabled"
5152
boolean securityEnabled = (boolean) mbs.getAttribute(mxbeanName,
5253
"SecurityEnabled");
53-
Assertions.assertEquals(resourceManager.isSecurityEnabled(), securityEnabled);
54+
assertEquals(resourceManager.isSecurityEnabled(), securityEnabled);
5455
}
5556
}
5657
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSignalContainer.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818

1919
package org.apache.hadoop.yarn.server.resourcemanager;
2020

21+
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
2123
import java.util.ArrayList;
2224
import java.util.List;
2325

2426
import org.apache.hadoop.test.GenericTestUtils;
2527
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
26-
import org.junit.jupiter.api.Assertions;
2728

2829
import org.slf4j.Logger;
2930
import org.slf4j.LoggerFactory;
@@ -85,7 +86,7 @@ public void testSignalRequestDeliveryToNM() throws Exception {
8586
nm1.nodeHeartbeat(true);
8687
}
8788
}
88-
Assertions.assertEquals(request, conts.size());
89+
assertEquals(request, conts.size());
8990

9091
for(Container container : conts) {
9192
rm.signalToContainer(container.getId(),
@@ -107,7 +108,7 @@ public void testSignalRequestDeliveryToNM() throws Exception {
107108
}
108109

109110
// Verify NM receives the expected number of signal container requests.
110-
Assertions.assertEquals(request, signaledConts);
111+
assertEquals(request, signaledConts);
111112

112113
am.unregisterAppAttempt();
113114
nm1.nodeHeartbeat(attempt.getAppAttemptId(), 1, ContainerState.COMPLETE);

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
package org.apache.hadoop.yarn.server.resourcemanager;
2020

21+
import static org.junit.jupiter.api.Assertions.assertTrue;
22+
import static org.junit.jupiter.api.Assertions.fail;
2123
import static org.mockito.Mockito.mock;
2224
import static org.mockito.Mockito.when;
2325

@@ -40,7 +42,6 @@
4042
import org.apache.hadoop.yarn.server.utils.BuilderUtils;
4143
import org.apache.hadoop.yarn.util.Records;
4244
import org.junit.jupiter.api.AfterAll;
43-
import org.junit.jupiter.api.Assertions;
4445
import org.junit.jupiter.api.BeforeAll;
4546
import org.junit.jupiter.api.Test;
4647

@@ -128,9 +129,9 @@ public Void run() throws Exception {
128129
checkTokenRenewal(owner, other);
129130
return null;
130131
} catch (YarnException ex) {
131-
Assertions.assertTrue(ex.getMessage().contains(
132+
assertTrue(ex.getMessage().contains(
132133
owner.getUserName() + " tries to renew a token"));
133-
Assertions.assertTrue(ex.getMessage().contains(
134+
assertTrue(ex.getMessage().contains(
134135
"with non-matching renewer " + other.getUserName()));
135136
throw ex;
136137
}
@@ -139,7 +140,7 @@ public Void run() throws Exception {
139140
} catch (Exception e) {
140141
return;
141142
}
142-
Assertions.fail("renew should have failed");
143+
fail("renew should have failed");
143144
}
144145

145146
@Test
@@ -219,20 +220,20 @@ public void testTokenCancellationByWrongUser() {
219220
public Void run() throws Exception {
220221
try {
221222
checkTokenCancellation(rmService, tokOwner, tokRenewer);
222-
Assertions.fail("We should not reach here; token owner = "
223+
fail("We should not reach here; token owner = "
223224
+ tokOwner.getUserName() + ", renewer = "
224225
+ tokRenewer.getUserName());
225226
return null;
226227
} catch (YarnException e) {
227-
Assertions.assertTrue(e.getMessage().contains(
228+
assertTrue(e.getMessage().contains(
228229
testerKerb.getUserName()
229230
+ " is not authorized to cancel the token"));
230231
return null;
231232
}
232233
}
233234
});
234235
} catch (Exception e) {
235-
Assertions.fail("Unexpected exception; " + e.getMessage());
236+
fail("Unexpected exception; " + e.getMessage());
236237
}
237238
}
238239
}
@@ -249,20 +250,20 @@ public Void run() throws Exception {
249250
public Void run() throws Exception {
250251
try {
251252
checkTokenCancellation(tokOwner, tokRenewer);
252-
Assertions.fail("We should not reach here; token owner = "
253+
fail("We should not reach here; token owner = "
253254
+ tokOwner.getUserName() + ", renewer = "
254255
+ tokRenewer.getUserName());
255256
return null;
256257
} catch (YarnException ex) {
257-
Assertions.assertTrue(ex.getMessage().contains(
258+
assertTrue(ex.getMessage().contains(
258259
tester.getUserName()
259260
+ " is not authorized to cancel the token"));
260261
return null;
261262
}
262263
}
263264
});
264265
} catch (Exception e) {
265-
Assertions.fail("Unexpected exception; " + e.getMessage());
266+
fail("Unexpected exception; " + e.getMessage());
266267
}
267268
}
268269
}

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithCSRFFilter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@ public void verifyClusterGeneric(long clusterid, long startedon,
209209
String resourceManagerBuildVersion,
210210
String resourceManagerVersion) {
211211

212-
assertEquals(
213-
ResourceManager.getClusterTimeStamp(), clusterid, "clusterId doesn't match: ");
214-
assertEquals(
215-
ResourceManager.getClusterTimeStamp(), startedon, "startedOn doesn't match: ");
216-
assertTrue(
217-
state.matches(STATE.INITED.toString()), "stated doesn't match: " + state);
218-
assertTrue(
219-
haState.matches("INITIALIZING"), "HA state doesn't match: " + haState);
212+
assertEquals(ResourceManager.getClusterTimeStamp(), clusterid,
213+
"clusterId doesn't match: ");
214+
assertEquals(ResourceManager.getClusterTimeStamp(), startedon,
215+
"startedOn doesn't match: ");
216+
assertTrue(state.matches(STATE.INITED.toString()),
217+
"stated doesn't match: " + state);
218+
assertTrue(haState.matches("INITIALIZING"),
219+
"HA state doesn't match: " + haState);
220220

221221
WebServicesTestUtils.checkStringMatch("hadoopVersionBuiltOn",
222222
VersionInfo.getDate(), hadoopVersionBuiltOn);

‎hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/webapp/TestRMWithXFSFilter.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818

1919
package org.apache.hadoop.yarn.webapp;
2020

21+
import static org.junit.jupiter.api.Assertions.assertNull;
22+
import static org.junit.jupiter.api.Assertions.assertThrows;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
24+
2125
import org.apache.hadoop.conf.Configuration;
2226
import org.apache.hadoop.http.HttpServer2;
2327
import org.apache.hadoop.yarn.conf.YarnConfiguration;
2428
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
2529
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
2630
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
2731
import org.junit.jupiter.api.AfterEach;
28-
import org.junit.jupiter.api.Assertions;
2932
import org.junit.jupiter.api.Test;
3033

3134
import java.io.IOException;
@@ -62,7 +65,7 @@ public void testXFrameOptionsDefaultBehaviour() throws Exception {
6265
URL url = new URL("http://localhost:8088/ws/v1/cluster/info");
6366
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
6467
String xfoHeader = conn.getHeaderField("X-FRAME-OPTIONS");
65-
Assertions.assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
68+
assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
6669
.SAMEORIGIN.toString()));
6770
}
6871

@@ -74,7 +77,7 @@ public void testXFrameOptionsExplicitlyEnabled() throws Exception {
7477
URL url = new URL("http://localhost:8088/ws/v1/cluster/info");
7578
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
7679
String xfoHeader = conn.getHeaderField("X-FRAME-OPTIONS");
77-
Assertions.assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
80+
assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
7881
.SAMEORIGIN.toString()));
7982
}
8083

@@ -86,7 +89,7 @@ public void testXFrameOptionsEnabledDefaultApps() throws Exception {
8689
URL url = new URL("http://localhost:8088/logs");
8790
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
8891
String xfoHeader = conn.getHeaderField("X-FRAME-OPTIONS");
89-
Assertions.assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
92+
assertTrue(xfoHeader.endsWith(HttpServer2.XFrameOption
9093
.SAMEORIGIN.toString()));
9194
}
9295

@@ -97,12 +100,12 @@ public void testXFrameOptionsDisabled() throws Exception {
97100
URL url = new URL("http://localhost:8088/ws/v1/cluster/info");
98101
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
99102
String xfoHeader = conn.getHeaderField("X-FRAME-OPTIONS");
100-
Assertions.assertNull(xfoHeader, "Unexpected X-FRAME-OPTION in header");
103+
assertNull(xfoHeader, "Unexpected X-FRAME-OPTION in header");
101104
}
102105

103106
@Test
104107
public void testXFrameOptionsIllegalOption() {
105-
IllegalArgumentException e = Assertions.assertThrows(
108+
IllegalArgumentException e = assertThrows(
106109
IllegalArgumentException.class,
107110
() -> createMockRm(true, "otherValue"));
108111
}

0 commit comments

Comments
 (0)