YARN-6832. Tests use assertTrue(....equals(...)) instead of assertEquals()). (Daniel Templeton via Yufei Gu)
This commit is contained in:
Yufei Gu
parent
3ef7adc748
commit
ce609d06c0
|
|
@ -489,9 +489,8 @@ public class TestYarnClient {
|
|||
}
|
||||
|
||||
reports = client.getApplications(appTypes, appStates);
|
||||
Assert.assertEquals(reports.size(), 1);
|
||||
Assert
|
||||
.assertTrue((reports.get(0).getApplicationType().equals("NON-YARN")));
|
||||
Assert.assertEquals(1, reports.size());
|
||||
Assert.assertEquals("NON-YARN", reports.get(0).getApplicationType());
|
||||
for (ApplicationReport report : reports) {
|
||||
Assert.assertTrue(expectedReports.contains(report));
|
||||
}
|
||||
|
|
@ -1501,8 +1500,8 @@ public class TestYarnClient {
|
|||
ReservationRequests reservationRequests =
|
||||
response.getReservationAllocationState().get(0)
|
||||
.getReservationDefinition().getReservationRequests();
|
||||
Assert.assertTrue(
|
||||
reservationRequests.getInterpreter().toString().equals("R_ALL"));
|
||||
Assert.assertEquals("R_ALL",
|
||||
reservationRequests.getInterpreter().toString());
|
||||
Assert.assertTrue(reservationRequests.getReservationResources().get(0)
|
||||
.getDuration() == duration);
|
||||
} finally {
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ public class TestProcfsBasedProcessTree {
|
|||
"vmem (old API) for the gone-process is " + p.getCumulativeVmem()
|
||||
+ " . It should be UNAVAILABLE(-1).",
|
||||
p.getCumulativeVmem() == UNAVAILABLE);
|
||||
Assert.assertTrue(p.toString().equals("[ ]"));
|
||||
Assert.assertEquals("[ ]", p.toString());
|
||||
}
|
||||
|
||||
protected ProcfsBasedProcessTree createProcessTree(String pid) {
|
||||
|
|
|
|||
|
|
@ -20,9 +20,9 @@ package org.apache.hadoop.yarn.util;
|
|||
|
||||
import java.io.IOException;
|
||||
|
||||
import org.apache.hadoop.yarn.util.YarnVersionInfo;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
/**
|
||||
* A JUnit test to test {@link YarnVersionInfo}
|
||||
|
|
@ -38,9 +38,12 @@ public class TestYarnVersionInfo {
|
|||
|
||||
// can't easily know what the correct values are going to be so just
|
||||
// make sure they aren't Unknown
|
||||
assertTrue("getVersion returned Unknown", !YarnVersionInfo.getVersion().equals("Unknown"));
|
||||
assertTrue("getUser returned Unknown", !YarnVersionInfo.getUser().equals("Unknown"));
|
||||
assertTrue("getSrcChecksum returned Unknown", !YarnVersionInfo.getSrcChecksum().equals("Unknown"));
|
||||
assertNotEquals("getVersion returned Unknown",
|
||||
"Unknown", YarnVersionInfo.getVersion());
|
||||
assertNotEquals("getUser returned Unknown",
|
||||
"Unknown", YarnVersionInfo.getUser());
|
||||
assertNotEquals("getSrcChecksum returned Unknown",
|
||||
"Unknown", YarnVersionInfo.getSrcChecksum());
|
||||
|
||||
// these could be Unknown if the VersionInfo generated from code not in svn or git
|
||||
// so just check that they return something
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@ public class TestAuxServices {
|
|||
defaultAuxClassPath = new HashSet<String>(Arrays.asList(StringUtils
|
||||
.getTrimmedStrings(auxClassPath)));
|
||||
}
|
||||
Assert.assertTrue(auxName.equals("ServiceC"));
|
||||
Assert.assertEquals("ServiceC", auxName);
|
||||
aux.serviceStop();
|
||||
|
||||
// create a new jar file, and configure it as customized class path
|
||||
|
|
|
|||
|
|
@ -573,4 +573,4 @@ public class TestCGroupsHandlerImpl {
|
|||
new File(new File(newMountPoint, "cpu"), this.hierarchy);
|
||||
assertTrue("Yarn cgroup should exist", hierarchyFile.exists());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1344,8 +1344,8 @@ public class TestClientRMService {
|
|||
ReservationRequests reservationRequests =
|
||||
response.getReservationAllocationState().get(0)
|
||||
.getReservationDefinition().getReservationRequests();
|
||||
Assert.assertTrue(
|
||||
reservationRequests.getInterpreter().toString().equals("R_ALL"));
|
||||
Assert.assertEquals("R_ALL",
|
||||
reservationRequests.getInterpreter().toString());
|
||||
Assert.assertTrue(reservationRequests.getReservationResources().get(0)
|
||||
.getDuration() == duration);
|
||||
|
||||
|
|
|
|||
|
|
@ -119,9 +119,8 @@ public class TestReservationInputValidator {
|
|||
} catch (YarnException e) {
|
||||
Assert.assertNull(plan);
|
||||
String message = e.getMessage();
|
||||
Assert
|
||||
.assertTrue(message
|
||||
.equals("The queue is not specified. Please try again with a valid reservable queue."));
|
||||
Assert.assertEquals("The queue is not specified. Please try again with a "
|
||||
+ "valid reservable queue.", message);
|
||||
LOG.info(message);
|
||||
}
|
||||
}
|
||||
|
|
@ -161,9 +160,8 @@ public class TestReservationInputValidator {
|
|||
} catch (YarnException e) {
|
||||
Assert.assertNull(plan);
|
||||
String message = e.getMessage();
|
||||
Assert
|
||||
.assertTrue(message
|
||||
.equals("Missing reservation definition. Please try again by specifying a reservation definition."));
|
||||
Assert.assertEquals("Missing reservation definition. Please try again by "
|
||||
+ "specifying a reservation definition.", message);
|
||||
LOG.info(message);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -760,12 +760,12 @@ public class TestSchedulerUtils {
|
|||
mock(Priority.class), ResourceRequest.ANY, resource, 1);
|
||||
SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue",
|
||||
scheduler, rmContext);
|
||||
Assert.assertTrue(resReq.getNodeLabelExpression().equals("x"));
|
||||
Assert.assertEquals("x", resReq.getNodeLabelExpression());
|
||||
|
||||
resReq.setNodeLabelExpression(" y ");
|
||||
SchedulerUtils.normalizeAndvalidateRequest(resReq, maxResource, "queue",
|
||||
scheduler, rmContext);
|
||||
Assert.assertTrue(resReq.getNodeLabelExpression().equals("y"));
|
||||
Assert.assertEquals("y", resReq.getNodeLabelExpression());
|
||||
} catch (InvalidResourceRequestException e) {
|
||||
e.printStackTrace();
|
||||
fail("Should be valid when request labels is a subset of queue labels");
|
||||
|
|
|
|||
|
|
@ -1527,7 +1527,7 @@ public class TestCapacityScheduler {
|
|||
String queue =
|
||||
scheduler.getApplicationAttempt(appsInA1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("a1"));
|
||||
Assert.assertEquals("a1", queue);
|
||||
|
||||
List<ApplicationAttemptId> appsInA = scheduler.getAppsInQueue("a");
|
||||
assertTrue(appsInA.contains(appAttemptId));
|
||||
|
|
@ -1552,7 +1552,7 @@ public class TestCapacityScheduler {
|
|||
queue =
|
||||
scheduler.getApplicationAttempt(appsInB1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("b1"));
|
||||
Assert.assertEquals("b1", queue);
|
||||
|
||||
appsInB = scheduler.getAppsInQueue("b");
|
||||
assertTrue(appsInB.contains(appAttemptId));
|
||||
|
|
@ -1589,7 +1589,7 @@ public class TestCapacityScheduler {
|
|||
String queue =
|
||||
scheduler.getApplicationAttempt(appsInA1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("a1"));
|
||||
Assert.assertEquals("a1", queue);
|
||||
|
||||
List<ApplicationAttemptId> appsInA = scheduler.getAppsInQueue("a");
|
||||
assertTrue(appsInA.contains(appAttemptId));
|
||||
|
|
@ -1611,7 +1611,7 @@ public class TestCapacityScheduler {
|
|||
queue =
|
||||
scheduler.getApplicationAttempt(appsInA2.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("a2"));
|
||||
Assert.assertEquals("a2", queue);
|
||||
|
||||
appsInA1 = scheduler.getAppsInQueue("a1");
|
||||
assertTrue(appsInA1.isEmpty());
|
||||
|
|
@ -2109,7 +2109,7 @@ public class TestCapacityScheduler {
|
|||
String queue =
|
||||
scheduler.getApplicationAttempt(appsInA1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("a1"));
|
||||
Assert.assertEquals("a1", queue);
|
||||
|
||||
List<ApplicationAttemptId> appsInRoot = scheduler.getAppsInQueue("root");
|
||||
assertTrue(appsInRoot.contains(appAttemptId));
|
||||
|
|
@ -2131,7 +2131,7 @@ public class TestCapacityScheduler {
|
|||
queue =
|
||||
scheduler.getApplicationAttempt(appsInB1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("b1"));
|
||||
Assert.assertEquals("b1", queue);
|
||||
|
||||
appsInB = scheduler.getAppsInQueue("b");
|
||||
assertTrue(appsInB.contains(appAttemptId));
|
||||
|
|
@ -2487,7 +2487,7 @@ public class TestCapacityScheduler {
|
|||
String queue =
|
||||
scheduler.getApplicationAttempt(appsInA1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("a1"));
|
||||
Assert.assertEquals("a1", queue);
|
||||
|
||||
List<ApplicationAttemptId> appsInRoot = scheduler.getAppsInQueue("root");
|
||||
assertTrue(appsInRoot.contains(appAttemptId));
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ public class TestCapacitySchedulerDynamicBehavior {
|
|||
String queue =
|
||||
scheduler.getApplicationAttempt(appsInB1.get(0)).getQueue()
|
||||
.getQueueName();
|
||||
Assert.assertTrue(queue.equals("b1"));
|
||||
Assert.assertEquals("b1", queue);
|
||||
|
||||
List<ApplicationAttemptId> appsInRoot = scheduler.getAppsInQueue("root");
|
||||
assertTrue(appsInRoot.contains(appAttemptId));
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ import org.junit.Test;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
* Used TestRMWebServices as an example of web invocations of RM and added
|
||||
|
|
@ -87,9 +87,9 @@ public class TestRMWithXFSFilter extends JerseyTestBase {
|
|||
ClientResponse response = r.path("ws").path("v1").path("cluster")
|
||||
.path("info").accept("application/xml")
|
||||
.get(ClientResponse.class);
|
||||
assertTrue("Should have received DENY x-frame options header",
|
||||
response.getHeaders().get(XFrameOptionsFilter.X_FRAME_OPTIONS).get(0)
|
||||
.equals("DENY"));
|
||||
assertEquals("Should have received DENY x-frame options header",
|
||||
"DENY",
|
||||
response.getHeaders().get(XFrameOptionsFilter.X_FRAME_OPTIONS).get(0));
|
||||
}
|
||||
|
||||
protected void createInjector(String headerValue) {
|
||||
|
|
@ -138,9 +138,9 @@ public class TestRMWithXFSFilter extends JerseyTestBase {
|
|||
ClientResponse response = r.path("ws").path("v1").path("cluster")
|
||||
.path("info").accept("application/xml")
|
||||
.get(ClientResponse.class);
|
||||
assertTrue("Should have received SAMEORIGIN x-frame options header",
|
||||
response.getHeaders().get(XFrameOptionsFilter.X_FRAME_OPTIONS).get(0)
|
||||
.equals("SAMEORIGIN"));
|
||||
assertEquals("Should have received SAMEORIGIN x-frame options header",
|
||||
"SAMEORIGIN",
|
||||
response.getHeaders().get(XFrameOptionsFilter.X_FRAME_OPTIONS).get(0));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
Loading…
Reference in New Issue