accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [03/50] [abbrv] accumulo git commit: ACCUMULO-3167 Cleanup and comment fixing.
Date Tue, 02 Dec 2014 20:36:51 GMT
ACCUMULO-3167 Cleanup and comment fixing.


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

Branch: refs/heads/metrics2
Commit: 2796a0264f632a66887f372d31ab99660585eb9b
Parents: 163c2be
Author: Josh Elser <elserj@apache.org>
Authored: Wed Nov 19 11:59:35 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Nov 24 18:08:16 2014 -0500

----------------------------------------------------------------------
 .../org/apache/accumulo/test/functional/BulkFileIT.java     | 9 +--------
 .../java/org/apache/accumulo/test/functional/CleanUpIT.java | 2 +-
 .../accumulo/test/functional/DynamicThreadPoolsIT.java      | 2 +-
 .../org/apache/accumulo/test/functional/SimpleMacIT.java    | 5 ++++-
 4 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2796a026/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
index 7038cdb..a7cf6bd 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.test.functional;
 
 import static com.google.common.base.Charsets.UTF_8;
 
-import java.io.File;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.SortedSet;
@@ -43,15 +42,10 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
 
 public class BulkFileIT extends ConfigurableMacIT {
 
-  @Rule
-  public TemporaryFolder folder = new TemporaryFolder();
-
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration conf) {
     cfg.setMemory(ServerType.TABLET_SERVER, 128 * 4, MemoryUnit.MEGABYTE);
@@ -64,7 +58,6 @@ public class BulkFileIT extends ConfigurableMacIT {
 
   @Test
   public void testBulkFile() throws Exception {
-    File tempDir = folder.newFolder();
     Connector c = getConnector();
     String tableName = getUniqueNames(1)[0];
     c.tableOperations().create(tableName);
@@ -76,7 +69,7 @@ public class BulkFileIT extends ConfigurableMacIT {
     AccumuloConfiguration aconf = ServerConfiguration.getDefaultConfiguration();
     FileSystem fs = TraceFileSystem.wrap(VolumeConfiguration.getDefaultVolume(conf, aconf).getFileSystem());
 
-    String dir = tempDir.getAbsolutePath() + "/bulk_test_diff_files_89723987592_" + getUniqueNames(1)[0];
+    String dir = rootPath() + "/bulk_test_diff_files_89723987592_" + getUniqueNames(1)[0];
 
     fs.delete(new Path(dir), true);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2796a026/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
index 110adcf..0ba829a 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java
@@ -62,7 +62,7 @@ public class CleanUpIT extends AccumuloIT {
     cluster = miniClusterHarness.create(this, getToken());
     cluster.start();
   }
-  
+
   @After
   public void stopMiniCluster() throws Exception {
     if (null != cluster) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2796a026/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
index 4b87d52..c10d3df 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java
@@ -64,7 +64,7 @@ public class DynamicThreadPoolsIT extends AccumuloClusterIT {
       Thread.sleep(AccumuloConfiguration.getTimeInMillis(majcDelay));
     }
   }
-  
+
   @After
   public void resetMajcDelay() throws Exception {
     Connector c = getConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2796a026/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
index 9d24554..b2667e8 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java
@@ -24,6 +24,8 @@ import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.harness.AccumuloClusterIT;
+import org.apache.accumulo.harness.AccumuloIT;
+import org.apache.accumulo.harness.MiniClusterHarness;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.minicluster.MiniAccumuloInstance;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
@@ -39,7 +41,8 @@ import org.junit.BeforeClass;
  * An implementation of {@link AbstractMacIT} for test cases that do not need to know any
special details of {@link MiniAccumuloCluster}. Tests which extend
  * this class should be runnable on any instance of Accumulo, given a root connector.
  *
- * New tests should be written using {@link AccumuloClusterIT} or a subclass thereof. {@link
UnmanagedAccumuloIT} provides the most similar semantics.
+ * New tests should be written using {@link AccumuloClusterIT}. To obtain the same semantics
(shared instance across methods in a class), extend
+ * {@link AccumuloIT} and use {@link MiniClusterHarness} to create a MiniAccumuloCluster
properly configured for the environment.
  */
 @Deprecated
 public class SimpleMacIT extends AbstractMacIT {


Mime
View raw message