accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/2] git commit: ACCUMULO-2470 Clean up warnings introduced by previous commit
Date Mon, 31 Mar 2014 18:48:37 GMT
ACCUMULO-2470 Clean up warnings introduced by previous commit

(Unused fields and imports)


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: fff852fce6d971e7e76c91ae911fbfca2e26426b
Parents: dda2fb0
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Mar 31 14:40:26 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Mar 31 14:40:26 2014 -0400

----------------------------------------------------------------------
 .../server/conf/TableConfigurationTest.java         |  9 +++------
 .../problems/ProblemReportingIteratorTest.java      | 16 ++++++++++------
 .../accumulo/server/tablets/LogicalTimeTest.java    | 14 +++++++-------
 3 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fff852fc/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
index 8731de1..ae73ba6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/TableConfigurationTest.java
@@ -16,24 +16,21 @@
  */
 package org.apache.accumulo.server.conf;
 
-import org.apache.accumulo.core.client.Instance;
+import static org.easymock.EasyMock.createMock;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import org.easymock.Capture;
-import static org.easymock.EasyMock.*;
 
 public class TableConfigurationTest {
   private static final String INSTANCE_ID = "instanceId";
   private static final String TABLE = "table";
-  private Instance instance;
   private NamespaceConfiguration nsconf;
   private TableConfiguration tconf;
 
   @Before
   public void setUp() throws Exception {
-    instance = createMock(Instance.class);
     nsconf = createMock(NamespaceConfiguration.class);
     tconf = new TableConfiguration(INSTANCE_ID, TABLE, nsconf);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fff852fc/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
index eab9614..6c61469 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/problems/ProblemReportingIteratorTest.java
@@ -16,8 +16,18 @@
  */
 package org.apache.accumulo.server.problems;
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Range;
@@ -25,16 +35,10 @@ import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.iterators.system.InterruptibleIterator;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
 
 public class ProblemReportingIteratorTest {
   private static final String TABLE = "table";
   private static final String RESOURCE = "resource";
-  private static final String SERVER = "server";
 
   private InterruptibleIterator ii;
   private ProblemReportingIterator pri;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fff852fc/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
index 598eb79..b491f0e 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/tablets/LogicalTimeTest.java
@@ -16,18 +16,18 @@
  */
 package org.apache.accumulo.server.tablets;
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.server.data.ServerMutation;
 import org.apache.accumulo.server.tablets.TabletTime.LogicalTime;
-
-import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.easymock.EasyMock.anyLong;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
 
 public class LogicalTimeTest {
   private static final long TIME = 1234L;


Mime
View raw message