Return-Path: X-Original-To: apmail-incubator-crunch-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-crunch-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 3D45EDE0E for ; Fri, 14 Sep 2012 11:36:39 +0000 (UTC) Received: (qmail 74581 invoked by uid 500); 14 Sep 2012 11:36:38 -0000 Delivered-To: apmail-incubator-crunch-commits-archive@incubator.apache.org Received: (qmail 74532 invoked by uid 500); 14 Sep 2012 11:36:38 -0000 Mailing-List: contact crunch-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: crunch-dev@incubator.apache.org Delivered-To: mailing list crunch-commits@incubator.apache.org Received: (qmail 74469 invoked by uid 99); 14 Sep 2012 11:36:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 11:36:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58663368DF; Fri, 14 Sep 2012 11:36:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jwills@apache.org To: crunch-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: CRUNCH-57: Doing right by The Bard. Message-Id: <20120914113636.58663368DF@tyr.zones.apache.org> Date: Fri, 14 Sep 2012 11:36:36 +0000 (UTC) Updated Branches: refs/heads/master d49c07a30 -> 1acc34a6e CRUNCH-57: Doing right by The Bard. Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/1acc34a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/1acc34a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/1acc34a6 Branch: refs/heads/master Commit: 1acc34a6e6f857bbf665593a779c9edcfdde8871 Parents: 8cea3d0 Author: Josh Wills Authored: Fri Sep 14 04:34:22 2012 -0700 Committer: Josh Wills Committed: Fri Sep 14 04:34:22 2012 -0700 ---------------------------------------------------------------------- .../org/apache/crunch/scrunch/LengthTest.scala | 4 ++-- .../org/apache/crunch/CollectionPObjectIT.java | 8 ++++---- .../org/apache/crunch/CollectionsLengthIT.java | 4 ++-- .../org/apache/crunch/FirstElementPObjectIT.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/1acc34a6/crunch-scrunch/src/it/scala/org/apache/crunch/scrunch/LengthTest.scala ---------------------------------------------------------------------- diff --git a/crunch-scrunch/src/it/scala/org/apache/crunch/scrunch/LengthTest.scala b/crunch-scrunch/src/it/scala/org/apache/crunch/scrunch/LengthTest.scala index 4a53e89..20fb9a6 100644 --- a/crunch-scrunch/src/it/scala/org/apache/crunch/scrunch/LengthTest.scala +++ b/crunch-scrunch/src/it/scala/org/apache/crunch/scrunch/LengthTest.scala @@ -29,11 +29,11 @@ import _root_.org.junit.Test class LengthTest extends CrunchTestSupport with JUnitSuite { @Test def testLength { - val linesInShakespear: Long = 3667 + val linesInShakespeare: Long = 3667 val pipeline = Pipeline.mapReduce[LengthTest](tempDir.getDefaultConfiguration) val input = tempDir.copyResourceFileName("shakes.txt") val len = pipeline.read(from.textFile(input)).length() - assert(linesInShakespear == len.value()) + assert(linesInShakespeare == len.value()) } } http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/1acc34a6/crunch/src/it/java/org/apache/crunch/CollectionPObjectIT.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/CollectionPObjectIT.java b/crunch/src/it/java/org/apache/crunch/CollectionPObjectIT.java index f697a38..2157d24 100644 --- a/crunch/src/it/java/org/apache/crunch/CollectionPObjectIT.java +++ b/crunch/src/it/java/org/apache/crunch/CollectionPObjectIT.java @@ -49,10 +49,10 @@ public class CollectionPObjectIT { private static final int LINES_IN_SHAKES = 3667; - private static final String FIRST_SHAKESPEAR_LINE = + private static final String FIRST_SHAKESPEARE_LINE = "***The Project Gutenberg's Etext of Shakespeare's First Folio***"; - private static final String LAST_SHAKESPEAR_LINE = + private static final String LAST_SHAKESPEARE_LINE = "FINIS. THE TRAGEDIE OF MACBETH."; @Rule @@ -86,8 +86,8 @@ public class CollectionPObjectIT { private void verifyLines(String[] lines) { assertEquals("Not enough lines in Shakespeare.", LINES_IN_SHAKES, lines.length); - assertEquals("First line in Shakespeare is wrong.", FIRST_SHAKESPEAR_LINE, lines[0]); - assertEquals("Last line in Shakespeare is wrong.", LAST_SHAKESPEAR_LINE, + assertEquals("First line in Shakespeare is wrong.", FIRST_SHAKESPEARE_LINE, lines[0]); + assertEquals("Last line in Shakespeare is wrong.", LAST_SHAKESPEARE_LINE, lines[lines.length - 1]); } http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/1acc34a6/crunch/src/it/java/org/apache/crunch/CollectionsLengthIT.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/CollectionsLengthIT.java b/crunch/src/it/java/org/apache/crunch/CollectionsLengthIT.java index 60385f0..8fb03ee 100644 --- a/crunch/src/it/java/org/apache/crunch/CollectionsLengthIT.java +++ b/crunch/src/it/java/org/apache/crunch/CollectionsLengthIT.java @@ -41,7 +41,7 @@ import com.google.common.collect.Lists; @SuppressWarnings("serial") public class CollectionsLengthIT { - public static final Long LINES_IN_SHAKESPEAR = 3667L; + public static final Long LINES_IN_SHAKESPEARE = 3667L; @Rule public TemporaryPath tmpDir = TemporaryPaths.create(); @@ -71,6 +71,6 @@ public class CollectionsLengthIT { PCollection shakespeare = pipeline.readTextFile(shakesInputPath); Long length = shakespeare.length().getValue(); - assertEquals("Incorrect length for shakespear PCollection.", LINES_IN_SHAKESPEAR, length); + assertEquals("Incorrect length for shakespear PCollection.", LINES_IN_SHAKESPEARE, length); } } http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/1acc34a6/crunch/src/it/java/org/apache/crunch/FirstElementPObjectIT.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/FirstElementPObjectIT.java b/crunch/src/it/java/org/apache/crunch/FirstElementPObjectIT.java index a47b1a3..3efcf30 100644 --- a/crunch/src/it/java/org/apache/crunch/FirstElementPObjectIT.java +++ b/crunch/src/it/java/org/apache/crunch/FirstElementPObjectIT.java @@ -46,7 +46,7 @@ import com.google.common.collect.Lists; @SuppressWarnings("serial") public class FirstElementPObjectIT { - private static final String FIRST_SHAKESPEAR_LINE = + private static final String FIRST_SHAKESPEARE_LINE = "***The Project Gutenberg's Etext of Shakespeare's First Folio***"; @Rule @@ -67,6 +67,6 @@ public class FirstElementPObjectIT { PCollection shakespeare = pipeline.readTextFile(shakesInputPath); PObject firstLine = new FirstElementPObject(shakespeare); String first = firstLine.getValue(); - assertEquals("First line in Shakespeare is wrong.", FIRST_SHAKESPEAR_LINE, first); + assertEquals("First line in Shakespeare is wrong.", FIRST_SHAKESPEARE_LINE, first); } }