Return-Path: 
 <mrunit-commits-return-31-apmail-incubator-mrunit-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-mrunit-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-mrunit-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1DB0598EE
	for <apmail-incubator-mrunit-commits-archive@minotaur.apache.org>;
 Sat,  1 Oct 2011 22:31:23 +0000 (UTC)
Received: (qmail 96024 invoked by uid 500); 1 Oct 2011 22:31:23 -0000
Delivered-To: apmail-incubator-mrunit-commits-archive@incubator.apache.org
Received: (qmail 96006 invoked by uid 500); 1 Oct 2011 22:31:23 -0000
Mailing-List: contact mrunit-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mrunit-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:mrunit-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:mrunit-commits@incubator.apache.org>
List-Id: <mrunit-commits.incubator.apache.org>
Reply-To: mrunit-dev@incubator.apache.org
Delivered-To: mailing list mrunit-commits@incubator.apache.org
Received: (qmail 95998 invoked by uid 99); 1 Oct 2011 22:31:22 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Oct 2011 22:31:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Oct 2011 22:31:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3FACF23888CC;
	Sat,  1 Oct 2011 22:31:01 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1178100 - in
 /incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit:
 MapDriverBase.java MapReduceDriverBase.java PipelineMapReduceDriver.java
 ReduceDriverBase.java TestDriver.java
Date: Sat, 01 Oct 2011 22:31:01 -0000
To: mrunit-commits@incubator.apache.org
From: mattmann@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111001223101.3FACF23888CC@eris.apache.org>

Author: mattmann
Date: Sat Oct  1 22:31:00 2011
New Revision: 1178100

URL: http://svn.apache.org/viewvc?rev=1178100&view=rev
Log:
Apply patch for MRUNIT-15 from Brock Noland.

Modified:
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriverBase.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
    incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriverBase.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriverBase.java?rev=1178100&r1=1178099&r2=1178100&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriverBase.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriverBase.java Sat Oct  1 22:31:00 2011
@@ -185,9 +185,9 @@ public abstract class MapDriverBase<K1, 
       outputs = run();
       validate(outputs);
     } catch (IOException ioe) {
-      LOG.error("IOException in mapper: " + ioe.toString());
+      LOG.error("IOException in mapper", ioe);
       LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
+      throw new RuntimeException("IOException in mapper: ", ioe);
     }
   }
 }

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java?rev=1178100&r1=1178099&r2=1178100&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java Sat Oct  1 22:31:00 2011
@@ -166,9 +166,8 @@ public abstract class MapReduceDriverBas
       reduceOutputs = run();
       validate(reduceOutputs);
     } catch (IOException ioe) {
-      LOG.error("IOException: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
+      LOG.error(ioe);
+      throw new RuntimeException(ioe);
     }
   }
 

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java?rev=1178100&r1=1178099&r2=1178100&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java Sat Oct  1 22:31:00 2011
@@ -332,9 +332,8 @@ public class PipelineMapReduceDriver<K1,
       outputs = run();
       validate(outputs);
     } catch (IOException ioe) {
-      LOG.error("IOException: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
+      LOG.error(ioe);
+      throw new RuntimeException(ioe);
     }
   }
 }

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java?rev=1178100&r1=1178099&r2=1178100&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java Sat Oct  1 22:31:00 2011
@@ -186,9 +186,8 @@ public abstract class ReduceDriverBase<K
       outputs = run();
       validate(outputs);
     } catch (IOException ioe) {
-      LOG.error("IOException in reducer: " + ioe.toString());
-      LOG.debug("Setting success to false based on IOException");
-      throw new RuntimeException();
+      LOG.error("IOException in reducer", ioe);
+      throw new RuntimeException("IOException in reducer: ", ioe);
     }
   }
 }

Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java?rev=1178100&r1=1178099&r2=1178100&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java Sat Oct  1 22:31:00 2011
@@ -133,11 +133,13 @@ public abstract class TestDriver<K1, V1,
   protected void validate(List<Pair<K2, V2>> outputs) throws RuntimeException {
 
     boolean success = true;
-
+    List<String> errors = new ArrayList<String>();
     // were we supposed to get output in the first place?
     // return false if we don't.
     if (expectedOutputs.size() == 0 && outputs.size() > 0) {
-      LOG.error("Expected no outputs; got " + outputs.size() + " outputs.");
+      String msg = "Expected no outputs; got " + outputs.size() + " outputs.";
+      LOG.error(msg);
+      errors.add(msg);
       success = false;
     }
 
@@ -174,9 +176,11 @@ public abstract class TestDriver<K1, V1,
           if (null != expected) {
             expectedStr = expected.toString();
           }
-
-          LOG.error("Missing expected output " + expectedStr + " at position "
-              + i);
+          
+          String msg = "Missing expected output " + expectedStr + " at position "
+              + i + ".";
+          LOG.error(msg);
+          errors.add(msg);
         }
       }
 
@@ -184,7 +188,10 @@ public abstract class TestDriver<K1, V1,
     }
 
     if (!success) {
-      throw new RuntimeException();
+      StringBuilder buffer = new StringBuilder();
+      buffer.append(errors.size()).append(" Error(s): ");
+      formatValueList(errors, buffer);
+      throw new RuntimeException(buffer.toString());
     }
   }