From 743d8ae055a9f2ec98f89d1ca003ed2f93c09a38 Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Mon, 23 Sep 2013 18:33:12 +0000
Subject: [PATCH] MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo
 (Jinghui Wang via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1525670 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                |  3 +++
 .../java/org/apache/hadoop/mapred/TestQueue.java    | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index c10f96013f..5bee07164d 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -178,6 +178,9 @@ Release 2.3.0 - UNRELEASED
     MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster
     mode (Ted Yu via jlowe)
 
+    MAPREDUCE-5522. Incorrect oreder expected from JobQueueInfo (Jinghui Wang
+    via bobby)
+
 Release 2.2.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
index 4313e4080e..6f3424707b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestQueue.java
@@ -128,10 +128,15 @@ public class TestQueue {
       assertEquals(secondSubQueue.getJobQueueInfo().getChildren().size(), 0);
       // test
       assertEquals(manager.getSchedulerInfo("first"), "queueInfo");
-      assertEquals(manager.getJobQueueInfos()[0].getQueueName(), secondSubQueue
-          .getJobQueueInfo().getQueueName());
-      assertEquals(manager.getJobQueueInfos()[1].getQueueName(), firstSubQueue
-          .getJobQueueInfo().getQueueName());
+      Set<String> queueJobQueueInfos = new HashSet<String>();
+      for(JobQueueInfo jobInfo : manager.getJobQueueInfos()){
+    	  queueJobQueueInfos.add(jobInfo.getQueueName());
+      }
+      Set<String> rootJobQueueInfos = new HashSet<String>();
+      for(Queue queue : root.getChildren()){
+    	  rootJobQueueInfos.add(queue.getJobQueueInfo().getQueueName());
+      }
+      assertEquals(queueJobQueueInfos, rootJobQueueInfos);
       // test getJobQueueInfoMapping
       assertEquals(
           manager.getJobQueueInfoMapping().get("first").getQueueName(), "first");