Updated Branches: refs/heads/1.6.0-SNAPSHOT 9a81ca2d9 -> 9d1e171e2
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java index 0ef134a..4d622a1 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/LargeRowIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; @@ -41,7 +41,7 @@ import org.junit.Test; public class LargeRowIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_MAJC_DELAY.getKey(), "10ms")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java index 81d3460..7f1f29b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/LateLastContactIT.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import java.util.Collections; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.junit.Test; /** @@ -31,7 +31,7 @@ import org.junit.Test; public class LateLastContactIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.GENERAL_RPC_TIMEOUT.getKey(), "2s")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java index bb3a9e5..ee5831b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MapReduceIT.java @@ -38,7 +38,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.examples.simple.mapreduce.RowHash; -import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.hadoop.io.Text; import org.codehaus.plexus.util.Base64; import org.junit.Test; @@ -58,7 +58,7 @@ public class MapReduceIT extends ConfigurableMacIT { runTest(getConnector(), getCluster()); } - static void runTest(Connector c, MiniAccumuloCluster cluster) throws AccumuloException, AccumuloSecurityException, TableExistsException, + static void runTest(Connector c, MiniAccumuloClusterImpl cluster) throws AccumuloException, AccumuloSecurityException, TableExistsException, TableNotFoundException, MutationsRejectedException, IOException, InterruptedException, NoSuchAlgorithmException { c.tableOperations().create(tablename); BatchWriter bw = c.createBatchWriter(tablename, new BatchWriterConfig()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java index a6e3162..47efb54 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java @@ -21,9 +21,9 @@ import java.util.Collections; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.master.Master; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; -import org.apache.accumulo.minicluster.ProcessReference; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; +import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; @@ -31,7 +31,7 @@ import org.junit.Test; public class MasterFailoverIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java index c9a49ee..9483ab9 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MaxOpenIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; @@ -42,7 +42,7 @@ import org.junit.Test; public class MaxOpenIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String, String> conf = new HashMap<String, String>(); conf.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), "4"); conf.put(Property.TSERV_MAJC_MAXCONCURRENT.getKey(), "1"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java index d08d3c1..789d84b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.trace.instrument.Tracer; import org.apache.hadoop.io.Text; @@ -45,7 +45,7 @@ import org.junit.Test; public class MetadataMaxFiles extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> siteConfig = new HashMap<String,String>(); siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1"); siteConfig.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), "10"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java index 8b08e6a..bb0dd15 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataSplitIT.java @@ -25,13 +25,13 @@ import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.junit.Test; public class MetadataSplitIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_MAJC_DELAY.getKey(), "100ms")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java index 9fe2841..e0dbb34 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java @@ -32,9 +32,9 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.gc.SimpleGarbageCollector; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; -import org.apache.accumulo.minicluster.ProcessReference; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; +import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; @@ -42,7 +42,7 @@ import org.junit.Test; public class RestartIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> props = new HashMap<String,String>(); props.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"); props.put(Property.GC_CYCLE_DELAY.getKey(), "1s"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java index 31402ba..da5a86f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -25,8 +25,8 @@ import org.apache.accumulo.core.cli.ScannerOpts; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; @@ -34,7 +34,7 @@ import org.junit.Test; public class RestartStressIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String, String> opts = new HashMap<String, String>(); opts.put(Property.TSERV_MAXMEM.getKey(), "100K"); opts.put(Property.TSERV_MAJC_DELAY.getKey(), "100ms"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java index 731a68f..0ee903b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RowDeleteIT.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.user.RowDeletingIterator; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -45,7 +45,7 @@ public class RowDeleteIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_MAJC_DELAY.getKey(), "50ms")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java index 2a4212f..9e114a0 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java @@ -30,14 +30,14 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.io.Text; import org.junit.Test; public class ScanSessionTimeOutIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { cfg.setSiteConfig(Collections.singletonMap(Property.TSERV_SESSION_MAXIDLE.getKey(), "3")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java index d194367..5b83944 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ShutdownIT.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestRandomDeletes; @@ -95,7 +95,7 @@ public class ShutdownIT extends ConfigurableMacIT { runAdminStopTest(getConnector(), cluster); } - static void runAdminStopTest(Connector c, MiniAccumuloCluster cluster) throws InterruptedException, IOException { + static void runAdminStopTest(Connector c, MiniAccumuloClusterImpl cluster) throws InterruptedException, IOException { assertEquals(0, cluster.exec(TestIngest.class, "-i", cluster.getInstanceName(), "-z", cluster.getZooKeepers(), "-u", "root", "-p", ROOT_PASSWORD, "--createTable").waitFor()); List<String> tabletServers = c.instanceOperations().getTabletServers(); assertEquals(2, tabletServers.size()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java index 7a9bad6..3352357 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java @@ -34,7 +34,7 @@ import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.trace.instrument.Tracer; import org.junit.Test; @@ -42,7 +42,7 @@ import org.junit.Test; public class SimpleBalancerFairnessIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> siteConfig = new HashMap<String,String>(); siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K"); siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/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 8293fe8..0bfc991 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 @@ -23,9 +23,9 @@ import org.apache.accumulo.core.client.AccumuloSecurityException; 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.minicluster.MiniAccumuloCluster; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; import org.apache.accumulo.minicluster.MiniAccumuloInstance; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.log4j.Logger; import org.junit.After; import org.junit.AfterClass; @@ -35,17 +35,17 @@ public class SimpleMacIT extends AbstractMacIT { public static final Logger log = Logger.getLogger(SimpleMacIT.class); private static File folder; - private static MiniAccumuloCluster cluster = null; + private static MiniAccumuloClusterImpl cluster = null; @BeforeClass public static synchronized void setUp() throws Exception { if (getInstanceOneConnector() == null && cluster == null) { folder = createSharedTestDir(SimpleMacIT.class.getName()); - MiniAccumuloConfig cfg = new MiniAccumuloConfig(folder, ROOT_PASSWORD); + MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(folder, ROOT_PASSWORD); cfg.setNativeLibPaths(NativeMapIT.nativeMapLocation().getAbsolutePath()); cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.TRUE.toString()); configureForEnvironment(cfg, SimpleMacIT.class, createSharedTestDir(SimpleMacIT.class.getName() + "-ssl")); - cluster = new MiniAccumuloCluster(cfg); + cluster = new MiniAccumuloClusterImpl(cfg); cluster.start(); Runtime.getRuntime().addShutdownHook(new Thread() { @Override @@ -67,7 +67,7 @@ public class SimpleMacIT extends AbstractMacIT { return (getInstanceOneConnector() == null ? cluster.getConfig().getDir() : getInstanceOnePath()).getAbsolutePath(); } - public static MiniAccumuloCluster getStaticCluster() { + public static MiniAccumuloClusterImpl getStaticCluster() { return cluster; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java index 761953a..80b79ff 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitIT.java @@ -35,7 +35,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.util.CheckForMetadataProblems; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; @@ -45,7 +45,7 @@ import org.junit.Test; public class SplitIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> siteConfig = new HashMap<String,String>(); siteConfig.put(Property.TSERV_MAXMEM.getKey(), "5K"); siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "100ms"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java index 6a29ad7..a453b0b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java @@ -18,7 +18,7 @@ package org.apache.accumulo.test.functional; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.junit.Test; /** @@ -28,7 +28,7 @@ import org.junit.Test; */ public class SslIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { super.configure(cfg); configureForSsl(cfg, createSharedTestDir(this.getClass().getName() + "-ssl")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java index c40e2b3..d477e2f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java @@ -21,7 +21,7 @@ import java.util.Map; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.junit.Test; /** @@ -32,7 +32,7 @@ import org.junit.Test; */ public class SslWithClientAuthIT extends SslIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { super.configure(cfg); Map<String,String> site = cfg.getSiteConfig(); site.put(Property.INSTANCE_RPC_SSL_CLIENT_AUTH.getKey(), "true"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java index cf4c35c..5cec48f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/TabletIT.java @@ -33,7 +33,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.MemoryUnit; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -42,7 +42,7 @@ public class TabletIT extends ConfigurableMacIT { private static final int N = 1000; @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> siteConfig = new HashMap<String,String>(); siteConfig.put(Property.TABLE_SPLIT_THRESHOLD.getKey(), "200"); siteConfig.put(Property.TSERV_MAXMEM.getKey(), "128M"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java index 88030fa..25d0757 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java @@ -26,9 +26,9 @@ import org.apache.accumulo.core.cli.BatchWriterOpts; import org.apache.accumulo.core.cli.ScannerOpts; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; -import org.apache.accumulo.minicluster.ProcessReference; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; +import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; @@ -37,7 +37,7 @@ import org.junit.Test; public class WriteAheadLogIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String, String> siteConfig = new HashMap<String, String>(); siteConfig.put(Property.TSERV_WALOG_MAX_SIZE.getKey(), "2M"); siteConfig.put(Property.GC_CYCLE_DELAY.getKey(), "1"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/9d1e171e/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java index 8646e54..d944778 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ZookeeperRestartIT.java @@ -34,15 +34,15 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.minicluster.MiniAccumuloConfig; -import org.apache.accumulo.minicluster.ProcessReference; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; +import org.apache.accumulo.minicluster.impl.ProcessReference; import org.junit.Test; public class ZookeeperRestartIT extends ConfigurableMacIT { @Override - public void configure(MiniAccumuloConfig cfg) { + public void configure(MiniAccumuloConfigImpl cfg) { Map<String,String> siteConfig = new HashMap<String, String>(); siteConfig.put(Property.INSTANCE_ZK_TIMEOUT.getKey(), "3s"); cfg.setSiteConfig(siteConfig);
