YARN-1534. Fixed failure of test TestAHSWebApp. Contributed by Shinichi Yamashita.

svn merge --ignore-ancestry -c 1556751 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562205 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -514,6 +514,8 @@ Branch YARN-321: Generic ApplicationHistoryService
   YARN-1023. Added Webservices REST APIs support for Application History. (Zhijie
   Shen via vinodkv)
 
+  YARN-1534. Fixed failure of test TestAHSWebApp. (Shinichi Yamashita via vinodkv)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebApp.java

@@ -44,10 +44,10 @@ import com.google.inject.Injector;
 
 public class TestAHSWebApp extends ApplicationHistoryStoreTestUtils {
 
-  public TestAHSWebApp(ApplicationHistoryStore store) {
+  public void setApplicationHistoryStore(ApplicationHistoryStore store) {
     this.store = store;
   }
-
+  
   @Before
   public void setup() {
     store = new MemoryApplicationHistoryStore();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java

@@ -90,7 +90,8 @@ public class TestAHSWebServices extends JerseyTest {
   private ApplicationHistoryManager mockApplicationHistoryManager()
       throws Exception {
     ApplicationHistoryStore store = new MemoryApplicationHistoryStore();
-    TestAHSWebApp testAHSWebApp = new TestAHSWebApp(store);
+    TestAHSWebApp testAHSWebApp = new TestAHSWebApp();
+    testAHSWebApp.setApplicationHistoryStore(store);
     ApplicationHistoryManager ahManager =
         testAHSWebApp.mockApplicationHistoryManager(5, 5, 5);
     return ahManager;