Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BDF8181A0 for ; Thu, 4 Jun 2015 17:18:37 +0000 (UTC) Received: (qmail 56916 invoked by uid 500); 4 Jun 2015 17:18:37 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 56813 invoked by uid 500); 4 Jun 2015 17:18:37 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 56719 invoked by uid 99); 4 Jun 2015 17:18:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 17:18:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD799E10A8; Thu, 4 Jun 2015 17:18:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Thu, 04 Jun 2015 17:18:37 -0000 Message-Id: <130a36938f064c49b26154161fe63c89@git.apache.org> In-Reply-To: <25383ae7ee4f46b29618c46c870bdf91@git.apache.org> References: <25383ae7ee4f46b29618c46c870bdf91@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] accumulo git commit: ACCUMULO-3871 rename base class for ITs so they do not end with "IT" http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java deleted file mode 100644 index a738d1f..0000000 --- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * 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.AccumuloClusterIT; -import org.apache.accumulo.harness.AccumuloIT; -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 AccumuloClusterIT} instead. - */ -public class ConfigurableMacIT extends AccumuloIT { - public static final Logger log = LoggerFactory.getLogger(ConfigurableMacIT.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 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()); - } - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java index c694143..4ef4a61 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ConstraintIT.java @@ -39,13 +39,13 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.examples.simple.constraints.AlphaNumKeyConstraint; 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.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ConstraintIT extends AccumuloClusterIT { +public class ConstraintIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ConstraintIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java index 6ad3d4d..b2373e6 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateAndUseIT.java @@ -33,7 +33,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.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Assert; import org.junit.BeforeClass; @@ -41,7 +41,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class CreateAndUseIT extends AccumuloClusterIT { +public class CreateAndUseIT 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/CreateManyScannersIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java index ffa527f..79151ee 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java @@ -18,10 +18,10 @@ package org.apache.accumulo.test.functional; import org.apache.accumulo.core.client.Connector; 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 CreateManyScannersIT extends AccumuloClusterIT { +public class CreateManyScannersIT 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/CredentialsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/CredentialsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/CredentialsIT.java index ba2bae3..b383d0a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/CredentialsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/CredentialsIT.java @@ -39,13 +39,13 @@ import org.apache.accumulo.core.data.Key; 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.hadoop.security.UserGroupInformation; import org.junit.After; import org.junit.Before; import org.junit.Test; -public class CredentialsIT extends AccumuloClusterIT { +public class CredentialsIT extends AccumuloClusterHarness { private boolean saslEnabled; private String username; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java index d51de6e..2650c89 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteEverythingIT.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.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 com.google.common.collect.Iterables; import com.google.common.collect.Iterators; -public class DeleteEverythingIT extends AccumuloClusterIT { +public class DeleteEverythingIT 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/DeleteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java index 7a8380b..79c4e60 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteIT.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.client.Connector; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestRandomDeletes; import org.apache.accumulo.test.VerifyIngest; @@ -37,7 +37,7 @@ import org.junit.Test; import com.google.common.base.Charsets; -public class DeleteIT extends AccumuloClusterIT { +public class DeleteIT 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/DeleteRowsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java index 6e67f9b..e4a8451 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsIT.java @@ -34,7 +34,7 @@ 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.apache.hadoop.io.Text; import org.junit.Test; import org.slf4j.Logger; @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class DeleteRowsIT extends AccumuloClusterIT { +public class DeleteRowsIT 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/DeleteRowsSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java index 1330779..dcc3124 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java @@ -35,14 +35,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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; // attempt to reproduce ACCUMULO-315 -public class DeleteRowsSplitIT extends AccumuloClusterIT { +public class DeleteRowsSplitIT 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/DeleteTableDuringSplitIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java index e645c03..7c94163 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java @@ -28,13 +28,13 @@ import java.util.concurrent.Future; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.util.SimpleThreadPool; import org.apache.accumulo.fate.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Assert; import org.junit.Test; // ACCUMULO-2361 -public class DeleteTableDuringSplitIT extends AccumuloClusterIT { +public class DeleteTableDuringSplitIT 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/DeletedTablesDontFlushIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java index ee08017..ca8003a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java @@ -26,11 +26,11 @@ 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.fate.util.UtilWaitThread; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.junit.Test; // ACCUMULO-2880 -public class DeletedTablesDontFlushIT extends SharedMiniClusterIT { +public class DeletedTablesDontFlushIT 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/functional/DurabilityIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java index 9a262a1..49e004f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DurabilityIT.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class DurabilityIT extends ConfigurableMacIT { +public class DurabilityIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(DurabilityIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java index 2425d20..2251d4b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/DynamicThreadPoolsIT.java @@ -35,7 +35,7 @@ import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.trace.Tracer; 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.accumulo.test.TestIngest; import org.apache.hadoop.conf.Configuration; @@ -43,7 +43,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class DynamicThreadPoolsIT extends AccumuloClusterIT { +public class DynamicThreadPoolsIT 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/ExamplesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java index 257c7c1..9d0ce86 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java @@ -80,7 +80,7 @@ import org.apache.accumulo.examples.simple.shard.ContinuousQuery; import org.apache.accumulo.examples.simple.shard.Index; import org.apache.accumulo.examples.simple.shard.Query; import org.apache.accumulo.examples.simple.shard.Reverse; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl.LogWriter; @@ -103,7 +103,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -public class ExamplesIT extends AccumuloClusterIT { +public class ExamplesIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ExamplesIT.class); private static final BatchWriterOpts bwOpts = new BatchWriterOpts(); private static final BatchWriterConfig bwc = new BatchWriterConfig(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java index ebbef7c..b75a74e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/FateStarvationIT.java @@ -24,7 +24,7 @@ import org.apache.accumulo.core.cli.BatchWriterOpts; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -32,7 +32,7 @@ import org.junit.Test; /** * See ACCUMULO-779 */ -public class FateStarvationIT extends AccumuloClusterIT { +public class FateStarvationIT 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/GarbageCollectorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java index 132cbcc..a73f239 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java @@ -70,7 +70,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class GarbageCollectorIT extends ConfigurableMacIT { +public class GarbageCollectorIT extends ConfigurableMacBase { private static final String OUR_SECRET = "itsreallysecret"; @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java index a29defd..59d8259 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/HalfDeadTServerIT.java @@ -43,7 +43,7 @@ import org.apache.accumulo.tserver.TabletServer; import org.apache.hadoop.conf.Configuration; import org.junit.Test; -public class HalfDeadTServerIT extends ConfigurableMacIT { +public class HalfDeadTServerIT 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/KerberosIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java index 596676a..aa8313e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -61,7 +61,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloIT; +import org.apache.accumulo.harness.AccumuloITBase; import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; @@ -86,7 +86,7 @@ import com.google.common.collect.Sets; /** * MAC test which uses {@link MiniKdc} to simulate ta secure environment. Can be used as a sanity check for Kerberos/SASL testing. */ -public class KerberosIT extends AccumuloIT { +public class KerberosIT extends AccumuloITBase { private static final Logger log = LoggerFactory.getLogger(KerberosIT.class); private static TestingKdc kdc; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java index dbfe730..31d1329 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java @@ -37,7 +37,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.rpc.UGIAssumingTransport; -import org.apache.accumulo.harness.AccumuloIT; +import org.apache.accumulo.harness.AccumuloITBase; import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; @@ -78,7 +78,7 @@ import org.slf4j.LoggerFactory; /** * Tests impersonation of clients by the proxy over SASL */ -public class KerberosProxyIT extends AccumuloIT { +public class KerberosProxyIT extends AccumuloITBase { private static final Logger log = LoggerFactory.getLogger(KerberosProxyIT.class); @Rule http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 027f1e6..72b51eb 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 @@ -34,7 +34,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.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; @@ -48,7 +48,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LargeRowIT extends AccumuloClusterIT { +public class LargeRowIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(LargeRowIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 7b8cb2b..9c310f0 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 @@ -28,7 +28,7 @@ import org.junit.Test; /** * Fake the "tablet stops talking but holds its lock" problem we see when hard drives and NFS fail. Start a ZombieTServer, and see that master stops it. */ -public class LateLastContactIT extends ConfigurableMacIT { +public class LateLastContactIT 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/LogicalTimeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java index a20291b..1e7fef0 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/LogicalTimeIT.java @@ -27,13 +27,13 @@ import org.apache.accumulo.core.client.admin.TimeType; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LogicalTimeIT extends AccumuloClusterIT { +public class LogicalTimeIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(LogicalTimeIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 3b34206..8c4666c 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 @@ -43,7 +43,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.hadoop.io.Text; import org.junit.Test; -public class MapReduceIT extends ConfigurableMacIT { +public class MapReduceIT 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/MasterAssignmentIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java index a7cdae5..72f8ce7 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterAssignmentIT.java @@ -31,14 +31,14 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.impl.KeyExtent; import org.apache.accumulo.fate.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.server.master.state.MetaDataTableScanner; import org.apache.accumulo.server.master.state.TabletLocationState; import org.apache.commons.configuration.ConfigurationException; import org.apache.hadoop.io.Text; import org.junit.Test; -public class MasterAssignmentIT extends AccumuloClusterIT { +public class MasterAssignmentIT 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/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 dd83574..3489c26 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 @@ -25,7 +25,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.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; @@ -33,7 +33,7 @@ import org.apache.accumulo.test.VerifyIngest; import org.apache.hadoop.conf.Configuration; import org.junit.Test; -public class MasterFailoverIT extends AccumuloClusterIT { +public class MasterFailoverIT 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/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 2b05947..6f08c1f 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 @@ -32,7 +32,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.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; @@ -45,7 +45,7 @@ import org.junit.Test; * A functional test that exercises hitting the max open file limit on a tablet server. This test assumes there are one or two tablet servers. */ -public class MaxOpenIT extends AccumuloClusterIT { +public class MaxOpenIT 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/MergeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java index 998feaf..9e3e8b6 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java @@ -36,11 +36,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.Merge; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Test; -public class MergeIT extends AccumuloClusterIT { +public class MergeIT 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/functional/MetadataIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java index 09e6ecc..9455456 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataIT.java @@ -37,7 +37,7 @@ 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.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; @@ -46,7 +46,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class MetadataIT extends AccumuloClusterIT { +public class MetadataIT 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/MetadataMaxFilesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java index e6c9a0e..086dd1a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java @@ -45,7 +45,7 @@ import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.io.Text; import org.junit.Test; -public class MetadataMaxFilesIT extends ConfigurableMacIT { +public class MetadataMaxFilesIT 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/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 3930cda..ab2c791 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 @@ -29,7 +29,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.junit.Test; -public class MetadataSplitIT extends ConfigurableMacIT { +public class MetadataSplitIT 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/MonitorLoggingIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java index bf892db..c59c52e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MonitorLoggingIT.java @@ -35,7 +35,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class MonitorLoggingIT extends ConfigurableMacIT { +public class MonitorLoggingIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(MonitorLoggingIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/MonitorSslIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MonitorSslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MonitorSslIT.java index 197de7e..7283c4d 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/MonitorSslIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/MonitorSslIT.java @@ -47,7 +47,7 @@ import org.junit.Test; * Check SSL for the Monitor * */ -public class MonitorSslIT extends ConfigurableMacIT { +public class MonitorSslIT extends ConfigurableMacBase { @BeforeClass public static void initHttps() throws NoSuchAlgorithmException, KeyManagementException { SSLContext ctx = SSLContext.getInstance("SSL"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java index 4aea354..8700891 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -52,7 +52,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.Assume; import org.junit.Before; @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; // This test verifies the default permissions so a clean instance must be used. A shared instance might // not be representative of a fresh installation. -public class PermissionsIT extends AccumuloClusterIT { +public class PermissionsIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(PermissionsIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index 75fd4e1..4ef2958 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -71,7 +71,7 @@ import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.fate.zookeeper.ZooLock; import org.apache.accumulo.fate.zookeeper.ZooReader; -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.TestIngest; @@ -87,7 +87,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; import com.google.common.collect.Iterators; -public class ReadWriteIT extends AccumuloClusterIT { +public class ReadWriteIT extends AccumuloClusterHarness { @Override public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) { cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s"); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java index 9fd52bb..0408aa0 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RecoveryWithEmptyRFileIT.java @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * This test should read the file location from the test harness and that file should be on the local filesystem. If you want to take a paranoid approach just * make sure the test user doesn't have write access to the HDFS files of any colocated live Accumulo instance or any important local filesystem files.. */ -public class RecoveryWithEmptyRFileIT extends ConfigurableMacIT { +public class RecoveryWithEmptyRFileIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(RecoveryWithEmptyRFileIT.class); static final int ROWS = 200000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java index e32d9b1..a8c5bca 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RegexGroupBalanceIT.java @@ -43,7 +43,7 @@ import org.junit.Test; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -public class RegexGroupBalanceIT extends ConfigurableMacIT { +public class RegexGroupBalanceIT extends ConfigurableMacBase { @Override public void beforeClusterStart(MiniAccumuloConfigImpl cfg) throws Exception { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java index 6befd7e..0c22196 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/RenameIT.java @@ -21,12 +21,12 @@ import org.apache.accumulo.core.cli.ScannerOpts; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; -public class RenameIT extends AccumuloClusterIT { +public class RenameIT 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/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 2ba6d31..39e9bed 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 @@ -44,7 +44,7 @@ import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; import org.apache.accumulo.fate.zookeeper.ZooLock; import org.apache.accumulo.fate.zookeeper.ZooReader; -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.TestIngest; @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; -public class RestartIT extends AccumuloClusterIT { +public class RestartIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(RestartIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 3f7d67d..abfd5d8 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 @@ -34,7 +34,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.TestIngest; @@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; -public class RestartStressIT extends AccumuloClusterIT { +public class RestartStressIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(RestartStressIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 06039af..75c66bd 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 @@ -35,7 +35,7 @@ import org.apache.accumulo.core.conf.Property; 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.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 com.google.common.collect.Iterators; -public class RowDeleteIT extends AccumuloClusterIT { +public class RowDeleteIT 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/ScanIdIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanIdIT.java index 720f87c..863ac78 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ScanIdIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanIdIT.java @@ -53,7 +53,7 @@ import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; 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 org.slf4j.Logger; @@ -73,7 +73,7 @@ import org.slf4j.LoggerFactory; *

* back into org.apache.accumulo.trace.thrift.TInfo until that test signature is regenerated. */ -public class ScanIdIT extends AccumuloClusterIT { +public class ScanIdIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ScanIdIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java index 8c10199..3453303 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanIteratorIT.java @@ -35,11 +35,11 @@ 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.apache.hadoop.io.Text; import org.junit.Test; -public class ScanIteratorIT extends AccumuloClusterIT { +public class ScanIteratorIT 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/ScanRangeIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java index 3ce1eb1..bd7555e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ScanRangeIT.java @@ -30,11 +30,11 @@ 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.apache.hadoop.io.Text; import org.junit.Test; -public class ScanRangeIT extends AccumuloClusterIT { +public class ScanRangeIT 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/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 daf781f..0636056 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 @@ -34,7 +34,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.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; @@ -44,7 +44,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ScanSessionTimeOutIT extends AccumuloClusterIT { +public class ScanSessionTimeOutIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(ScanSessionTimeOutIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java index 9e90468..340a58e 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ScannerIT.java @@ -31,7 +31,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.fate.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.junit.Assert; import org.junit.Test; @@ -40,7 +40,7 @@ import com.google.common.base.Stopwatch; /** * */ -public class ScannerIT extends AccumuloClusterIT { +public class ScannerIT 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/ServerSideErrorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java index d99d33a..02b65f4 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java @@ -33,11 +33,11 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.Combiner; 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 ServerSideErrorIT extends AccumuloClusterIT { +public class ServerSideErrorIT 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/SessionDurabilityIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java index aec6bae..36bdd7a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java @@ -40,7 +40,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class SessionDurabilityIT extends ConfigurableMacIT { +public class SessionDurabilityIT 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/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 c3042d7..f27ee02 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 @@ -32,7 +32,7 @@ import org.apache.accumulo.test.TestRandomDeletes; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; -public class ShutdownIT extends ConfigurableMacIT { +public class ShutdownIT 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/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 1ad363b..3fcbcfb 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 @@ -44,7 +44,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.Test; -public class SimpleBalancerFairnessIT extends ConfigurableMacIT { +public class SimpleBalancerFairnessIT 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/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 deleted file mode 100644 index 88f24b1..0000000 --- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleMacIT.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * 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 org.apache.accumulo.harness.SharedMiniClusterIT; - -/** - * @deprecated since 1.6.2; use {@link SharedMiniClusterIT} instead - */ -@Deprecated -public class SimpleMacIT extends SharedMiniClusterIT {} http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java index 25c45f9..8cece0b 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java @@ -28,14 +28,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.apache.hadoop.io.Text; import org.junit.Test; /** * This test recreates issue ACCUMULO-516. Until that issue is fixed this test should time out. */ -public class SparseColumnFamilyIT extends AccumuloClusterIT { +public class SparseColumnFamilyIT 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/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 8e7e2b5..49cd2aa 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 @@ -40,7 +40,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.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.server.util.CheckForMetadataProblems; @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; -public class SplitIT extends AccumuloClusterIT { +public class SplitIT extends AccumuloClusterHarness { private static final Logger log = LoggerFactory.getLogger(SplitIT.class); @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java index 2933407..4d13e2a 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SplitRecoveryIT.java @@ -69,7 +69,7 @@ import org.junit.Test; import com.google.common.collect.Multimap; -public class SplitRecoveryIT extends ConfigurableMacIT { +public class SplitRecoveryIT 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/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 2d157b8..13248d0 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 @@ -29,7 +29,7 @@ import org.junit.Test; * clusters with `mvn verify -DuseSslForIT` * */ -public class SslIT extends ConfigurableMacIT { +public class SslIT extends ConfigurableMacBase { @Override public int defaultTimeoutSeconds() { return 6 * 60; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java index 06faaa7..57a8a6f 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java @@ -20,11 +20,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.start.TestMain; import org.junit.Test; -public class StartIT extends AccumuloClusterIT { +public class StartIT 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/TableIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java index 09a0da3..a4678a7 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java @@ -34,7 +34,7 @@ import org.apache.accumulo.core.data.impl.KeyExtent; 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.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; @@ -47,7 +47,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class TableIT extends AccumuloClusterIT { +public class TableIT 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/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 8aa6cf2..d2b1416 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 @@ -32,14 +32,14 @@ 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.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.Test; -public class TabletIT extends AccumuloClusterIT { +public class TabletIT extends AccumuloClusterHarness { private static final int N = 1000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java index 2e49708..0efb1aa 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java @@ -45,7 +45,7 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; -import org.apache.accumulo.harness.SharedMiniClusterIT; +import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.master.state.CurrentState; import org.apache.accumulo.server.master.state.MergeInfo; import org.apache.accumulo.server.master.state.MetaDataTableScanner; @@ -62,7 +62,7 @@ import com.google.common.collect.Sets; * Test to ensure that the {@link TabletStateChangeIterator} properly skips over tablet information in the metadata table when there is no work to be done on * the tablet (see ACCUMULO-3580) */ -public class TabletStateChangeIteratorIT extends SharedMiniClusterIT { +public class TabletStateChangeIteratorIT 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/functional/TimeoutIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java index 092ae8b..ffadd22 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/TimeoutIT.java @@ -35,13 +35,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.junit.Test; /** * */ -public class TimeoutIT extends AccumuloClusterIT { +public class TimeoutIT 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/VisibilityIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java index 2c4783a..3d6ad85 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/VisibilityIT.java @@ -43,7 +43,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.util.ByteArraySet; -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; @@ -51,7 +51,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class VisibilityIT extends AccumuloClusterIT { +public class VisibilityIT 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/WALSunnyDayIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java index 166d149..34d1c6d 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java @@ -65,7 +65,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -public class WALSunnyDayIT extends ConfigurableMacIT { +public class WALSunnyDayIT extends ConfigurableMacBase { private static final Text CF = new Text(new byte[0]); http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java index fff5b16..07d197d 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java @@ -31,7 +31,7 @@ import com.google.common.collect.Range; import com.google.common.net.HostAndPort; // ACCUMULO-2757 - make sure we don't make too many more watchers -public class WatchTheWatchCountIT extends ConfigurableMacIT { +public class WatchTheWatchCountIT extends ConfigurableMacBase { private static final Logger log = LoggerFactory.getLogger(WatchTheWatchCountIT.class); public int defaultOverrideSeconds() { http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab5a867f/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 44473b0..d877969 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 @@ -22,7 +22,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.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; @@ -31,7 +31,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.Test; -public class WriteAheadLogIT extends AccumuloClusterIT { +public class WriteAheadLogIT 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/WriteLotsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java index d8dba87..45b671c 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/WriteLotsIT.java @@ -25,12 +25,12 @@ import org.apache.accumulo.core.cli.ScannerOpts; 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.harness.AccumuloClusterIT; +import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.junit.Test; -public class WriteLotsIT extends AccumuloClusterIT { +public class WriteLotsIT 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/ZooCacheIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java index 1f424c4..a531ee0 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ZooCacheIT.java @@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils; import org.junit.BeforeClass; import org.junit.Test; -public class ZooCacheIT extends ConfigurableMacIT { +public class ZooCacheIT 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/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 f852901..19f90fe 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 @@ -40,7 +40,7 @@ import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.hadoop.conf.Configuration; import org.junit.Test; -public class ZookeeperRestartIT extends ConfigurableMacIT { +public class ZookeeperRestartIT 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/performance/RollWALPerformanceIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java b/test/src/test/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java index 5418e1c..a0d355e 100644 --- a/test/src/test/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java +++ b/test/src/test/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java @@ -30,12 +30,12 @@ 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.continuous.ContinuousIngest; -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; -public class RollWALPerformanceIT extends ConfigurableMacIT { +public class RollWALPerformanceIT 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/performance/metadata/FastBulkImportIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java b/test/src/test/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java index 5f670cc..236522a 100644 --- a/test/src/test/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java +++ b/test/src/test/java/org/apache/accumulo/test/performance/metadata/FastBulkImportIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.file.FileSKVWriter; import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.util.CachedConfiguration; 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.Path; @@ -39,7 +39,7 @@ import org.apache.hadoop.io.Text; import org.junit.Test; // ACCUMULO-3327 -public class FastBulkImportIT extends ConfigurableMacIT { +public class FastBulkImportIT extends ConfigurableMacBase { @Override protected int defaultTimeoutSeconds() {