svn commit: r1374095 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java

2012-08-16 Thread sseth
Author: sseth
Date: Thu Aug 16 22:45:03 2012
New Revision: 1374095

URL: http://svn.apache.org/viewvc?rev=1374095&view=rev
Log:
MAPREDUCE-4558. Disable TestJobTrackerSafeMode (Contributed by Siddharth Seth)

Modified:
hadoop/common/branches/branch-1/CHANGES.txt

hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1374095&r1=1374094&r2=1374095&view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Aug 16 22:45:03 2012
@@ -176,6 +176,8 @@ Release 1.2.0 - unreleased
 
 HDFS-3658. Fix bugs in TestDFSClientRetries and add more tests.  (szetszwo)
 
+MAPREDUCE-4558. Disable TestJobTrackerSafeMode (sseth)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java?rev=1374095&r1=1374094&r2=1374095&view=diff
==
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestJobTrackerSafeMode.java
 Thu Aug 16 22:45:03 2012
@@ -35,6 +35,7 @@ import org.junit.*;
  * join back.
  */
 
+@Ignore
 public class TestJobTrackerSafeMode extends TestCase {
   final Path testDir = 
 new Path(System.getProperty("test.build.data", "/tmp"), "jt-safemode");
@@ -197,7 +198,7 @@ public class TestJobTrackerSafeMode exte
 
   private boolean checkTrackers(JobTracker jobtracker, Set present, 
 Set absent) {
-while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 
2) {
+while (jobtracker.getClusterStatus(true).getActiveTrackerNames().size() != 
3) {
   LOG.info("Waiting for Initialize all Task Trackers");
   UtilsForTests.waitFor(1000);
 }




svn commit: r1374088 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

2012-08-16 Thread tgraves
Author: tgraves
Date: Thu Aug 16 22:23:31 2012
New Revision: 1374088

URL: http://svn.apache.org/viewvc?rev=1374088&view=rev
Log:
merge -r 1374084:1374085 from branch-2. FIXES: HADOOP-8390

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374088&r1=1374087&r2=1374088&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Aug 16 22:23:31 2012
@@ -156,6 +156,9 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave
 Thompson via bobby)
 
+HADOOP-8390. TestFileSystemCanonicalization fails with JDK7  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java?rev=1374088&r1=1374087&r2=1374088&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 Thu Aug 16 22:23:31 2012
@@ -18,18 +18,20 @@
 
 package org.apache.hadoop.fs;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.IOException;
 import java.net.URI;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.security.NetUtilsTestResolver;
 import org.apache.hadoop.util.Progressable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestFileSystemCanonicalization extends TestCase {
+public class TestFileSystemCanonicalization {
   static String[] authorities = {
 "myfs://host",
 "myfs://host.a",
@@ -41,8 +43,8 @@ public class TestFileSystemCanonicalizat
   };
 
 
-  @Test
-  public void testSetupResolver() throws Exception {
+  @BeforeClass
+  public static void initialize() throws Exception {
 NetUtilsTestResolver.install();
   }
 




svn commit: r1374087 - in /hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

2012-08-16 Thread tgraves
Author: tgraves
Date: Thu Aug 16 22:21:56 2012
New Revision: 1374087

URL: http://svn.apache.org/viewvc?rev=1374087&view=rev
Log:
merge -r 1374083:1374084 from trunk. FIXES: HADOOP-8390

Modified:

hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

Modified: 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374087&r1=1374086&r2=1374087&view=diff
==
--- 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Aug 16 22:21:56 2012
@@ -651,6 +651,9 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave
 Thompson via bobby)
 
+HADOOP-8390. TestFileSystemCanonicalization fails with JDK7  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java?rev=1374087&r1=1374086&r2=1374087&view=diff
==
--- 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 (original)
+++ 
hadoop/common/branches/branch-2.1.0-alpha/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 Thu Aug 16 22:21:56 2012
@@ -18,18 +18,20 @@
 
 package org.apache.hadoop.fs;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.IOException;
 import java.net.URI;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.security.NetUtilsTestResolver;
 import org.apache.hadoop.util.Progressable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestFileSystemCanonicalization extends TestCase {
+public class TestFileSystemCanonicalization {
   static String[] authorities = {
 "myfs://host",
 "myfs://host.a",
@@ -41,8 +43,8 @@ public class TestFileSystemCanonicalizat
   };
 
 
-  @Test
-  public void testSetupResolver() throws Exception {
+  @BeforeClass
+  public static void initialize() throws Exception {
 NetUtilsTestResolver.install();
   }
 




svn commit: r1374085 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

2012-08-16 Thread tgraves
Author: tgraves
Date: Thu Aug 16 22:19:23 2012
New Revision: 1374085

URL: http://svn.apache.org/viewvc?rev=1374085&view=rev
Log:
merge -r 1374083:1374084 from trunk. FIXES: HADOOP-8390

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374085&r1=1374084&r2=1374085&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Thu Aug 16 22:19:23 2012
@@ -733,6 +733,9 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave
 Thompson via bobby)
 
+HADOOP-8390. TestFileSystemCanonicalization fails with JDK7  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java?rev=1374085&r1=1374084&r2=1374085&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 Thu Aug 16 22:19:23 2012
@@ -18,18 +18,20 @@
 
 package org.apache.hadoop.fs;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.IOException;
 import java.net.URI;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.security.NetUtilsTestResolver;
 import org.apache.hadoop.util.Progressable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestFileSystemCanonicalization extends TestCase {
+public class TestFileSystemCanonicalization {
   static String[] authorities = {
 "myfs://host",
 "myfs://host.a",
@@ -41,8 +43,8 @@ public class TestFileSystemCanonicalizat
   };
 
 
-  @Test
-  public void testSetupResolver() throws Exception {
+  @BeforeClass
+  public static void initialize() throws Exception {
 NetUtilsTestResolver.install();
   }
 




svn commit: r1374084 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

2012-08-16 Thread tgraves
Author: tgraves
Date: Thu Aug 16 22:16:19 2012
New Revision: 1374084

URL: http://svn.apache.org/viewvc?rev=1374084&view=rev
Log:
HADOOP-8390. TestFileSystemCanonicalization fails with JDK7  (Trevor Robinson 
via tgraves)

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1374084&r1=1374083&r2=1374084&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 
16 22:16:19 2012
@@ -911,6 +911,9 @@ Release 0.23.3 - UNRELEASED
 HADOOP-8703. distcpV2: turn CRC checking off for 0 byte size (Dave
 Thompson via bobby)
 
+HADOOP-8390. TestFileSystemCanonicalization fails with JDK7  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java?rev=1374084&r1=1374083&r2=1374084&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileSystemCanonicalization.java
 Thu Aug 16 22:16:19 2012
@@ -18,18 +18,20 @@
 
 package org.apache.hadoop.fs;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.IOException;
 import java.net.URI;
 
-import junit.framework.TestCase;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.security.NetUtilsTestResolver;
 import org.apache.hadoop.util.Progressable;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class TestFileSystemCanonicalization extends TestCase {
+public class TestFileSystemCanonicalization {
   static String[] authorities = {
 "myfs://host",
 "myfs://host.a",
@@ -41,8 +43,8 @@ public class TestFileSystemCanonicalizat
   };
 
 
-  @Test
-  public void testSetupResolver() throws Exception {
+  @BeforeClass
+  public static void initialize() throws Exception {
 NetUtilsTestResolver.install();
   }
 




svn commit: r1373860 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/LineReader.java src/test/java/org/apache/hadoop/util/Te

2012-08-16 Thread bobby
Author: bobby
Date: Thu Aug 16 14:24:34 2012
New Revision: 1373860

URL: http://svn.apache.org/viewvc?rev=1373860&view=rev
Log:
svn merge -c 1373859 FIXES: HADOOP-8654. TextInputFormat delimiter bug (Gelesh 
and Jason Lowe via bobby)

Added:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
  - copied unchanged from r1373859, 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1373860&r1=1373859&r2=1373860&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Thu Aug 16 14:24:34 2012
@@ -192,6 +192,9 @@ Release 2.0.1-alpha - UNRELEASED
 HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM
 on ARM. (Trevor Robinson via todd)
 
+HADOOP-8654. TextInputFormat delimiter bug (Gelesh and Jason Lowe via
+bobby)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
 HADOOP-8220. ZKFailoverController doesn't handle failure to become active

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java?rev=1373860&r1=1373859&r2=1373860&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
 Thu Aug 16 14:24:34 2012
@@ -266,7 +266,8 @@ public class LineReader {
 bufferPosn++;
 break;
   }
-} else {
+} else if (delPosn != 0) {
+  bufferPosn--; // recheck if bufferPosn matches start of delimiter
   delPosn = 0;
 }
   }




svn commit: r1373859 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/LineReader.java src/test/java/org/apache/hadoop/util/TestLineReader

2012-08-16 Thread bobby
Author: bobby
Date: Thu Aug 16 14:23:28 2012
New Revision: 1373859

URL: http://svn.apache.org/viewvc?rev=1373859&view=rev
Log:
HADOOP-8654. TextInputFormat delimiter bug (Gelesh and Jason Lowe via bobby)

Added:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1373859&r1=1373858&r2=1373859&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 
16 14:23:28 2012
@@ -395,6 +395,9 @@ Branch-2 ( Unreleased changes )
 HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM
 on ARM. (Trevor Robinson via todd)
 
+HADOOP-8654. TextInputFormat delimiter bug (Gelesh and Jason Lowe via
+bobby)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
 HADOOP-8220. ZKFailoverController doesn't handle failure to become active

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java?rev=1373859&r1=1373858&r2=1373859&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/LineReader.java
 Thu Aug 16 14:23:28 2012
@@ -266,7 +266,8 @@ public class LineReader {
 bufferPosn++;
 break;
   }
-} else {
+} else if (delPosn != 0) {
+  bufferPosn--; // recheck if bufferPosn matches start of delimiter
   delPosn = 0;
 }
   }

Added: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java?rev=1373859&view=auto
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
 (added)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
 Thu Aug 16 14:23:28 2012
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.util;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.hadoop.io.Text;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class TestLineReader {
+
+  @Test
+  public void testCustomDelimiter() throws Exception {
+String data = "record Bangalorrecord recorrecordrecord Kerala";
+String delimiter = "record";
+LineReader reader = new LineReader(
+new ByteArrayInputStream(data.getBytes()),
+delimiter.getBytes());
+Text line = new Text();
+reader.readLine(line);
+Assert.assertEquals("", line.toString());
+reader.readLine(line);
+Assert.assertEquals(" Bangalor", line.toString());
+reader.readLine(line);
+Assert.assertEquals(" recor", line.toString());
+reader.readLine(line);
+Assert.assertEquals("", line.toString());
+reader.readLine(line);
+Assert.assertEquals(" Kerala", line.toString());
+  }
+}