Author: jeagles
Date: Wed Jun 19 16:40:20 2013
New Revision: 1494687
URL: http://svn.apache.org/r1494687
Log:
MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and
org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles)
Added:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppControllerForTest.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppControllerForTest.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppForTest.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/AppForTest.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlockForTest.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TasksBlockForTest.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestBlocks.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/ViewForTest.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/ViewForTest.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/
- copied from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/
- copied from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/view/
- copied from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/view/
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/view/BlockForTest.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/yarn/webapp/view/BlockForTest.java
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestBlocks.java
- copied unchanged from r1494676,
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestBlocks.java
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1494687&r1=1494686&r2=1494687&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Wed
Jun 19 16:40:20 2013
@@ -1034,6 +1034,9 @@ Release 0.23.9 - UNRELEASED
IMPROVEMENTS
+ MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and
+ org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles)
+
OPTIMIZATIONS
MAPREDUCE-5268. Improve history server startup performance (Karthik
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java?rev=1494687&r1=1494686&r2=1494687&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java
Wed Jun 19 16:40:20 2013
@@ -17,36 +17,66 @@
*/
package org.apache.hadoop.mapreduce.v2.app.webapp;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.mapreduce.JobACL;
+import org.apache.hadoop.mapreduce.v2.api.records.JobId;
+import org.apache.hadoop.mapreduce.v2.api.records.TaskId;
import org.apache.hadoop.mapreduce.v2.app.AppContext;
+import org.apache.hadoop.mapreduce.v2.app.job.Job;
+import org.apache.hadoop.mapreduce.v2.app.job.Task;
+import org.apache.hadoop.mapreduce.v2.util.MRApps;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.webapp.Controller.RequestContext;
+import org.apache.hadoop.yarn.webapp.MimeType;
+import org.apache.hadoop.yarn.webapp.ResponseInfo;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.*;
public class TestAppController {
- private AppController appController;
+ private AppControllerForTest appController;
private RequestContext ctx;
+ private Job job;
@Before
- public void setUp() {
+ public void setUp() throws IOException {
AppContext context = mock(AppContext.class);
when(context.getApplicationID()).thenReturn(
ApplicationId.newInstance(0, 0));
+ when(context.getApplicationName()).thenReturn("AppName");
+ when(context.getUser()).thenReturn("User");
+ when(context.getStartTime()).thenReturn(System.currentTimeMillis());
+ job = mock(Job.class);
+ Task task = mock(Task.class);
+
+ when(job.getTask(any(TaskId.class))).thenReturn(task);
+
+ JobId jobID = MRApps.toJobID("job_01_01");
+ when(context.getJob(jobID)).thenReturn(job);
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(true);
+
App app = new App(context);
- Configuration conf = new Configuration();
+ Configuration configuration = new Configuration();
ctx = mock(RequestContext.class);
- appController = new AppController(app, conf, ctx);
+
+ appController = new AppControllerForTest(app, configuration, ctx);
+ appController.getProperty().put(AMParams.JOB_ID, "job_01_01");
+ appController.getProperty().put(AMParams.TASK_ID, "task_01_01_m01_01");
+
}
+ /**
+ * test bad request should be status 400...
+ */
@Test
public void testBadRequest() {
String message = "test string";
@@ -63,8 +93,217 @@ public class TestAppController {
private void verifyExpectations(String message) {
verify(ctx).setStatus(400);
- verify(ctx).set("app.id", "application_0_0000");
- verify(ctx).set(eq("rm.web"), anyString());
- verify(ctx).set("title", "Bad request: " + message);
+ assertEquals("application_0_0000", appController.getProperty()
+ .get("app.id"));
+ assertNotNull(appController.getProperty().get("rm.web"));
+ assertEquals("Bad request: " + message,
+ appController.getProperty().get("title"));
+ }
+
+ /**
+ * Test the method 'info'.
+ */
+ @Test
+ public void testInfo() {
+
+ appController.info();
+ Iterator<ResponseInfo.Item> iterator = appController.getResponseInfo()
+ .iterator();
+ ResponseInfo.Item item = iterator.next();
+ assertEquals("Application ID:", item.key);
+ assertEquals("application_0_0000", item.value);
+ item = iterator.next();
+ assertEquals("Application Name:", item.key);
+ assertEquals("AppName", item.value);
+ item = iterator.next();
+ assertEquals("User:", item.key);
+ assertEquals("User", item.value);
+
+ item = iterator.next();
+ assertEquals("Started on:", item.key);
+ item = iterator.next();
+ assertEquals("Elasped: ", item.key);
+
+ }
+
+ /**
+ * Test method 'job'. Should print message about error or set JobPage class
for rendering
+ */
+ @Test
+ public void testGetJob() {
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(false);
+
+ appController.job();
+ verify(appController.response()).setContentType(MimeType.TEXT);
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01",
+ appController.getData());
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(true);
+
+ appController.getProperty().remove(AMParams.JOB_ID);
+ appController.job();
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01Bad Request: Missing job ID",
+ appController.getData());
+
+ appController.getProperty().put(AMParams.JOB_ID, "job_01_01");
+ appController.job();
+ assertEquals(JobPage.class, appController.getClazz());
+ }
+
+ /**
+ * Test method 'jobCounters'. Should print message about error or set
CountersPage class for rendering
+ */
+ @Test
+ public void testGetJobCounters() {
+
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(false);
+
+ appController.jobCounters();
+ verify(appController.response()).setContentType(MimeType.TEXT);
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01",
+ appController.getData());
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(true);
+
+ appController.getProperty().remove(AMParams.JOB_ID);
+ appController.jobCounters();
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01Bad Request: Missing job ID",
+ appController.getData());
+
+ appController.getProperty().put(AMParams.JOB_ID, "job_01_01");
+ appController.jobCounters();
+ assertEquals(CountersPage.class, appController.getClazz());
+ }
+
+ /**
+ * Test method 'taskCounters'. Should print message about error or set
CountersPage class for rendering
+ */
+ @Test
+ public void testGetTaskCounters() {
+
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(false);
+
+ appController.taskCounters();
+ verify(appController.response()).setContentType(MimeType.TEXT);
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01",
+ appController.getData());
+
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(true);
+
+ appController.getProperty().remove(AMParams.TASK_ID);
+ appController.taskCounters();
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01missing task ID",
+ appController.getData());
+
+ appController.getProperty().put(AMParams.TASK_ID, "task_01_01_m01_01");
+ appController.taskCounters();
+ assertEquals(CountersPage.class, appController.getClazz());
+ }
+ /**
+ * Test method 'singleJobCounter'. Should set SingleCounterPage class for
rendering
+ */
+
+ @Test
+ public void testGetSingleJobCounter() throws IOException {
+ appController.singleJobCounter();
+ assertEquals(SingleCounterPage.class, appController.getClazz());
+ }
+
+ /**
+ * Test method 'singleTaskCounter'. Should set SingleCounterPage class for
rendering
+ */
+ @Test
+ public void testGetSingleTaskCounter() throws IOException {
+ appController.singleTaskCounter();
+ assertEquals(SingleCounterPage.class, appController.getClazz());
+
assertNotNull(appController.getProperty().get(AppController.COUNTER_GROUP));
+ assertNotNull(appController.getProperty().get(AppController.COUNTER_NAME));
}
+ /**
+ * Test method 'tasks'. Should set TasksPage class for rendering
+ */
+
+ @Test
+ public void testTasks() {
+
+ appController.tasks();
+
+ assertEquals(TasksPage.class, appController.getClazz());
+ }
+ /**
+ * Test method 'task'. Should set TaskPage class for rendering and
information for title
+ */
+ @Test
+ public void testTask() {
+
+ appController.task();
+ assertEquals("Attempts for task_01_01_m01_01" ,
+ appController.getProperty().get("title"));
+
+ assertEquals(TaskPage.class, appController.getClazz());
+ }
+
+ /**
+ * Test method 'conf'. Should set JobConfPage class for rendering
+ */
+ @Test
+ public void testConfiguration() {
+
+ appController.conf();
+
+ assertEquals(JobConfPage.class, appController.getClazz());
+ }
+
+ /**
+ * Test method 'conf'. Should set AttemptsPage class for rendering or
print information about error
+ */
+ @Test
+ public void testAttempts() {
+
+ appController.getProperty().remove(AMParams.TASK_TYPE);
+
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(false);
+
+ appController.attempts();
+ verify(appController.response()).setContentType(MimeType.TEXT);
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01",
+ appController.getData());
+
+ when(job.checkAccess(any(UserGroupInformation.class), any(JobACL.class)))
+ .thenReturn(true);
+
+ appController.getProperty().remove(AMParams.TASK_ID);
+ appController.attempts();
+ assertEquals(
+ "Access denied: User user does not have permission to view job
job_01_01",
+ appController.getData());
+
+ appController.getProperty().put(AMParams.TASK_ID, "task_01_01_m01_01");
+ appController.attempts();
+ assertEquals("Bad request: missing task-type.", appController.getProperty()
+ .get("title"));
+ appController.getProperty().put(AMParams.TASK_TYPE, "m");
+
+ appController.attempts();
+ assertEquals("Bad request: missing attempt-state.", appController
+ .getProperty().get("title"));
+ appController.getProperty().put(AMParams.ATTEMPT_STATE, "State");
+
+ appController.attempts();
+
+ assertEquals(AttemptsPage.class, appController.getClazz());
+ }
+
}
