http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java index dd97458..b80bcb7 100644 --- a/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java +++ b/test/src/test/java/org/apache/accumulo/test/CreateTableWithNewTableConfigIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -43,7 +43,7 @@ import com.google.common.collect.Iterators; /** * */ -public class CreateTableWithNewTableConfigIT extends SharedMiniClusterIT { +public class CreateTableWithNewTableConfigIT extends SharedMiniClusterBase { static private final Logger log = LoggerFactory.getLogger(CreateTableWithNewTableConfigIT.class); @Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java index 5252e68..5cc37a5 100644 --- a/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java +++ b/test/src/test/java/org/apache/accumulo/test/DumpConfigIT.java @@ -28,14 +28,14 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.util.Admin; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.test.functional.FunctionalTestUtils; import org.apache.hadoop.conf.Configuration; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -public class DumpConfigIT extends ConfigurableMacIT { +public class DumpConfigIT extends ConfigurableMacBase { @Rule public TemporaryFolder folder = new TemporaryFolder(new File(System.getProperty("user.dir") + "/target")); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java index 5460f7a..52d2086 100644 --- a/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java @@ -43,14 +43,14 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.Assert; import org.junit.Test; -public class ExistingMacIT extends ConfigurableMacIT { +public class ExistingMacIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { return 2 * 60; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/FileArchiveIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/FileArchiveIT.java b/test/src/test/java/org/apache/accumulo/test/FileArchiveIT.java index 390d20a..8e51984 100644 --- a/test/src/test/java/org/apache/accumulo/test/FileArchiveIT.java +++ b/test/src/test/java/org/apache/accumulo/test/FileArchiveIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerConstants; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -43,7 +43,7 @@ import com.google.common.collect.Iterables; /** * Tests that files are archived instead of deleted when configured. */ -public class FileArchiveIT extends ConfigurableMacIT { +public class FileArchiveIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/GarbageCollectWALIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/GarbageCollectWALIT.java b/test/src/test/java/org/apache/accumulo/test/GarbageCollectWALIT.java index 96ae579..141ee27 100644 --- a/test/src/test/java/org/apache/accumulo/test/GarbageCollectWALIT.java +++ b/test/src/test/java/org/apache/accumulo/test/GarbageCollectWALIT.java @@ -26,7 +26,7 @@ import org.apache.accumulo.fate.util.UtilWaitThread; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocatedFileStatus; @@ -37,7 +37,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class GarbageCollectWALIT extends ConfigurableMacIT { +public class GarbageCollectWALIT extends ConfigurableMacBase { @Override protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/ImportExportIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/test/java/org/apache/accumulo/test/ImportExportIT.java index f30a970..55d83f5 100644 --- a/test/src/test/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ImportExportIT.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.data.Value; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * ACCUMULO-3215 * */ -public class ImportExportIT extends AccumuloClusterIT { +public class ImportExportIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ImportExportIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java b/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java index 35d4048..a272bc2 100644 --- a/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/InterruptibleScannersIT.java @@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.admin.ActiveScan; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.hadoop.conf.Configuration; @@ -34,7 +34,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; // ACCUMULO-3030 -public class InterruptibleScannersIT extends AccumuloClusterIT { +public class InterruptibleScannersIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/KeyValueEqualityIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/KeyValueEqualityIT.java b/test/src/test/java/org/apache/accumulo/test/KeyValueEqualityIT.java index 1bcd82c..b0734b4 100644 --- a/test/src/test/java/org/apache/accumulo/test/KeyValueEqualityIT.java +++ b/test/src/test/java/org/apache/accumulo/test/KeyValueEqualityIT.java @@ -27,11 +27,11 @@ import org.apache.accumulo.core.data.Key; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.junit.Assert; import org.junit.Test; -public class KeyValueEqualityIT extends AccumuloClusterIT { +public class KeyValueEqualityIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/LargeSplitRowIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/LargeSplitRowIT.java b/test/src/test/java/org/apache/accumulo/test/LargeSplitRowIT.java index a465955..479bb0e 100644 --- a/test/src/test/java/org/apache/accumulo/test/LargeSplitRowIT.java +++ b/test/src/test/java/org/apache/accumulo/test/LargeSplitRowIT.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.conf.TableConfiguration; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.Assert; @@ -45,7 +45,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LargeSplitRowIT extends ConfigurableMacIT { +public class LargeSplitRowIT extends ConfigurableMacBase { static private final Logger log = LoggerFactory.getLogger(LargeSplitRowIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java index fb99a24..9babeba 100644 --- a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java @@ -44,7 +44,7 @@ import org.apache.accumulo.server.master.state.MetaDataStateStore; import org.apache.accumulo.server.master.state.RootTabletStateStore; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.master.state.TabletLocationState; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.io.Text; @@ -52,7 +52,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class MasterRepairsDualAssignmentIT extends ConfigurableMacIT { +public class MasterRepairsDualAssignmentIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MetaConstraintRetryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MetaConstraintRetryIT.java b/test/src/test/java/org/apache/accumulo/test/MetaConstraintRetryIT.java index dbc10af..727859f 100644 --- a/test/src/test/java/org/apache/accumulo/test/MetaConstraintRetryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MetaConstraintRetryIT.java @@ -25,12 +25,12 @@ import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.server.util.MetadataTableUtil; import org.apache.hadoop.io.Text; import org.junit.Test; -public class MetaConstraintRetryIT extends AccumuloClusterIT { +public class MetaConstraintRetryIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java index 6040d32..84a5996 100644 --- a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java @@ -37,14 +37,14 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.hadoop.conf.Configuration; import org.junit.Test; import com.google.common.collect.Iterators; -public class MetaGetsReadersIT extends ConfigurableMacIT { +public class MetaGetsReadersIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MetaSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MetaSplitIT.java b/test/src/test/java/org/apache/accumulo/test/MetaSplitIT.java index 51b462e..0bc78fb 100644 --- a/test/src/test/java/org/apache/accumulo/test/MetaSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MetaSplitIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.After; import org.junit.Before; @@ -39,7 +39,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class MetaSplitIT extends AccumuloClusterIT { +public class MetaSplitIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(MetaSplitIT.class); private Collection<Text> metadataSplits = null; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java index 81c5d84..b3bf196 100644 --- a/test/src/test/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MissingWalHeaderCompletesRecoveryIT.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.tabletserver.log.LogEntry; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerConstants; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tserver.log.DfsLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; @@ -56,7 +56,7 @@ import com.google.common.collect.Iterables; /** * */ -public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacIT { +public class MissingWalHeaderCompletesRecoveryIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(MissingWalHeaderCompletesRecoveryIT.class); private boolean rootHasWritePermission; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java index 5e99f6e..2b03780 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java @@ -41,14 +41,14 @@ import org.apache.accumulo.core.data.Mutation; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import com.google.common.collect.Maps; -public class MultiTableBatchWriterIT extends AccumuloClusterIT { +public class MultiTableBatchWriterIT extends AccumuloClusterHarness { private Connector connector; private MultiTableBatchWriter mtbw; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java index 7d1c53e..37e4957 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableRecoveryIT.java @@ -35,14 +35,14 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.Test; import com.google.common.collect.Iterators; -public class MultiTableRecoveryIT extends ConfigurableMacIT { +public class MultiTableRecoveryIT extends ConfigurableMacBase { @Override protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java index f29f356..0ecdd0d 100644 --- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java @@ -76,7 +76,7 @@ import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.After; import org.junit.Assume; @@ -85,7 +85,7 @@ import org.junit.Test; // Testing default namespace configuration with inheritance requires altering the system state and restoring it back to normal // Punt on this for now and just let it use a minicluster. -public class NamespacesIT extends AccumuloClusterIT { +public class NamespacesIT extends AccumuloClusterHarness { private Connector c; private String namespace; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java b/test/src/test/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java index 1a3c92f..60b3cf7 100644 --- a/test/src/test/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.data.Value; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; @@ -41,7 +41,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; // Accumulo3010 -public class RecoveryCompactionsAreFlushesIT extends AccumuloClusterIT { +public class RecoveryCompactionsAreFlushesIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java index 5a19de9..b3f8959 100644 --- a/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java @@ -44,7 +44,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.init.Initialize; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.server.util.RandomizeVolumes; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RawLocalFileSystem; @@ -52,7 +52,7 @@ import org.apache.hadoop.io.Text; import org.junit.Test; // ACCUMULO-3263 -public class RewriteTabletDirectoriesIT extends ConfigurableMacIT { +public class RewriteTabletDirectoriesIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java index 438279d..00ac235 100644 --- a/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ScanIteratorIT.java @@ -42,7 +42,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.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.AuthsIterator; import org.apache.hadoop.conf.Configuration; @@ -54,7 +54,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ScanIteratorIT extends AccumuloClusterIT { +public class ScanIteratorIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ScanIteratorIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java b/test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java index 3903e3e..4f83668 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellConfigIT.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; 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.AccumuloClusterHarness; import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.test.ShellServerIT.TestShell; @@ -36,7 +36,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class ShellConfigIT extends AccumuloClusterIT { +public class ShellConfigIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { return 30; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 6618a65..7740492 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -62,7 +62,7 @@ import org.apache.accumulo.core.file.FileSKVWriter; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.shell.Shell; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.accumulo.tracer.TraceServer; @@ -88,7 +88,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class ShellServerIT extends SharedMiniClusterIT { +public class ShellServerIT extends SharedMiniClusterBase { public static class TestOutputStream extends OutputStream { StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java index 64437b7..4cad3a7 100644 --- a/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java +++ b/test/src/test/java/org/apache/accumulo/test/SplitCancelsMajCIT.java @@ -31,13 +31,13 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.hadoop.io.Text; import org.junit.Test; // ACCUMULO-2862 -public class SplitCancelsMajCIT extends SharedMiniClusterIT { +public class SplitCancelsMajCIT extends SharedMiniClusterBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java index 8fe8471..298c761 100644 --- a/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/SplitRecoveryIT.java @@ -36,13 +36,13 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Da import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; import com.google.common.collect.Iterators; -public class SplitRecoveryIT extends AccumuloClusterIT { +public class SplitRecoveryIT extends AccumuloClusterHarness { private Mutation m(String row) { Mutation result = new Mutation(row); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/test/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java index c02daea..1dd964c 100644 --- a/test/src/test/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.Namespaces; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.server.conf.NamespaceConfiguration; import org.apache.accumulo.server.conf.TableConfiguration; import org.junit.Assert; @@ -38,7 +38,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TableConfigurationUpdateIT extends AccumuloClusterIT { +public class TableConfigurationUpdateIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(TableConfigurationUpdateIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java index dc8f9dd..789b089 100644 --- a/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java @@ -56,7 +56,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.functional.BadIterator; import org.apache.hadoop.io.Text; import org.apache.thrift.TException; @@ -67,7 +67,7 @@ import org.junit.Test; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -public class TableOperationsIT extends AccumuloClusterIT { +public class TableOperationsIT extends AccumuloClusterHarness { static TabletClientService.Client client; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java index 5da0629..06bf394 100644 --- a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java @@ -25,13 +25,13 @@ 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.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.Test; // ACCUMULO-2480 -public class TabletServerGivesUpIT extends ConfigurableMacIT { +public class TabletServerGivesUpIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TotalQueuedIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TotalQueuedIT.java b/test/src/test/java/org/apache/accumulo/test/TotalQueuedIT.java index 708d2d4..bf2e7f1 100644 --- a/test/src/test/java/org/apache/accumulo/test/TotalQueuedIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TotalQueuedIT.java @@ -34,14 +34,14 @@ import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.AccumuloServerContext; import org.apache.accumulo.server.conf.ServerConfigurationFactory; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.junit.Test; import com.google.common.net.HostAndPort; // see ACCUMULO-1950 -public class TotalQueuedIT extends ConfigurableMacIT { +public class TotalQueuedIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java b/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java index 16ad454..1c6e3df 100644 --- a/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TracerRecoversAfterOfflineTableIT.java @@ -30,7 +30,7 @@ import org.apache.accumulo.core.trace.Trace; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.tracer.TraceDump; import org.apache.accumulo.tracer.TraceDump.Printer; import org.apache.accumulo.tracer.TraceServer; @@ -41,7 +41,7 @@ import org.junit.Test; /** * */ -public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacIT { +public class TracerRecoversAfterOfflineTableIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration coreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/TransportCachingIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/test/java/org/apache/accumulo/test/TransportCachingIT.java index 5bfb207..9cc3dc0 100644 --- a/test/src/test/java/org/apache/accumulo/test/TransportCachingIT.java +++ b/test/src/test/java/org/apache/accumulo/test/TransportCachingIT.java @@ -38,7 +38,7 @@ import org.apache.accumulo.core.util.ServerServices.Service; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.fate.zookeeper.ZooCacheFactory; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; import org.junit.Test; @@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory; /** * Test that {@link ThriftTransportPool} actually adheres to the cachedConnection argument */ -public class TransportCachingIT extends AccumuloClusterIT { +public class TransportCachingIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(TransportCachingIT.class); @Test http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/UnusedWALIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/UnusedWALIT.java b/test/src/test/java/org/apache/accumulo/test/UnusedWALIT.java index ac68abd..281c358 100644 --- a/test/src/test/java/org/apache/accumulo/test/UnusedWALIT.java +++ b/test/src/test/java/org/apache/accumulo/test/UnusedWALIT.java @@ -39,7 +39,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.Test; @@ -50,7 +50,7 @@ import com.google.common.collect.Iterators; // "tablets will now have log references that contain no data, // so it may be marked with 3 WALs, the first with data, the 2nd without, a 3rd with data. // It would be useful to have an IT that will test this situation. -public class UnusedWALIT extends ConfigurableMacIT { +public class UnusedWALIT extends ConfigurableMacBase { private ZooReaderWriter zk; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/UserCompactionStrategyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/UserCompactionStrategyIT.java b/test/src/test/java/org/apache/accumulo/test/UserCompactionStrategyIT.java index fd21cd3..fa9e642 100644 --- a/test/src/test/java/org/apache/accumulo/test/UserCompactionStrategyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/UserCompactionStrategyIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.RegExFilter; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.functional.FunctionalTestUtils; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.hadoop.io.Text; @@ -51,7 +51,7 @@ import org.junit.Test; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -public class UserCompactionStrategyIT extends AccumuloClusterIT { +public class UserCompactionStrategyIT extends AccumuloClusterHarness { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/UsersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/UsersIT.java b/test/src/test/java/org/apache/accumulo/test/UsersIT.java index 579daee..131f042 100644 --- a/test/src/test/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/UsersIT.java @@ -27,10 +27,10 @@ import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.security.SecurityErrorCode; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.junit.Test; -public class UsersIT extends AccumuloClusterIT { +public class UsersIT extends AccumuloClusterHarness { @Test public void testCreateExistingUser() throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java index 8338021..6a90730 100644 --- a/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VerifySerialRecoveryIT.java @@ -32,7 +32,7 @@ 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.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.test.functional.FunctionalTestUtils; import org.apache.accumulo.tserver.TabletServer; import org.apache.hadoop.conf.Configuration; @@ -42,7 +42,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class VerifySerialRecoveryIT extends ConfigurableMacIT { +public class VerifySerialRecoveryIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java index 6e182bc..c2dee9f 100644 --- a/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VolumeChooserIT.java @@ -47,7 +47,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.fs.PerTableVolumeChooser; import org.apache.accumulo.server.fs.PreferredVolumeChooser; import org.apache.accumulo.server.fs.RandomVolumeChooser; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RawLocalFileSystem; @@ -57,7 +57,7 @@ import org.junit.Test; /** * */ -public class VolumeChooserIT extends ConfigurableMacIT { +public class VolumeChooserIT extends ConfigurableMacBase { private static final Text EMPTY = new Text(); private static final Value EMPTY_VALUE = new Value(new byte[] {}); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/VolumeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java index 1a2ee6b..c25370d 100644 --- a/test/src/test/java/org/apache/accumulo/test/VolumeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/VolumeIT.java @@ -70,7 +70,7 @@ import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.server.log.WalStateManager.WalState; import org.apache.accumulo.server.util.Admin; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -80,7 +80,7 @@ import org.apache.hadoop.io.Text; import org.junit.Assert; import org.junit.Test; -public class VolumeIT extends ConfigurableMacIT { +public class VolumeIT extends ConfigurableMacBase { private static final Text EMPTY = new Text(); private static final Value EMPTY_VALUE = new Value(new byte[] {}); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/WaitForBalanceIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/WaitForBalanceIT.java b/test/src/test/java/org/apache/accumulo/test/WaitForBalanceIT.java index 93854f5..249bf14 100644 --- a/test/src/test/java/org/apache/accumulo/test/WaitForBalanceIT.java +++ b/test/src/test/java/org/apache/accumulo/test/WaitForBalanceIT.java @@ -33,13 +33,13 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.test.functional.ConfigurableMacIT; +import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.hadoop.io.Text; import org.junit.Test; import com.google.common.collect.Iterators; -public class WaitForBalanceIT extends ConfigurableMacIT { +public class WaitForBalanceIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java index 054f9a4..118f053 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java @@ -43,7 +43,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -52,7 +52,7 @@ import org.apache.hadoop.mapreduce.Job; import org.junit.Before; import org.junit.Test; -public class AccumuloInputFormatIT extends AccumuloClusterIT { +public class AccumuloInputFormatIT extends AccumuloClusterHarness { AccumuloInputFormat inputFormat; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java index 5b32b94..4b4aeac 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/AddSplitIT.java @@ -35,11 +35,11 @@ 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; -public class AddSplitIT extends AccumuloClusterIT { +public class AddSplitIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java index efed7a4..d8979db 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BackupMasterIT.java @@ -25,7 +25,7 @@ import org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy; import org.apache.accumulo.master.Master; import org.junit.Test; -public class BackupMasterIT extends ConfigurableMacIT { +public class BackupMasterIT extends ConfigurableMacBase { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java index 14561c2..4c6fc00 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java @@ -31,13 +31,13 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; import com.google.common.collect.Iterators; -public class BadIteratorMincIT extends AccumuloClusterIT { +public class BadIteratorMincIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java index 7b35db4..ae470f6 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java @@ -48,7 +48,7 @@ import org.junit.Test; import com.google.common.collect.Iterables; -public class BalanceAfterCommsFailureIT extends ConfigurableMacIT { +public class BalanceAfterCommsFailureIT extends ConfigurableMacBase { @Override public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java index b77ce1c..623d79b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java @@ -41,7 +41,7 @@ import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.master.thrift.MasterMonitorInfo; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.trace.Tracer; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; /** * Start a new table, create many splits, and offline before they can rebalance. Then try to have a different table balance */ -public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterIT { +public class BalanceInPresenceOfOfflineTableIT extends AccumuloClusterHarness { private static Logger log = LoggerFactory.getLogger(BalanceInPresenceOfOfflineTableIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java index fb52c05..14295c4 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java @@ -35,7 +35,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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -43,7 +43,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BatchScanSplitIT extends AccumuloClusterIT { +public class BatchScanSplitIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(BatchScanSplitIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java index 6378480..7c05a0f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java @@ -37,13 +37,13 @@ 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; import com.google.common.collect.Iterators; -public class BatchWriterFlushIT extends AccumuloClusterIT { +public class BatchWriterFlushIT extends AccumuloClusterHarness { private static final int NUM_TO_FLUSH = 100000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java index f08ea00..11dcb66 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java @@ -25,14 +25,14 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.junit.Test; import com.google.common.collect.Iterators; -public class BigRootTabletIT extends AccumuloClusterIT { +public class BigRootTabletIT extends AccumuloClusterHarness { // ACCUMULO-542: A large root tablet will fail to load if it does't fit in the tserver scan buffers @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java index e524fa8..85716d5 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java @@ -22,12 +22,12 @@ import java.util.TreeSet; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestBinaryRows; import org.apache.hadoop.io.Text; import org.junit.Test; -public class BinaryIT extends AccumuloClusterIT { +public class BinaryIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java index 62d8738..440d2cf 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryStressIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; @@ -41,7 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class BinaryStressIT extends AccumuloClusterIT { +public class BinaryStressIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java index 67a556c..fbbe542 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java @@ -41,7 +41,7 @@ import org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor; import org.apache.accumulo.core.file.keyfunctor.RowFunctor; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.fate.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; @@ -50,7 +50,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BloomFilterIT extends AccumuloClusterIT { +public class BloomFilterIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(BloomFilterIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 6683d73..1abafeb 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 @@ -32,7 +32,7 @@ import org.apache.accumulo.core.file.FileOperations; import org.apache.accumulo.core.file.FileSKVWriter; import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; @@ -43,7 +43,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.Test; -public class BulkFileIT extends AccumuloClusterIT { +public class BulkFileIT extends AccumuloClusterHarness { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration conf) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java index 8ad3d26..f60724e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkIT.java @@ -20,7 +20,7 @@ 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.util.CachedConfiguration; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.Opts; import org.apache.accumulo.test.VerifyIngest; @@ -33,7 +33,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class BulkIT extends AccumuloClusterIT { +public class BulkIT extends AccumuloClusterHarness { private static final int N = 100000; private static final int COUNT = 5; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java index fe26870..74d3e96 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java @@ -27,7 +27,7 @@ import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.VerifyIngest; @@ -44,7 +44,7 @@ import org.junit.Test; * This test verifies that when a lot of files are bulk imported into a table with one tablet and then splits that not all map files go to the children tablets. */ -public class BulkSplitOptimizationIT extends AccumuloClusterIT { +public class BulkSplitOptimizationIT extends AccumuloClusterHarness { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java index a2d5971..4055c3a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java @@ -26,7 +26,7 @@ import org.apache.accumulo.core.client.ClientConfiguration; import org.apache.accumulo.core.client.ClientConfiguration.ClientProperty; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.master.balancer.ChaoticLoadBalancer; import org.apache.accumulo.test.TestIngest; @@ -35,7 +35,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.Test; -public class ChaoticBalancerIT extends AccumuloClusterIT { +public class ChaoticBalancerIT extends AccumuloClusterHarness { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java index 4b51bd2..c06feed 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java @@ -38,7 +38,7 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -47,7 +47,7 @@ import org.junit.Assume; import org.junit.Before; import org.junit.Test; -public class ClassLoaderIT extends AccumuloClusterIT { +public class ClassLoaderIT extends AccumuloClusterHarness { private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java index 921d661..779b407 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CleanTmpIT.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; -public class CleanTmpIT extends ConfigurableMacIT { +public class CleanTmpIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(CleanTmpIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 4982071..1f6d1a0 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 @@ -28,7 +28,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.core.util.CleanUp; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -38,9 +38,9 @@ import org.slf4j.LoggerFactory; * Ensures that all threads spawned for ZooKeeper and Thrift connectivity are reaped after calling CleanUp.shutdown(). * * Because this is destructive across the current context classloader, the normal teardown methods will fail (because they attempt to create a Connector). Until - * the ZooKeeperInstance and Connector are self-contained WRT resource management, we can't leverage the AccumuloClusterIT. + * the ZooKeeperInstance and Connector are self-contained WRT resource management, we can't leverage the AccumuloClusterBase. */ -public class CleanUpIT extends SharedMiniClusterIT { +public class CleanUpIT extends SharedMiniClusterBase { private static final Logger log = LoggerFactory.getLogger(CleanUpIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java index f7a9165..b3d0ab5 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CloneTestIT.java @@ -46,7 +46,7 @@ import org.apache.accumulo.core.data.Value; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.server.ServerConstants; import org.apache.hadoop.fs.FileStatus; @@ -60,7 +60,7 @@ import org.junit.Test; /** * */ -public class CloneTestIT extends AccumuloClusterIT { +public class CloneTestIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java index 5538797..d4ef18e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CombinerIT.java @@ -35,10 +35,10 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.LongCombiner.Type; import org.apache.accumulo.core.iterators.user.SummingCombiner; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.junit.Test; -public class CombinerIT extends AccumuloClusterIT { +public class CombinerIT extends AccumuloClusterHarness { @Override protected int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java index 2fe5470..862365f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CompactionIT.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.conf.Property; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.VerifyIngest; @@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class CompactionIT extends AccumuloClusterIT { +public class CompactionIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(CompactionIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java index 859eafd..75eecfd 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ConcurrencyIT.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.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; @@ -45,7 +45,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class ConcurrencyIT extends AccumuloClusterIT { +public class ConcurrencyIT extends AccumuloClusterHarness { static class ScanTask extends Thread { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java index a33322c..66695e0 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableCompactionIT.java @@ -46,7 +46,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class ConfigurableCompactionIT extends ConfigurableMacIT { +public class ConfigurableCompactionIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java new file mode 100644 index 0000000..b86fcfe --- /dev/null +++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java @@ -0,0 +1,182 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.test.functional; + +import static org.junit.Assert.assertTrue; + +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Map; + +import org.apache.accumulo.core.client.AccumuloException; +import org.apache.accumulo.core.client.AccumuloSecurityException; +import org.apache.accumulo.core.client.ClientConfiguration; +import org.apache.accumulo.core.client.Connector; +import org.apache.accumulo.core.client.Instance; +import org.apache.accumulo.core.client.ZooKeeperInstance; +import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.util.MonitorUtil; +import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.harness.AccumuloITBase; +import org.apache.accumulo.minicluster.MiniAccumuloCluster; +import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; +import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; +import org.apache.accumulo.minicluster.impl.ZooKeeperBindException; +import org.apache.accumulo.test.util.CertUtils; +import org.apache.commons.io.FileUtils; +import org.apache.hadoop.conf.Configuration; +import org.apache.zookeeper.KeeperException; +import org.junit.After; +import org.junit.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * General Integration-Test base class that provides access to a {@link MiniAccumuloCluster} for testing. Tests using these typically do very disruptive things + * to the instance, and require specific configuration. Most tests don't need this level of control and should extend {@link AccumuloClusterHarness} instead. + */ +public class ConfigurableMacBase extends AccumuloITBase { + public static final Logger log = LoggerFactory.getLogger(ConfigurableMacBase.class); + + protected MiniAccumuloClusterImpl cluster; + + protected void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {} + + protected void beforeClusterStart(MiniAccumuloConfigImpl cfg) throws Exception {} + + protected static final String ROOT_PASSWORD = "testRootPassword1"; + + public static void configureForEnvironment(MiniAccumuloConfigImpl cfg, Class<?> testClass, File folder) { + if ("true".equals(System.getProperty("org.apache.accumulo.test.functional.useSslForIT"))) { + configureForSsl(cfg, folder); + } + if ("true".equals(System.getProperty("org.apache.accumulo.test.functional.useCredProviderForIT"))) { + cfg.setUseCredentialProvider(true); + } + } + + protected static void configureForSsl(MiniAccumuloConfigImpl cfg, File sslDir) { + Map<String,String> siteConfig = cfg.getSiteConfig(); + if ("true".equals(siteConfig.get(Property.INSTANCE_RPC_SSL_ENABLED.getKey()))) { + // already enabled; don't mess with it + return; + } + + // create parent directories, and ensure sslDir is empty + assertTrue(sslDir.mkdirs() || sslDir.isDirectory()); + FileUtils.deleteQuietly(sslDir); + assertTrue(sslDir.mkdir()); + + File rootKeystoreFile = new File(sslDir, "root-" + cfg.getInstanceName() + ".jks"); + File localKeystoreFile = new File(sslDir, "local-" + cfg.getInstanceName() + ".jks"); + File publicTruststoreFile = new File(sslDir, "public-" + cfg.getInstanceName() + ".jks"); + final String rootKeystorePassword = "root_keystore_password", truststorePassword = "truststore_password"; + try { + new CertUtils(Property.RPC_SSL_KEYSTORE_TYPE.getDefaultValue(), "o=Apache Accumulo,cn=MiniAccumuloCluster", "RSA", 2048, "sha1WithRSAEncryption") + .createAll(rootKeystoreFile, localKeystoreFile, publicTruststoreFile, cfg.getInstanceName(), rootKeystorePassword, cfg.getRootPassword(), + truststorePassword); + } catch (Exception e) { + throw new RuntimeException("error creating MAC keystore", e); + } + + siteConfig.put(Property.INSTANCE_RPC_SSL_ENABLED.getKey(), "true"); + siteConfig.put(Property.RPC_SSL_KEYSTORE_PATH.getKey(), localKeystoreFile.getAbsolutePath()); + siteConfig.put(Property.RPC_SSL_KEYSTORE_PASSWORD.getKey(), cfg.getRootPassword()); + siteConfig.put(Property.RPC_SSL_TRUSTSTORE_PATH.getKey(), publicTruststoreFile.getAbsolutePath()); + siteConfig.put(Property.RPC_SSL_TRUSTSTORE_PASSWORD.getKey(), truststorePassword); + cfg.setSiteConfig(siteConfig); + } + + @Before + public void setUp() throws Exception { + createMiniAccumulo(); + Exception lastException = null; + for (int i = 0; i < 3; i++) { + try { + cluster.start(); + return; + } catch (ZooKeeperBindException e) { + lastException = e; + log.warn("Failed to start MiniAccumuloCluster, assumably due to ZooKeeper issues", lastException); + Thread.sleep(3000); + createMiniAccumulo(); + } + } + throw new RuntimeException("Failed to start MiniAccumuloCluster after three attempts", lastException); + } + + private void createMiniAccumulo() throws Exception { + // createTestDir will give us a empty directory, we don't need to clean it up ourselves + File baseDir = createTestDir(this.getClass().getName() + "_" + this.testName.getMethodName()); + MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(baseDir, ROOT_PASSWORD); + String nativePathInDevTree = NativeMapIT.nativeMapLocation().getAbsolutePath(); + String nativePathInMapReduce = new File(System.getProperty("user.dir")).toString(); + cfg.setNativeLibPaths(nativePathInDevTree, nativePathInMapReduce); + cfg.setProperty(Property.GC_FILE_ARCHIVE, Boolean.TRUE.toString()); + Configuration coreSite = new Configuration(false); + configure(cfg, coreSite); + cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.TRUE.toString()); + configureForEnvironment(cfg, getClass(), getSslDir(baseDir)); + cluster = new MiniAccumuloClusterImpl(cfg); + if (coreSite.size() > 0) { + File csFile = new File(cluster.getConfig().getConfDir(), "core-site.xml"); + if (csFile.exists()) + throw new RuntimeException(csFile + " already exist"); + + OutputStream out = new BufferedOutputStream(new FileOutputStream(new File(cluster.getConfig().getConfDir(), "core-site.xml"))); + coreSite.writeXml(out); + out.close(); + } + beforeClusterStart(cfg); + } + + @After + public void tearDown() throws Exception { + if (cluster != null) + try { + cluster.stop(); + } catch (Exception e) { + // ignored + } + } + + protected MiniAccumuloClusterImpl getCluster() { + return cluster; + } + + protected Connector getConnector() throws AccumuloException, AccumuloSecurityException { + return getCluster().getConnector("root", new PasswordToken(ROOT_PASSWORD)); + } + + protected Process exec(Class<?> clazz, String... args) throws IOException { + return getCluster().exec(clazz, args); + } + + protected String getMonitor() throws KeeperException, InterruptedException { + Instance instance = new ZooKeeperInstance(getCluster().getClientConfig()); + return MonitorUtil.getLocation(instance); + } + + protected ClientConfiguration getClientConfig() throws Exception { + return new ClientConfiguration(getCluster().getConfig().getClientConfFile()); + } + +}
