You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/06/19 04:02:01 UTC
[13/28] git commit: ACCUMULO-2383 Remove unused imports/variables
ACCUMULO-2383 Remove unused imports/variables
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7d60722d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7d60722d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7d60722d
Branch: refs/heads/master
Commit: 7d60722db45142c8502a77e88f1ac5800e2fbd6b
Parents: e11f289
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jun 18 21:33:32 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jun 18 21:33:32 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/AccumuloTest.java | 14 +++++++-------
.../server/watcher/MonitorLog4jWatcherTest.java | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d60722d/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java b/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
index a090b40..52929ed 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/AccumuloTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.accumulo.server;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileNotFoundException;
+
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
public class AccumuloTest {
private FileSystem fs;
@@ -113,7 +114,6 @@ public class AccumuloTest {
String confDirName = confDir.getAbsolutePath();
assertTrue("Failed to make test configuration directory", confDir.mkdir());
try {
- File genericXml = new File(confDir, "generic_logger.xml");
String genericXmlName = String.format("%s/generic_logger.xml", confDirName);
assertEquals(genericXmlName, Accumulo.locateLogConfig(confDirName, "flogger"));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7d60722d/server/base/src/test/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcherTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcherTest.java
index 448e0ac..53c3c6e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcherTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.accumulo.server.watcher;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.zookeeper.ZooUtil;
-
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.easymock.Capture;
-import static org.easymock.EasyMock.*;
public class MonitorLog4jWatcherTest {
private static final String INSTANCE = "instance";