accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject [2/2] git commit: ACCUMULO-2187 Clean whitespace, format ShellUtilTest
Date Fri, 07 Mar 2014 16:10:47 GMT
ACCUMULO-2187 Clean whitespace, format ShellUtilTest


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff605865
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff605865
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff605865

Branch: refs/heads/master
Commit: ff605865d1388a07687a924b064e3dd3495d3102
Parents: 2d68f57
Author: Bill Havanki <bhavanki@cloudera.com>
Authored: Fri Mar 7 11:07:09 2014 -0500
Committer: Bill Havanki <bhavanki@cloudera.com>
Committed: Fri Mar 7 11:07:09 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/core/util/shell/ShellUtil.java    |  2 +-
 .../apache/accumulo/core/util/shell/ShellUtilTest.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff605865/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
index 831895b..30b7824 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
@@ -55,4 +55,4 @@ public class ShellUtil {
     }
     return result;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff605865/core/src/test/java/org/apache/accumulo/core/util/shell/ShellUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellUtilTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellUtilTest.java
index 3d5cbec..fe7c1db 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellUtilTest.java
@@ -37,7 +37,7 @@ public class ShellUtilTest {
 
   @Rule
   public TemporaryFolder folder = new TemporaryFolder(new File(System.getProperty("user.dir")
+ "/target"));
-  
+
   // String with 3 lines, with one empty line
   private static final String FILEDATA = "line1\n\nline2";
 
@@ -54,12 +54,12 @@ public class ShellUtilTest {
     File testFile = new File(folder.getRoot(), "testFileWithDecode.txt");
     FileUtils.writeStringToFile(testFile, FILEDATA);
     List<Text> output = ShellUtil.scanFile(testFile.getAbsolutePath(), true);
-    assertEquals(ImmutableList.of(
-        new Text(Base64.decodeBase64("line1".getBytes(Constants.UTF8))), 
-        new Text(Base64.decodeBase64("line2".getBytes(Constants.UTF8)))), output);
+    assertEquals(
+        ImmutableList.of(new Text(Base64.decodeBase64("line1".getBytes(Constants.UTF8))),
new Text(Base64.decodeBase64("line2".getBytes(Constants.UTF8)))),
+        output);
   }
 
-  @Test(expected=FileNotFoundException.class)
+  @Test(expected = FileNotFoundException.class)
   public void testWithMissingFile() throws FileNotFoundException {
     ShellUtil.scanFile("missingFile.txt", false);
   }


Mime
View raw message