This is an automated email from the ASF dual-hosted git repository.
krathbun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 217e59f3b8 shared mini suite (another) follow on (#5581)
217e59f3b8 is described below
commit 217e59f3b89a49914340631079bdf1035a25d0f3
Author: Kevin Rathbun <[email protected]>
AuthorDate: Wed May 28 11:25:52 2025 -0400
shared mini suite (another) follow on (#5581)
* shared mini suite (another) follow on
- Removed the SIMPLE_MINI_CLUSTER_SUITE tag. Replaced with having each IT
which was using it instead end with "IT_SimpleSuite". This avoids individual
ITs from being picked up in the build (since they don't end in "IT").
- SimpleSharedMacTestSuite -> SimpleSharedMacTestSuiteIT so suite is picked
up and run in build.
- Reverted all root pom changes back to what they were before
41792a48ee1e84784aefa3ea0520a17765c77ff0, except for the one new ignored unused
declared dependency (org.junit.platform:junit-platform-suite-engine:jar:*),
which is still needed.
Result:
- Can run individual ITs via it.test=... (even if they are part of the
suite)
- Can run the whole suite via
it.test=org.apache.accumulo.suites.SimpleSharedMacTestSuiteIT
- By default, build will run all ITs including the suite, while avoiding
running those that are part of the suite twice (i.e., does not run from suite
then individually--just runs from suite)
- Avoids any custom build changes for this suite
---
pom.xml | 17 -----------------
.../org/apache/accumulo/harness/AccumuloITBase.java | 1 -
.../accumulo/harness/SharedMiniClusterBase.java | 8 ++++----
...stSuite.java => SimpleSharedMacTestSuiteIT.java} | 21 +++++++++++----------
...inCheckIT.java => AdminCheckIT_SimpleSuite.java} | 5 +----
.../test/{CloneIT.java => CloneIT_SimpleSuite.java} | 5 +----
.../apache/accumulo/test/ComprehensiveBaseIT.java | 2 +-
...siveIT.java => ComprehensiveIT_SimpleSuite.java} | 4 +---
...eTableIT.java => CreateTableIT_SimpleSuite.java} | 7 ++-----
.../test/{GCRunIT.java => GCRunIT_SimpleSuite.java} | 6 ++----
.../org/apache/accumulo/test/LargeSplitRowIT.java | 6 +++---
...ava => MultiTableBatchWriterIT_SimpleSuite.java} | 5 +----
...espacesIT.java => NamespacesIT_SimpleSuite.java} | 4 +---
...ava => NewTableConfigurationIT_SimpleSuite.java} | 5 +----
...teratorIT.java => OrIteratorIT_SimpleSuite.java} | 5 +----
...rintInfoIT.java => PrintInfoIT_SimpleSuite.java} | 8 +++-----
.../{SampleIT.java => SampleIT_SimpleSuite.java} | 5 +----
...anServerMetadataEntriesCleanIT_SimpleSuite.java} | 4 +---
....java => ZooKeeperPropertiesIT_SimpleSuite.java} | 5 +----
...estAmpleIT.java => TestAmpleIT_SimpleSuite.java} | 5 +----
...eIT.java => TabletFileUpdateIT_SimpleSuite.java} | 5 +----
...igIT.java => PropStoreConfigIT_SimpleSuite.java} | 6 ++----
...itorIT.java => ZooPropEditorIT_SimpleSuite.java} | 6 ++----
.../accumulo/test/fate/FateExecutionOrderIT.java | 3 ---
...erRepoIT.java => ManagerRepoIT_SimpleSuite.java} | 5 +----
...va => MetaFateExecutionOrderIT_SimpleSuite.java} | 2 +-
...plIT.java => FateMutatorImplIT_SimpleSuite.java} | 7 ++-----
...va => UserFateExecutionOrderIT_SimpleSuite.java} | 2 +-
...{UserFateIT.java => UserFateIT_SimpleSuite.java} | 5 +----
...java => UserFatePoolsWatcherIT_SimpleSuite.java} | 5 +----
...=> UserFateStatusEnforcementIT_SimpleSuite.java} | 5 +----
...IT.java => UserFateStoreFateIT_SimpleSuite.java} | 5 +----
...T.java => UserMultipleStoresIT_SimpleSuite.java} | 5 +----
...{AddSplitIT.java => AddSplitIT_SimpleSuite.java} | 5 +----
...loneTestIT.java => CloneTestIT_SimpleSuite.java} | 5 +----
...va => DeletedTablesDontFlushIT_SimpleSuite.java} | 5 +----
...IT.java => FileNormalizationIT_SimpleSuite.java} | 7 ++-----
...va => FindCompactionTmpFilesIT_SimpleSuite.java} | 5 +----
...bletsIT.java => MergeTabletsIT_SimpleSuite.java} | 5 +----
...onfigSetIT.java => ConfigSetIT_SimpleSuite.java} | 6 ++----
...T.java => ShellAuthenticatorIT_SimpleSuite.java} | 9 +++------
.../{ShellIT.java => ShellIT_SimpleSuite.java} | 6 ++----
42 files changed, 66 insertions(+), 176 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb35b6b88e..b07534b8aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1153,29 +1153,12 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
- <execution>
- <id>run-integration-test-suite</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <test>org.apache.accumulo.suites.SimpleSharedMacTestSuite</test>
- </configuration>
- </execution>
<execution>
<id>run-integration-tests</id>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
- <configuration>
- <!--
- exclude tests that were run as part of the test suite and
- the test suite itself
- -->
- <excludedGroups>SimpleMiniClusterSuite</excludedGroups>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
index 41c49a9cbe..c218f41c20 100644
--- a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
+++ b/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java
@@ -50,7 +50,6 @@ public class AccumuloITBase extends WithTestNames {
public static final String SUNNY_DAY = "SunnyDay";
public static final String MINI_CLUSTER_ONLY = "MiniClusterOnly";
public static final String ZOOKEEPER_TESTING_SERVER =
"ZooKeeperTestingServer";
- public static final String SIMPLE_MINI_CLUSTER_SUITE =
"SimpleMiniClusterSuite";
protected <T> T getOnlyElement(Collection<T> c) {
return c.stream().collect(onlyElement());
diff --git
a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
index 11806b299e..6cb12121ee 100644
--- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
+++ b/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java
@@ -49,7 +49,7 @@ import org.apache.accumulo.core.clientImpl.ClientInfo;
import org.apache.accumulo.core.clientImpl.Namespace;
import org.apache.accumulo.core.conf.ClientProperty;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
-import org.apache.accumulo.suites.SimpleSharedMacTestSuite;
+import org.apache.accumulo.suites.SimpleSharedMacTestSuiteIT;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.security.UserGroupInformation;
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
* method annotated with the {@link org.junit.jupiter.api.AfterAll} JUnit
annotation.
* <p>
* Implementations of this class should also consider if they can be added to
- * {@link SimpleSharedMacTestSuite}. See the suites description to determine
if they can be added.
+ * {@link SimpleSharedMacTestSuiteIT}. See the suites description to determine
if they can be added.
*/
@Tag(MINI_CLUSTER_ONLY)
public abstract class SharedMiniClusterBase extends AccumuloITBase implements
ClusterUsers {
@@ -89,7 +89,7 @@ public abstract class SharedMiniClusterBase extends
AccumuloITBase implements Cl
/**
* Starts a MiniAccumuloCluster instance with the default configuration.
This method is
- * idempotent: necessitated by {@link SimpleSharedMacTestSuite}.
+ * idempotent: necessitated by {@link SimpleSharedMacTestSuiteIT}.
*/
public static void startMiniCluster() throws Exception {
startMiniClusterWithConfig(MiniClusterConfigurationCallback.NO_CALLBACK);
@@ -98,7 +98,7 @@ public abstract class SharedMiniClusterBase extends
AccumuloITBase implements Cl
/**
* Starts a MiniAccumuloCluster instance with the default configuration but
also provides the
* caller the opportunity to update the configuration before the
MiniAccumuloCluster is started.
- * This method is idempotent: necessitated by {@link
SimpleSharedMacTestSuite}.
+ * This method is idempotent: necessitated by {@link
SimpleSharedMacTestSuiteIT}.
*
* @param miniClusterCallback A callback to configure the minicluster before
it is started.
*/
diff --git
a/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
b/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuiteIT.java
similarity index 78%
rename from
test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
rename to
test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuiteIT.java
index 68c47cb15f..5d92b02d9c 100644
---
a/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuite.java
+++
b/test/src/main/java/org/apache/accumulo/suites/SimpleSharedMacTestSuiteIT.java
@@ -18,15 +18,11 @@
*/
package org.apache.accumulo.suites;
-import static
org.apache.accumulo.harness.AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE;
-
import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
import org.apache.accumulo.harness.SharedMiniClusterBase;
-import org.junit.jupiter.api.Tag;
import org.junit.platform.suite.api.AfterSuite;
import org.junit.platform.suite.api.BeforeSuite;
import org.junit.platform.suite.api.IncludeClassNamePatterns;
-import org.junit.platform.suite.api.IncludeTags;
import org.junit.platform.suite.api.SelectPackages;
import org.junit.platform.suite.api.Suite;
@@ -41,14 +37,19 @@ import org.junit.platform.suite.api.Suite;
* 2) It does not start the cluster with any custom config (i.e., it does not
use
* {@link
SharedMiniClusterBase#startMiniClusterWithConfig(MiniClusterConfigurationCallback)})
* <p>
- * An IT which meets this criteria should be tagged (using JUnit {@link Tag})
with
- * {@link #SIMPLE_MINI_CLUSTER_SUITE} to be added to the suite.
+ * An IT which meets this criteria should have the class name end with
"IT_SimpleSuite" to be added
+ * to the suite.
+ *
+ * IMPORTANT NOTE: Only the concrete classes should be marked with
"IT_SimpleSuite". For example,
+ * marking an abstract class will not add its implementations to the suite.
*/
@Suite
-@SelectPackages("org.apache.accumulo.test") // look in this package and
subpackages
-@IncludeTags(SIMPLE_MINI_CLUSTER_SUITE) // for tests with this tag
-@IncludeClassNamePatterns(".*IT") // need to override the default pattern
".*Test"
-public class SimpleSharedMacTestSuite extends SharedMiniClusterBase {
+// look in this package and subpackages
+@SelectPackages("org.apache.accumulo.test")
+// need to override the default pattern ".*Test"
+// avoid ending in "IT" so they are not picked up in the build. Only want this
to run.
+@IncludeClassNamePatterns("^.+IT_SimpleSuite$")
+public class SimpleSharedMacTestSuiteIT extends SharedMiniClusterBase {
@BeforeSuite
public static void beforeAllTests() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
b/test/src/main/java/org/apache/accumulo/test/AdminCheckIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
rename to
test/src/main/java/org/apache/accumulo/test/AdminCheckIT_SimpleSuite.java
index 92b749ba80..a47210e79d 100644
--- a/test/src/main/java/org/apache/accumulo/test/AdminCheckIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/AdminCheckIT_SimpleSuite.java
@@ -40,7 +40,6 @@ import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.admin.CompactionConfig;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.cli.ServerUtilOpts;
@@ -53,14 +52,12 @@ import org.easymock.IAnswer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.beust.jcommander.JCommander;
import com.google.common.collect.Sets;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class AdminCheckIT extends SharedMiniClusterBase {
+public class AdminCheckIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
b/test/src/main/java/org/apache/accumulo/test/CloneIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/CloneIT.java
rename to test/src/main/java/org/apache/accumulo/test/CloneIT_SimpleSuite.java
index e8934b5862..c9f3ca9601 100644
--- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CloneIT_SimpleSuite.java
@@ -44,14 +44,12 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
import org.apache.accumulo.core.metadata.schema.TabletDeletedException;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -59,8 +57,7 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class CloneIT extends SharedMiniClusterBase {
+public class CloneIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
index 3513e1e90e..ad2f57a4ac 100644
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveBaseIT.java
@@ -119,7 +119,7 @@ public abstract class ComprehensiveBaseIT extends
SharedMiniClusterBase {
public static final String DOG_AND_CAT = "DOG&CAT";
static final Authorizations AUTHORIZATIONS = new Authorizations("CAT",
"DOG");
- private static final Logger log =
LoggerFactory.getLogger(ComprehensiveIT.class);
+ private static final Logger log =
LoggerFactory.getLogger(ComprehensiveIT_SimpleSuite.class);
@Test
public void testBulkImport() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT_SimpleSuite.java
similarity index 91%
rename from test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
rename to
test/src/main/java/org/apache/accumulo/test/ComprehensiveIT_SimpleSuite.java
index 9595fd9667..890bf4b0ea 100644
--- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT_SimpleSuite.java
@@ -22,15 +22,13 @@ import static
org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
@Tag(SUNNY_DAY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ComprehensiveIT extends ComprehensiveBaseIT {
+public class ComprehensiveIT_SimpleSuite extends ComprehensiveBaseIT {
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniCluster();
diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
b/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java
similarity index 93%
rename from test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
rename to
test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java
index f9ae5c529d..6ca0d72bbd 100644
--- a/test/src/main/java/org/apache/accumulo/test/CreateTableIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java
@@ -31,18 +31,15 @@ import
org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.metadata.SystemTables;
import org.apache.accumulo.core.util.Timer;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class CreateTableIT extends SharedMiniClusterBase {
- private static final Logger log =
LoggerFactory.getLogger(CreateTableIT.class);
+public class CreateTableIT_SimpleSuite extends SharedMiniClusterBase {
+ private static final Logger log =
LoggerFactory.getLogger(CreateTableIT_SimpleSuite.class);
public static final int NUM_TABLES = 500;
@Override
diff --git a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
b/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java
similarity index 97%
rename from test/src/main/java/org/apache/accumulo/test/GCRunIT.java
rename to test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java
index d3b49cc2fd..9c1588ef68 100644
--- a/test/src/main/java/org/apache/accumulo/test/GCRunIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java
@@ -45,7 +45,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.gc.GCRun;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.minicluster.ServerType;
import org.apache.hadoop.io.Text;
@@ -58,10 +57,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class GCRunIT extends SharedMiniClusterBase {
+public class GCRunIT_SimpleSuite extends SharedMiniClusterBase {
- public static final Logger log = LoggerFactory.getLogger(GCRunIT.class);
+ public static final Logger log =
LoggerFactory.getLogger(GCRunIT_SimpleSuite.class);
@Override
protected Duration defaultTimeout() {
diff --git a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
index cf7479c3f3..0200908f6e 100644
--- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java
@@ -51,7 +51,7 @@ import
org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.split.SplitUtils;
-import org.apache.accumulo.test.fate.ManagerRepoIT;
+import org.apache.accumulo.test.fate.ManagerRepoIT_SimpleSuite;
import org.apache.accumulo.test.util.Wait;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
@@ -360,8 +360,8 @@ public class LargeSplitRowIT extends SharedMiniClusterBase {
/**
* Test the unsplittable column is cleaned up if a previously marked
unsplittable tablet /* no
- * longer needs to be split. The test {@link
ManagerRepoIT#testFindSplitsDeleteUnsplittable()} is
- * similar to this test.
+ * longer needs to be split. The test
+ * {@link ManagerRepoIT_SimpleSuite#testFindSplitsDeleteUnsplittable()} is
similar to this test.
*/
@Test
@Timeout(60)
diff --git
a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java
similarity index 98%
rename from
test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
rename to
test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java
index 7411c69240..d702811be3 100644
--- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java
@@ -41,19 +41,16 @@ 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.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.Maps;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class MultiTableBatchWriterIT extends SharedMiniClusterBase {
+public class MultiTableBatchWriterIT_SimpleSuite extends SharedMiniClusterBase
{
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
rename to
test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java
index 81aca7658e..c3e3bbbdc3 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java
@@ -79,7 +79,6 @@ import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.util.tables.TableNameUtil;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.constraints.NumericValueConstraint;
import org.apache.commons.lang3.StringUtils;
@@ -96,8 +95,7 @@ import org.junit.jupiter.api.function.Executable;
* Test different namespace permissions
*/
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class NamespacesIT extends SharedMiniClusterBase {
+public class NamespacesIT_SimpleSuite extends SharedMiniClusterBase {
private AccumuloClient c;
private String namespace;
diff --git
a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java
similarity index 99%
rename from
test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
rename to
test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java
index 09d30333e6..9dc331292b 100644
--- a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java
@@ -48,16 +48,13 @@ import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class NewTableConfigurationIT extends SharedMiniClusterBase {
+public class NewTableConfigurationIT_SimpleSuite extends SharedMiniClusterBase
{
@Override
protected Duration defaultTimeout() {
diff --git a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java
similarity index 98%
rename from test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
rename to
test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java
index 0c9e27d2c3..660f6bced5 100644
--- a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java
@@ -46,16 +46,13 @@ import org.apache.accumulo.core.data.PartialKey;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.OrIterator;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class OrIteratorIT extends SharedMiniClusterBase {
+public class OrIteratorIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java
similarity index 96%
rename from test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
rename to
test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java
index b5d35c9ea3..4a3c1cbc1e 100644
--- a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java
@@ -41,18 +41,15 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.file.rfile.PrintInfo;
import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class PrintInfoIT extends SharedMiniClusterBase {
+public class PrintInfoIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
@@ -124,7 +121,8 @@ public class PrintInfoIT extends SharedMiniClusterBase {
String resource = "/org/apache/accumulo/test/ver_7.rf";
File rFile =
tempDir.toPath().resolve("org").resolve("apache").resolve("accumulo")
.resolve("test").resolve("ver_7.rf").toFile();
-
FileUtils.copyURLToFile(requireNonNull(PrintInfoIT.class.getResource(resource)),
rFile);
+
FileUtils.copyURLToFile(requireNonNull(PrintInfoIT_SimpleSuite.class.getResource(resource)),
+ rFile);
String output = execPrintInfo(rFile.getAbsolutePath(), false);
assertTrue(output.contains("Unable to read crypto params"));
assertTrue(output.contains("RFile Version : 7"));
diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
b/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/SampleIT.java
rename to test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java
index 3faeb75b79..c68f093e66 100644
--- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java
@@ -66,17 +66,14 @@ import
org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.WrappingIterator;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.util.FileMetadataUtil;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class SampleIT extends SharedMiniClusterBase {
+public class SampleIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java
similarity index 93%
rename from
test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
rename to
test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java
index 28628a7e3e..5004183aa3 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java
@@ -28,7 +28,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.util.ScanServerMetadataEntries;
@@ -40,8 +39,7 @@ import org.junit.jupiter.api.Test;
import com.google.common.net.HostAndPort;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ScanServerMetadataEntriesCleanIT extends SharedMiniClusterBase {
+public class ScanServerMetadataEntriesCleanIT_SimpleSuite extends
SharedMiniClusterBase {
@BeforeAll
public static void start() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java
similarity index 97%
rename from
test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
rename to
test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java
index 547642c6cf..fa5b033e23 100644
--- a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java
@@ -36,7 +36,6 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -44,12 +43,10 @@ import org.apache.accumulo.server.conf.store.TablePropKey;
import org.apache.accumulo.server.util.PropUtil;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ZooKeeperPropertiesIT extends SharedMiniClusterBase {
+public class ZooKeeperPropertiesIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java
similarity index 97%
rename from test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
rename to
test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java
index b6baba3b58..716e7664bc 100644
--- a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java
@@ -38,21 +38,18 @@ import
org.apache.accumulo.core.metadata.schema.Ample.ConditionalResult.Status;
import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
import org.apache.accumulo.core.metadata.schema.TabletOperationId;
import org.apache.accumulo.core.metadata.schema.TabletOperationType;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.ample.metadata.TestAmple;
import org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import com.google.common.base.Preconditions;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class TestAmpleIT extends SharedMiniClusterBase {
+public class TestAmpleIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java
similarity index 98%
rename from
test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
rename to
test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java
index 8370de1b33..85178e1a7e 100644
---
a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java
@@ -40,7 +40,6 @@ import org.apache.accumulo.core.metadata.schema.Ample;
import org.apache.accumulo.core.metadata.schema.DataFileValue;
import org.apache.accumulo.core.metadata.schema.MetadataTime;
import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.tablets.TabletTime;
import org.apache.accumulo.test.ample.metadata.TestAmple;
@@ -48,15 +47,13 @@ import org.apache.accumulo.tserver.MinorCompactionReason;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
/**
* Tests tablet usage of ample to add a new minor compacted file to tablet.
This tests edge cases,
* the normal cases are well tested by many other ITs from simply running
Accumulo.
*/
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class TabletFileUpdateIT extends SharedMiniClusterBase {
+public class TabletFileUpdateIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java
similarity index 99%
rename from
test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
rename to
test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java
index 5bb1303e1f..da2f0272b5 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -64,10 +63,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class PropStoreConfigIT extends SharedMiniClusterBase {
+public class PropStoreConfigIT_SimpleSuite extends SharedMiniClusterBase {
- private static final Logger log =
LoggerFactory.getLogger(PropStoreConfigIT.class);
+ private static final Logger log =
LoggerFactory.getLogger(PropStoreConfigIT_SimpleSuite.class);
@Override
protected Duration defaultTimeout() {
diff --git
a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java
similarity index 96%
rename from
test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
rename to
test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java
index e9d109f1f9..49f16c24f9 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java
@@ -24,7 +24,6 @@ import java.time.Duration;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.conf.util.ZooPropEditor;
import org.apache.accumulo.test.util.Wait;
@@ -36,10 +35,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ZooPropEditorIT extends SharedMiniClusterBase {
+public class ZooPropEditorIT_SimpleSuite extends SharedMiniClusterBase {
- private static final Logger LOG =
LoggerFactory.getLogger(ZooPropEditorIT.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(ZooPropEditorIT_SimpleSuite.class);
@Override
protected Duration defaultTimeout() {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
index ddf484c271..da3b76a242 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderIT.java
@@ -55,19 +55,16 @@ import org.apache.accumulo.core.fate.Fate.TxInfo;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.FateStore;
import org.apache.accumulo.core.fate.Repo;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.Iterators;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
public abstract class FateExecutionOrderIT extends SharedMiniClusterBase
implements FateTestRunner<FateExecutionOrderIT.FeoTestEnv> {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java
index 591e3cd2aa..0dc1d52e5a 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java
@@ -74,7 +74,6 @@ import
org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.time.SteadyTime;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.manager.Manager;
import
org.apache.accumulo.manager.merge.FindMergeableRangeTask.UnmergeableReason;
@@ -98,7 +97,6 @@ import
org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -106,8 +104,7 @@ import org.junit.jupiter.params.provider.MethodSource;
import com.google.common.collect.Sets;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ManagerRepoIT extends SharedMiniClusterBase {
+public class ManagerRepoIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT_SimpleSuite.java
similarity index 96%
rename from
test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT_SimpleSuite.java
index c61f1a4031..44d7862b79 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT_SimpleSuite.java
@@ -30,7 +30,7 @@ import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
import org.apache.accumulo.core.zookeeper.ZooSession;
import org.apache.accumulo.test.fate.FateExecutionOrderIT;
-public class MetaFateExecutionOrderIT extends FateExecutionOrderIT {
+public class MetaFateExecutionOrderIT_SimpleSuite extends FateExecutionOrderIT
{
// put the fate data for the test in a different location than what accumulo
is using
private static final InstanceId IID = InstanceId.of(UUID.randomUUID());
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java
similarity index 97%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java
index bdfb5ac2a0..fffe019af3 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java
@@ -38,20 +38,17 @@ import org.apache.accumulo.core.fate.ReadOnlyFateStore;
import org.apache.accumulo.core.fate.user.FateMutator;
import org.apache.accumulo.core.fate.user.FateMutatorImpl;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class FateMutatorImplIT extends SharedMiniClusterBase {
+public class FateMutatorImplIT_SimpleSuite extends SharedMiniClusterBase {
- Logger log = LoggerFactory.getLogger(FateMutatorImplIT.class);
+ Logger log = LoggerFactory.getLogger(FateMutatorImplIT_SimpleSuite.class);
final NewTableConfiguration ntc =
new
NewTableConfiguration().withInitialTabletAvailability(TabletAvailability.HOSTED);
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT_SimpleSuite.java
similarity index 95%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT_SimpleSuite.java
index 3f0d53516a..0802053f5e 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT_SimpleSuite.java
@@ -27,7 +27,7 @@ import org.apache.accumulo.core.fate.AbstractFateStore;
import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.test.fate.FateExecutionOrderIT;
-public class UserFateExecutionOrderIT extends FateExecutionOrderIT {
+public class UserFateExecutionOrderIT_SimpleSuite extends FateExecutionOrderIT
{
@Override
public void executeTest(FateTestExecutor<FeoTestEnv> testMethod, int
maxDeferred,
AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java
similarity index 97%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java
index c53a6ff91d..412d51585a 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java
@@ -40,17 +40,14 @@ import org.apache.accumulo.core.fate.user.schema.FateSchema;
import org.apache.accumulo.core.iterators.user.VersioningIterator;
import org.apache.accumulo.core.metadata.SystemTables;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class UserFateIT extends FateIT {
+public class UserFateIT_SimpleSuite extends FateIT {
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java
similarity index 91%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java
index 8fdb3e6e8a..15596835c7 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java
@@ -25,15 +25,12 @@ import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.AbstractFateStore;
import org.apache.accumulo.core.fate.user.UserFateStore;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FatePoolsWatcherIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class UserFatePoolsWatcherIT extends FatePoolsWatcherIT {
+public class UserFatePoolsWatcherIT_SimpleSuite extends FatePoolsWatcherIT {
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java
similarity index 91%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java
index a591c95cdd..70cfe693be 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java
@@ -24,17 +24,14 @@ import static
org.apache.accumulo.test.fate.TestLock.createDummyLockID;
import org.apache.accumulo.core.client.Accumulo;
import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.user.UserFateStore;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.FateStatusEnforcementIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class UserFateStatusEnforcementIT extends FateStatusEnforcementIT {
+public class UserFateStatusEnforcementIT_SimpleSuite extends
FateStatusEnforcementIT {
private ClientContext client;
private String table;
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java
similarity index 94%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java
index 590284c62d..607027f651 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java
@@ -32,16 +32,13 @@ import
org.apache.accumulo.core.fate.AbstractFateStore.FateIdGenerator;
import org.apache.accumulo.core.fate.FateId;
import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.test.fate.FateStoreIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class UserFateStoreFateIT extends FateStoreIT {
+public class UserFateStoreFateIT_SimpleSuite extends FateStoreIT {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java
similarity index 94%
rename from
test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
rename to
test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java
index 2c87e811ea..17a6e09cb2 100644
---
a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java
@@ -30,17 +30,14 @@ import org.apache.accumulo.core.clientImpl.ClientContext;
import org.apache.accumulo.core.fate.FateStore;
import org.apache.accumulo.core.fate.user.UserFateStore;
import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.fate.MultipleStoresIT;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class UserMultipleStoresIT extends MultipleStoresIT {
+public class UserMultipleStoresIT_SimpleSuite extends MultipleStoresIT {
private ClientContext client;
private String tableName;
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java
similarity index 98%
rename from
test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java
index 93109f0633..d36a37a51c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java
@@ -55,18 +55,15 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableMap;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class AddSplitIT extends SharedMiniClusterBase {
+public class AddSplitIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
similarity index 99%
rename from
test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
index a0a4c7b7d1..eaf9482997 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java
@@ -67,7 +67,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Se
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.NamespacePermission;
import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
import org.apache.hadoop.fs.FileStatus;
@@ -76,11 +75,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class CloneTestIT extends SharedMiniClusterBase {
+public class CloneTestIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java
similarity index 92%
rename from
test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java
index 4b5286cb8f..c53e3d1792 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java
@@ -28,16 +28,13 @@ import org.apache.accumulo.core.client.IteratorSetting;
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.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
// ACCUMULO-2880
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class DeletedTablesDontFlushIT extends SharedMiniClusterBase {
+public class DeletedTablesDontFlushIT_SimpleSuite extends
SharedMiniClusterBase {
@Override
protected Duration defaultTimeout() {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java
similarity index 97%
rename from
test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java
index 149e89b654..122ffa2b4e 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java
@@ -40,14 +40,12 @@ import org.apache.accumulo.core.metadata.StoredTabletFile;
import org.apache.accumulo.core.metadata.SystemTables;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.test.TestIngest;
import org.apache.accumulo.test.VerifyIngest;
import org.apache.hadoop.io.Text;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,10 +56,9 @@ import org.slf4j.LoggerFactory;
* to update the metadata table then the key will not match. The mismatch
could result in duplicate
* entries.
*/
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class FileNormalizationIT extends SharedMiniClusterBase {
+public class FileNormalizationIT_SimpleSuite extends SharedMiniClusterBase {
- private static final Logger log =
LoggerFactory.getLogger(FileNormalizationIT.class);
+ private static final Logger log =
LoggerFactory.getLogger(FileNormalizationIT_SimpleSuite.class);
@BeforeAll
public static void setup() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java
similarity index 97%
rename from
test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java
index 16be75fa5b..aa56f17ba2 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java
@@ -33,7 +33,6 @@ import org.apache.accumulo.core.metadata.ReferencedTabletFile;
import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
import org.apache.accumulo.core.metadata.schema.TabletMetadata;
import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.tablets.TabletNameGenerator;
@@ -43,11 +42,9 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class FindCompactionTmpFilesIT extends SharedMiniClusterBase {
+public class FindCompactionTmpFilesIT_SimpleSuite extends
SharedMiniClusterBase {
@BeforeAll
public static void before() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java
similarity index 86%
rename from
test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
rename to
test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java
index 86efc0667b..7a26930a80 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java
@@ -18,14 +18,11 @@
*/
package org.apache.accumulo.test.functional;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Tag;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class MergeTabletsIT extends MergeTabletsBaseIT {
+public class MergeTabletsIT_SimpleSuite extends MergeTabletsBaseIT {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java
similarity index 94%
rename from test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
rename to
test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java
index b00635f13d..3e7be06544 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
@@ -36,8 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ConfigSetIT extends SharedMiniClusterBase {
+public class ConfigSetIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniCluster();
@@ -48,7 +46,7 @@ public class ConfigSetIT extends SharedMiniClusterBase {
SharedMiniClusterBase.stopMiniCluster();
}
- private static final Logger log = LoggerFactory.getLogger(ConfigSetIT.class);
+ private static final Logger log =
LoggerFactory.getLogger(ConfigSetIT_SimpleSuite.class);
@Test
public void setInvalidJson() throws Exception {
diff --git
a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java
similarity index 92%
rename from
test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
rename to
test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java
index 2969b4a1e9..095b7dfb35 100644
---
a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java
@@ -24,11 +24,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.util.TimeZone;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.shell.Shell;
-import org.apache.accumulo.test.shell.ShellIT.StringInputStream;
-import org.apache.accumulo.test.shell.ShellIT.TestOutputStream;
+import org.apache.accumulo.test.shell.ShellIT_SimpleSuite.StringInputStream;
+import org.apache.accumulo.test.shell.ShellIT_SimpleSuite.TestOutputStream;
import org.jline.reader.LineReader;
import org.jline.reader.LineReaderBuilder;
import org.jline.terminal.Size;
@@ -38,11 +37,9 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ShellAuthenticatorIT extends SharedMiniClusterBase {
+public class ShellAuthenticatorIT_SimpleSuite extends SharedMiniClusterBase {
@BeforeAll
public static void setup() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT_SimpleSuite.java
similarity index 99%
rename from test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
rename to
test/src/main/java/org/apache/accumulo/test/shell/ShellIT_SimpleSuite.java
index 84bcc72cd2..1152f6daea 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT_SimpleSuite.java
@@ -36,7 +36,6 @@ import java.util.TimeZone;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.PropertyType;
-import org.apache.accumulo.harness.AccumuloITBase;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.shell.Shell;
import org.jline.reader.LineReader;
@@ -54,8 +53,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag(MINI_CLUSTER_ONLY)
-@Tag(AccumuloITBase.SIMPLE_MINI_CLUSTER_SUITE)
-public class ShellIT extends SharedMiniClusterBase {
+public class ShellIT_SimpleSuite extends SharedMiniClusterBase {
@Override
protected Duration defaultTimeout() {
@@ -72,7 +70,7 @@ public class ShellIT extends SharedMiniClusterBase {
SharedMiniClusterBase.stopMiniCluster();
}
- private static final Logger log = LoggerFactory.getLogger(ShellIT.class);
+ private static final Logger log =
LoggerFactory.getLogger(ShellIT_SimpleSuite.class);
public static class TestOutputStream extends OutputStream {
StringBuilder sb = new StringBuilder();
