accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [06/11] git commit: ACCUMULO-2615 WARNING clean-up, removed import wildcards
Date Tue, 22 Jul 2014 21:26:49 GMT
ACCUMULO-2615 WARNING clean-up, removed import wildcards

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

Branch: refs/heads/master
Commit: c1ff75887529f757469bae1f2998638fddfaacac
Parents: d02e60e
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Jul 22 17:10:11 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Jul 22 17:10:11 2014 -0400

----------------------------------------------------------------------
 .../conf/ServerConfigurationFactoryTest.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1ff7588/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
index 9d4a7d2..0d8f044 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/ServerConfigurationFactoryTest.java
@@ -16,21 +16,29 @@
  */
 package org.apache.accumulo.server.conf;
 
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.endsWith;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
 import java.nio.charset.StandardCharsets;
+
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
-import org.easymock.Capture;
-import static org.easymock.EasyMock.*;
 
 public class ServerConfigurationFactoryTest {
   private static final String ZK_HOST = "localhost";
@@ -70,7 +78,7 @@ public class ServerConfigurationFactoryTest {
 
   @After
   public void tearDown() throws Exception {
-    scf.clearCachedConfigurations();
+    ServerConfigurationFactory.clearCachedConfigurations();
   }
 
   private void mockInstanceForConfig() {
@@ -115,7 +123,6 @@ public class ServerConfigurationFactoryTest {
   }
 
   private static final String NSID = "NAMESPACE";
-  private static final String TABLE = "TABLE";
 
   @Test
   public void testGetNamespaceConfiguration() {


Mime
View raw message