Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14709. Fix checkstyle warnings in ContractTestUtils. 

Contributed by Thomas Marquardt.
This commit is contained in:
Steve Loughran 2017-08-02 12:46:30 +01:00
parent 6ee0fe70c7
commit cb46792610
No known key found for this signature in database
GPG Key ID: 950CC3E032B79CA2
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/ContractTestUtils.java
View File

@ -70,7 +70,8 @@ public class ContractTestUtils extends Assert {
* Assert that a property in the property set matches the expected value. * Assert that a property in the property set matches the expected value.
* @param props property set * @param props property set
* @param key property name * @param key property name
* @param expected expected value. If null, the property must not be in the set * @param expected expected value. If null, the property must not be in the
* set
*/ */
public static void assertPropertyEquals(Properties props, public static void assertPropertyEquals(Properties props,
String key, String key,
@ -268,11 +269,11 @@ public class ContractTestUtils extends Assert {
assertEquals("Number of bytes read != number written", assertEquals("Number of bytes read != number written",
len, received.length); len, received.length);
int errors = 0; int errors = 0;
int first_error_byte = -1; int firstErrorByte = -1;
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
if (original[i] != received[i]) { if (original[i] != received[i]) {
if (errors == 0) { if (errors == 0) {
first_error_byte = i; firstErrorByte = i;
} }
errors++; errors++;
} }
@ -285,8 +286,8 @@ public class ContractTestUtils extends Assert {
// the range either side of the first error to print // the range either side of the first error to print
// this is a purely arbitrary number, to aid user debugging // this is a purely arbitrary number, to aid user debugging
final int overlap = 10; final int overlap = 10;
for (int i = Math.max(0, first_error_byte - overlap); for (int i = Math.max(0, firstErrorByte - overlap);
i < Math.min(first_error_byte + overlap, len); i < Math.min(firstErrorByte + overlap, len);
i++) { i++) {
byte actual = received[i]; byte actual = received[i];
byte expected = original[i]; byte expected = original[i];
@ -684,7 +685,8 @@ public class ContractTestUtils extends Assert {
*/ */
public static String ls(FileSystem fileSystem, Path path) throws IOException { public static String ls(FileSystem fileSystem, Path path) throws IOException {
if (path == null) { if (path == null) {
//surfaces when someone calls getParent() on something at the top of the path // surfaces when someone calls getParent() on something at the top of the
// path
return "/"; return "/";
} }
FileStatus[] stats; FileStatus[] stats;
@ -866,7 +868,7 @@ public class ContractTestUtils extends Assert {
} }
/** /**
* Test for the host being an OSX machine * Test for the host being an OSX machine.
* @return true if the JVM thinks that is running on OSX * @return true if the JVM thinks that is running on OSX
*/ */
public static boolean isOSX() { public static boolean isOSX() {
@ -889,9 +891,10 @@ public class ContractTestUtils extends Assert {
break; break;
} }
} }
if (mismatch) if (mismatch) {
break; break;
} }
}
assertFalse("File content of file is not as expected at offset " + idx, assertFalse("File content of file is not as expected at offset " + idx,
mismatch); mismatch);
} }
@ -1000,7 +1003,9 @@ public class ContractTestUtils extends Assert {
* @throws IOException * @throws IOException
* thrown if an I/O error occurs while writing or reading the test file * thrown if an I/O error occurs while writing or reading the test file
*/ */
public static void createAndVerifyFile(FileSystem fs, Path parent, final long fileSize) public static void createAndVerifyFile(FileSystem fs,
Path parent,
final long fileSize)
throws IOException { throws IOException {
int testBufferSize = fs.getConf() int testBufferSize = fs.getConf()
.getInt(IO_CHUNK_BUFFER_SIZE, DEFAULT_IO_CHUNK_BUFFER_SIZE); .getInt(IO_CHUNK_BUFFER_SIZE, DEFAULT_IO_CHUNK_BUFFER_SIZE);