You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ss...@apache.org on 2012/10/16 02:03:31 UTC
svn commit: r1398581 [14/14] - in
/hadoop/common/branches/MR-3902/hadoop-common-project:
hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/
hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/
hadoop-auth/sr...
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestIndexedSort.java Tue Oct 16 00:02:55 2012
@@ -23,7 +23,6 @@ import java.util.Random;
import junit.framework.TestCase;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text;
@@ -208,12 +207,14 @@ public class TestIndexedSort extends Tes
return seed;
}
+ @Override
public int compare(int i, int j) {
// assume positive
return
values[valindirect[valindex[i]]] - values[valindirect[valindex[j]]];
}
+ @Override
public void swap(int i, int j) {
int tmp = valindex[i];
valindex[i] = valindex[j];
@@ -261,12 +262,14 @@ public class TestIndexedSort extends Tes
public int getCmp() { return comparisions; }
public int getSwp() { return swaps; }
+ @Override
public int compare(int i, int j) {
assertTrue("Expected fewer than " + maxcmp + " comparisons",
++comparisions < maxcmp);
return s.compare(i, j);
}
+ @Override
public void swap(int i, int j) {
assertTrue("Expected fewer than " + maxswp + " swaps",
++swaps < maxswp);
@@ -323,6 +326,7 @@ public class TestIndexedSort extends Tes
t.set(sb.toString());
}
+ @Override
public int compare(int i, int j) {
final int ii = indices[i];
final int ij = indices[j];
@@ -332,6 +336,7 @@ public class TestIndexedSort extends Tes
((ij + 1 == indices.length) ? eob : offsets[ij + 1]) - offsets[ij]);
}
+ @Override
public void swap(int i, int j) {
int tmp = indices[i];
indices[i] = indices[j];
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestLineReader.java Tue Oct 16 00:02:55 2012
@@ -21,29 +21,121 @@ package org.apache.hadoop.util;
import java.io.ByteArrayInputStream;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.util.LineReader;
import org.junit.Test;
import junit.framework.Assert;
public class TestLineReader {
+ private LineReader lineReader;
+ private String TestData;
+ private String Delimiter;
+ private Text line;
@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());
+ /* TEST_1
+ * The test scenario is the tail of the buffer
+ * equals the starting character/s of delimiter
+ *
+ * The Test Data is such that,
+ *
+ * 1) we will have "</entity>" as delimiter
+ *
+ * 2) The tail of the current buffer would be "</"
+ * which matches with the starting character sequence of delimiter.
+ *
+ * 3) The Head of the next buffer would be "id>"
+ * which does NOT match with the remaining characters of delimiter.
+ *
+ * 4) Input data would be prefixed by char 'a'
+ * about numberOfCharToFillTheBuffer times.
+ * So that, one iteration to buffer the input data,
+ * would end at '</' ie equals starting 2 char of delimiter
+ *
+ * 5) For this we would take BufferSize as 64 * 1024;
+ *
+ * Check Condition
+ * In the second key value pair, the value should contain
+ * "</" from currentToken and
+ * "id>" from next token
+ */
+
+ Delimiter="</entity>";
+
+ String CurrentBufferTailToken=
+ "</entity><entity><id>Gelesh</";
+ // Ending part of Input Data Buffer
+ // It contains '</' ie delimiter character
+
+ String NextBufferHeadToken=
+ "id><name>Omathil</name></entity>";
+ // Supposing the start of next buffer is this
+
+ String Expected =
+ (CurrentBufferTailToken+NextBufferHeadToken)
+ .replace(Delimiter, "");
+ // Expected ,must capture from both the buffer, excluding Delimiter
+
+ String TestPartOfInput = CurrentBufferTailToken+NextBufferHeadToken;
+
+ int BufferSize=64 * 1024;
+ int numberOfCharToFillTheBuffer=BufferSize-CurrentBufferTailToken.length();
+ StringBuilder fillerString=new StringBuilder();
+ for (int i=0;i<numberOfCharToFillTheBuffer;i++) {
+ fillerString.append('a'); // char 'a' as a filler for the test string
+ }
+
+ TestData = fillerString + TestPartOfInput;
+ lineReader = new LineReader(
+ new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+
+ line = new Text();
+
+ lineReader.readLine(line);
+ Assert.assertEquals(fillerString.toString(),line.toString());
+
+ lineReader.readLine(line);
+ Assert.assertEquals(Expected, line.toString());
+
+ /*TEST_2
+ * The test scenario is such that,
+ * the character/s preceding the delimiter,
+ * equals the starting character/s of delimiter
+ */
+
+ Delimiter = "record";
+ StringBuilder TestStringBuilder = new StringBuilder();
+
+ TestStringBuilder.append(Delimiter+"Kerala ");
+ TestStringBuilder.append(Delimiter+"Bangalore");
+ TestStringBuilder.append(Delimiter+" North Korea");
+ TestStringBuilder.append(Delimiter+Delimiter+
+ "Guantanamo");
+ TestStringBuilder.append(Delimiter+"ecord"+"recor"+"core"); //~EOF with 're'
+
+ TestData=TestStringBuilder.toString();
+
+ lineReader = new LineReader(
+ new ByteArrayInputStream(TestData.getBytes()),Delimiter.getBytes());
+
+ lineReader.readLine(line);
+ Assert.assertEquals("",line.toString());
+ lineReader.readLine(line);
+ Assert.assertEquals("Kerala ",line.toString());
+
+ lineReader.readLine(line);
+ Assert.assertEquals("Bangalore",line.toString());
+
+ lineReader.readLine(line);
+ Assert.assertEquals(" North Korea",line.toString());
+
+ lineReader.readLine(line);
+ Assert.assertEquals("",line.toString());
+ lineReader.readLine(line);
+ Assert.assertEquals("Guantanamo",line.toString());
+
+ lineReader.readLine(line);
+ Assert.assertEquals(("ecord"+"recor"+"core"),line.toString());
}
}
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestOptions.java Tue Oct 16 00:02:55 2012
@@ -18,7 +18,6 @@
package org.apache.hadoop.util;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestPureJavaCrc32.java Tue Oct 16 00:02:55 2012
@@ -156,7 +156,7 @@ public class TestPureJavaCrc32 {
return s;
}
- /** {@inheritDoc} */
+ @Override
public String toString() {
final StringBuilder b = new StringBuilder();
for(String s : toStrings(String.format("T%d_",
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestReflectionUtils.java Tue Oct 16 00:02:55 2012
@@ -22,8 +22,6 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.util.HashMap;
-import org.apache.hadoop.conf.Configuration;
-
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -64,6 +62,7 @@ public class TestReflectionUtils {
Thread[] th = new Thread[32];
for (int i=0; i<th.length; i++) {
th[i] = new Thread() {
+ @Override
public void run() {
try {
doTestCache();
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestRunJar.java Tue Oct 16 00:02:55 2012
@@ -35,6 +35,7 @@ public class TestRunJar extends TestCase
private static final String TEST_JAR_NAME="test-runjar.jar";
+ @Override
@Before
protected void setUp()
throws Exception {
@@ -48,6 +49,7 @@ public class TestRunJar extends TestCase
makeTestJar();
}
+ @Override
@After
protected void tearDown() {
FileUtil.fullyDelete(TEST_ROOT_DIR);
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java Tue Oct 16 00:02:55 2012
@@ -27,7 +27,6 @@ import java.io.PrintWriter;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
-import java.util.Timer;
public class TestShell extends TestCase {
@@ -38,10 +37,12 @@ public class TestShell extends TestCase
super(interval);
}
+ @Override
protected String[] getExecString() {
return new String[] {"echo", "hello"};
}
+ @Override
protected void parseExecResult(BufferedReader lines) throws IOException {
++runCount;
}
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java?rev=1398581&r1=1398580&r2=1398581&view=diff
==============================================================================
--- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java (original)
+++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java Tue Oct 16 00:02:55 2012
@@ -231,7 +231,8 @@ public class TestStringUtils extends Uni
assertArrayEquals(expectedArray, StringUtils.getTrimmedStrings(pathologicalDirList2));
assertArrayEquals(emptyArray, StringUtils.getTrimmedStrings(emptyList1));
- assertArrayEquals(emptyArray, StringUtils.getTrimmedStrings(emptyList2));
+ String[] estring = StringUtils.getTrimmedStrings(emptyList2);
+ assertArrayEquals(emptyArray, estring);
}
@Test
@@ -281,6 +282,19 @@ public class TestStringUtils extends Uni
}
}
+ @Test
+ public void testSimpleHostName() {
+ assertEquals("Should return hostname when FQDN is specified",
+ "hadoop01",
+ StringUtils.simpleHostname("hadoop01.domain.com"));
+ assertEquals("Should return hostname when only hostname is specified",
+ "hadoop01",
+ StringUtils.simpleHostname("hadoop01"));
+ assertEquals("Should not truncate when IP address is passed",
+ "10.10.5.68",
+ StringUtils.simpleHostname("10.10.5.68"));
+ }
+
// Benchmark for StringUtils split
public static void main(String []args) {
final String TO_SPLIT = "foo,bar,baz,blah,blah";