From f62de1d81edf1d93d15d52e18492ebbb8f61e43c Mon Sep 17 00:00:00 2001
From: Harsh J <harsh@apache.org>
Date: Sat, 30 Jun 2012 17:11:46 +0000
Subject: [PATCH] svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253.
 Tests for mapreduce-client-core are lying under mapreduce-client-jobclient.
 Contributed by Tsuyoshi Ozawa. (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                           | 3 +++
 .../test/java/org/apache/hadoop/mapred/TestAuditLogger.java    | 0
 .../src/test/java/org/apache/hadoop/mapred/TestIFile.java      | 0
 .../src/test/java/org/apache/hadoop/mapred/TestIndexCache.java | 0
 .../src/test/java/org/apache/hadoop/mapred/TestJobConf.java    | 0
 .../org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java  | 0
 .../org/apache/hadoop/mapred/TestMultiFileInputFormat.java     | 0
 .../test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java | 0
 .../src/test/java/org/apache/hadoop/mapred/TestReduceTask.java | 0
 .../hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java     | 0
 .../hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java    | 0
 .../hadoop/mapred/TestSequenceFileAsTextInputFormat.java       | 0
 .../org/apache/hadoop/mapred/TestSequenceFileInputFilter.java  | 0
 .../test/java/org/apache/hadoop/mapred/TestSortedRanges.java   | 0
 .../java/org/apache/hadoop/mapred/TestStatisticsCollector.java | 0
 .../src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java | 0
 .../src/test/java/org/apache/hadoop/mapred/TestUtils.java      | 0
 .../test/java/org/apache/hadoop/mapreduce/TestCounters.java    | 0
 .../hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java     | 0
 .../hadoop/mapreduce/util/TestProcfsBasedProcessTree.java      | 0
 20 files changed, 3 insertions(+)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestIFile.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestJobConf.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapred/TestUtils.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java (100%)
 rename hadoop-mapreduce-project/hadoop-mapreduce-client/{hadoop-mapreduce-client-jobclient => hadoop-mapreduce-client-core}/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java (100%)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 77e0d29872a..b916907172a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -17,6 +17,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-3921. MR AM should act on node health status changes. 
     (Bikas Saha via sseth)
 
+    MAPREDUCE-4253. Tests for mapreduce-client-core are lying under
+    mapreduce-client-jobclient (Tsuyoshi Ozawa via harsh)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestIFile.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIFile.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestIFile.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestIndexCache.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMultiFileInputFormat.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMultiFileSplit.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestReduceTask.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsBinaryOutputFormat.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestSortedRanges.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestStatisticsCollector.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestTaskStatus.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestUtils.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestUtils.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestUtils.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java
similarity index 100%
rename from hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java
rename to hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/util/TestProcfsBasedProcessTree.java