diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloFileOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloFileOutputFormatIT.java index 66f09813168..ecccbb19da7 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloFileOutputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloFileOutputFormatIT.java @@ -45,7 +45,7 @@ import org.apache.accumulo.hadoop.mapred.AccumuloFileOutputFormat; import org.apache.accumulo.hadoop.mapred.AccumuloInputFormat; import org.apache.accumulo.hadoopImpl.mapreduce.lib.ConfiguratorBase; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java index 6fad4ef8ad0..2268cb77a83 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloInputFormatIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.hadoop.mapred.AccumuloInputFormat; import org.apache.accumulo.hadoop.mapreduce.InputFormatBuilder; import org.apache.accumulo.hadoopImpl.mapred.RangeInputSplit; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloRowInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloRowInputFormatIT.java index d19369a5541..71b4cc75f16 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloRowInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/AccumuloRowInputFormatIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.util.PeekingIterator; import org.apache.accumulo.hadoop.mapred.AccumuloRowInputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java index a80f1392f37..0ec78c82591 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/MultiTableInputFormatIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.hadoop.mapred.AccumuloInputFormat; import org.apache.accumulo.hadoopImpl.mapred.RangeInputSplit; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java index f974ca21681..b531187ec83 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapred/TokenFileIT.java @@ -42,7 +42,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.hadoop.mapred.AccumuloInputFormat; import org.apache.accumulo.hadoop.mapred.AccumuloOutputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloFileOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloFileOutputFormatIT.java index d029b5c9bc5..7a4c58f8446 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloFileOutputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloFileOutputFormatIT.java @@ -44,7 +44,7 @@ import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory; import org.apache.accumulo.hadoop.mapreduce.AccumuloFileOutputFormat; import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java index 1480866e00a..e4d010f185c 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java @@ -52,7 +52,7 @@ import org.apache.accumulo.hadoop.mapreduce.InputFormatBuilder.InputFormatOptions; import org.apache.accumulo.hadoopImpl.mapreduce.BatchInputSplit; import org.apache.accumulo.hadoopImpl.mapreduce.RangeInputSplit; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java index 4b4f3649aa1..67fa01bfe0a 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloOutputFormatIT.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat; import org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloRowInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloRowInputFormatIT.java index 6f3870465ff..b154f4b4a43 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloRowInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloRowInputFormatIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.util.PeekingIterator; import org.apache.accumulo.hadoop.mapreduce.AccumuloRowInputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java index 488b556080e..0225cf2be3d 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MultiTableInputFormatIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat; import org.apache.accumulo.hadoopImpl.mapreduce.RangeInputSplit; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java index 2900191c4b7..2782505767b 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/TokenFileIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.hadoop.mapreduce.AccumuloInputFormat; import org.apache.accumulo.hadoop.mapreduce.AccumuloOutputFormat; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; diff --git a/src/build/ci/check-module-package-conventions.sh b/src/build/ci/check-module-package-conventions.sh index 397adba7331..794237451ea 100755 --- a/src/build/ci/check-module-package-conventions.sh +++ b/src/build/ci/check-module-package-conventions.sh @@ -39,23 +39,6 @@ ALLOWED=( server/native/src/main/resources/Makefile server/native/src/main/resources/NOTICE - # TODO: these test classes should be moved into the correct package for the module - start/src/test/java/test/HelloWorldTemplate - start/src/test/java/test/TestTemplate - start/src/test/java/test/Test.java - test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java - test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java - test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java - test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java - test/src/main/java/org/apache/accumulo/harness/Timeout.java - test/src/main/java/org/apache/accumulo/harness/WithTestNames.java - test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java - test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java - test/src/main/java/org/apache/accumulo/harness/MiniClusterConfigurationCallback.java - test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java - test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java - test/src/main/java/org/apache/accumulo/harness/TestingKdc.java - # TODO: these test resources should be moved into the correct package for the module core/src/test/resources/accumulo.jceks core/src/test/resources/empty.jceks diff --git a/start/src/test/java/test/HelloWorldTemplate b/start/src/test/java/org/apache/accumulo/start/test/HelloWorldTemplate similarity index 100% rename from start/src/test/java/test/HelloWorldTemplate rename to start/src/test/java/org/apache/accumulo/start/test/HelloWorldTemplate diff --git a/start/src/test/java/test/Test.java b/start/src/test/java/org/apache/accumulo/start/test/Test.java similarity index 95% rename from start/src/test/java/test/Test.java rename to start/src/test/java/org/apache/accumulo/start/test/Test.java index 3c2b196c15f..51aed4f807a 100644 --- a/start/src/test/java/test/Test.java +++ b/start/src/test/java/org/apache/accumulo/start/test/Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package test; +package org.apache.accumulo.start.test; public interface Test { diff --git a/start/src/test/java/test/TestTemplate b/start/src/test/java/org/apache/accumulo/start/test/TestTemplate similarity index 100% rename from start/src/test/java/test/TestTemplate rename to start/src/test/java/org/apache/accumulo/start/test/TestTemplate diff --git a/test/src/main/java/org/apache/accumulo/test/AmpleIT.java b/test/src/main/java/org/apache/accumulo/test/AmpleIT.java index e89a1fd4b40..10499b0745d 100644 --- a/test/src/main/java/org/apache/accumulo/test/AmpleIT.java +++ b/test/src/main/java/org/apache/accumulo/test/AmpleIT.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.metadata.schema.Ample; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java index c8a47dc939a..84bf25dbe13 100644 --- a/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java @@ -43,9 +43,9 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.zookeeper.ZooCache; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/BatchWriterIT.java b/test/src/main/java/org/apache/accumulo/test/BatchWriterIT.java index 69342775119..1129da29612 100644 --- a/test/src/main/java/org/apache/accumulo/test/BatchWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BatchWriterIT.java @@ -26,7 +26,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class BatchWriterIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/BatchWriterInTabletServerIT.java b/test/src/main/java/org/apache/accumulo/test/BatchWriterInTabletServerIT.java index 0cf4f8658a7..91db6b1ab2f 100644 --- a/test/src/main/java/org/apache/accumulo/test/BatchWriterInTabletServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BatchWriterInTabletServerIT.java @@ -36,7 +36,7 @@ import org.apache.accumulo.core.iterators.LongCombiner; import org.apache.accumulo.core.iterators.user.SummingCombiner; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java index 0658dadb0a4..03913618ca2 100644 --- a/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BulkImportSequentialRowsIT.java @@ -28,8 +28,8 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FsShell; diff --git a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java index e395f51d559..73bf0589b54 100644 --- a/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CleanWalIT.java @@ -38,9 +38,9 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java index 824284ee981..ce8f91655f8 100644 --- a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java @@ -51,7 +51,7 @@ import org.apache.accumulo.core.iterators.user.IntersectingIterator; import org.apache.accumulo.core.iterators.user.VersioningIterator; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/CloneIT.java b/test/src/main/java/org/apache/accumulo/test/CloneIT.java index a219dc0a801..680f1563681 100644 --- a/test/src/main/java/org/apache/accumulo/test/CloneIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CloneIT.java @@ -44,8 +44,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.server.util.MetadataTableUtil; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java b/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java index 6a4c4f68121..846d9065cc8 100644 --- a/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CloseScannerIT.java @@ -32,10 +32,10 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.Timer; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ReadWriteIT; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java index 71429006ffc..07cf886c432 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyAmpleIT.java @@ -21,12 +21,12 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.ample.FlakyAmpleManager; import org.apache.accumulo.test.ample.FlakyAmpleTserver; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java index 0e4691ea30a..de93a800276 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveFlakyFateIT.java @@ -21,11 +21,11 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.fate.FlakyFateManager; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java index 9a1bc508ddc..98958b7ac82 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveIT.java @@ -18,14 +18,15 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.SharedMiniClusterBase.getClientProps; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveITBase.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveITBase.java index a863b664fca..1b0029aaffd 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveITBase.java @@ -101,8 +101,8 @@ import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.spi.scan.ConfigurableScanServerSelector; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveMultiManagerIT.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveMultiManagerIT.java index fc0d87369ef..f3dc6edffbb 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveMultiManagerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveMultiManagerIT.java @@ -23,10 +23,10 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.manager.fate.FateManager; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java index 470ff501ec1..46e97cac895 100644 --- a/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ComprehensiveTableOperationsIT.java @@ -73,7 +73,6 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.test.functional.BasicSummarizer; import org.apache.accumulo.test.functional.BulkNewIT; @@ -89,6 +88,7 @@ import org.apache.accumulo.test.functional.SlowIterator; import org.apache.accumulo.test.functional.SummaryIT; import org.apache.accumulo.test.functional.TabletAvailabilityIT; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java index d24852a3ee1..7c6f8f0e510 100644 --- a/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java @@ -93,12 +93,12 @@ import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.FastFormat; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint; import org.apache.accumulo.test.functional.BadIterator; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java index fdab6e21425..d5e0ef065ae 100644 --- a/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java @@ -43,8 +43,8 @@ import org.apache.accumulo.core.tabletingest.thrift.TDurability; import org.apache.accumulo.core.tabletingest.thrift.TabletIngestClientService; import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.thrift.TApplicationException; import org.apache.thrift.TServiceClient; diff --git a/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java index 6ca0d72bbd8..701e6933c9c 100644 --- a/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/CreateTableIT_SimpleSuite.java @@ -31,7 +31,7 @@ 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java b/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java index c71bd4b308a..f84ff7bb87f 100644 --- a/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java +++ b/test/src/main/java/org/apache/accumulo/test/FindMaxIT.java @@ -33,7 +33,7 @@ import org.apache.accumulo.core.data.RowRange; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java index 9c1588ef68c..fa006c30074 100644 --- a/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/GCRunIT_SimpleSuite.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test; import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.DIRECTORY_QUAL; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,8 +45,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java index 23fa026d125..a8c7cc6e86a 100644 --- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java @@ -66,8 +66,8 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.commons.io.FileUtils; import org.apache.hadoop.fs.FSDataInputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java index 6a95e071cf0..65528e738d8 100644 --- a/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java +++ b/test/src/main/java/org/apache/accumulo/test/InMemoryMapIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -48,9 +48,9 @@ import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import org.apache.accumulo.harness.WithTestNames; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.functional.NativeMapIT; +import org.apache.accumulo.test.harness.WithTestNames; import org.apache.accumulo.tserver.InMemoryMap; import org.apache.accumulo.tserver.MemKey; import org.apache.accumulo.tserver.memory.NativeMapLoader; diff --git a/test/src/main/java/org/apache/accumulo/test/InstanceOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/InstanceOperationsIT.java index 249244d65e2..e73cf5a019f 100644 --- a/test/src/main/java/org/apache/accumulo/test/InstanceOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/InstanceOperationsIT.java @@ -35,10 +35,10 @@ import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.ResourceGroupId; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java index 9705a69f7d7..8c537afe0db 100644 --- a/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/InterruptibleScannersIT.java @@ -32,9 +32,9 @@ import org.apache.accumulo.core.client.admin.ActiveScan; import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/IsolationAndDeepCopyIT.java b/test/src/main/java/org/apache/accumulo/test/IsolationAndDeepCopyIT.java index a33b246a882..60a8f7c2498 100644 --- a/test/src/main/java/org/apache/accumulo/test/IsolationAndDeepCopyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/IsolationAndDeepCopyIT.java @@ -29,7 +29,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.iterators.user.IntersectingIterator; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java b/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java index ded130e1ade..bcbe5609700 100644 --- a/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java +++ b/test/src/main/java/org/apache/accumulo/test/IteratorEnvIT.java @@ -55,8 +55,8 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/KeyValueEqualityIT.java b/test/src/main/java/org/apache/accumulo/test/KeyValueEqualityIT.java index 7642140a4b6..2655e6ee0b9 100644 --- a/test/src/main/java/org/apache/accumulo/test/KeyValueEqualityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/KeyValueEqualityIT.java @@ -33,7 +33,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class KeyValueEqualityIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java b/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java index ca3184ee541..b3f0cdc305b 100644 --- a/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LargeReadIT.java @@ -40,10 +40,10 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.metadata.schema.TabletMetadata; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; 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 0200908f6e1..2d7fa776856 100644 --- a/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LargeSplitRowIT.java @@ -49,9 +49,9 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; 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_SimpleSuite; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java b/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java index b375aa345fc..a7fa9b0f6d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ListCompactionsIT.java @@ -36,14 +36,14 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.ListCompactions; import org.apache.accumulo.server.util.ListCompactions.RunningCompactionSummary; import org.apache.accumulo.test.compaction.ExternalCompactionTestUtils; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ListCompactorsIT.java b/test/src/main/java/org/apache/accumulo/test/ListCompactorsIT.java index d4bfab4ce6e..7f1180b4fb8 100644 --- a/test/src/main/java/org/apache/accumulo/test/ListCompactorsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ListCompactorsIT.java @@ -34,12 +34,12 @@ import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.data.ResourceGroupId; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.ListCompactors; import org.apache.accumulo.test.compaction.ExternalCompactionTestUtils; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java index 4a5c6835edd..d8f34c105f8 100644 --- a/test/src/main/java/org/apache/accumulo/test/LocatorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/LocatorIT.java @@ -52,8 +52,8 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.dataImpl.TabletIdImpl; import org.apache.accumulo.core.metadata.schema.TabletMetadata; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.functional.ManagerAssignmentIT; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java index 743bf7c746a..e30a381d8ba 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaConstraintRetryIT.java @@ -32,9 +32,9 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.manager.upgrade.SplitRecovery11to12; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class MetaConstraintRetryIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java index e7cf93898da..88049ce93cd 100644 --- a/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/MetaSplitIT.java @@ -47,7 +47,7 @@ import org.apache.accumulo.core.dataImpl.KeyExtent; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java index bd1ba0e83cb..0ae531a5a0b 100644 --- a/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/MultiTableBatchWriterIT_SimpleSuite.java @@ -41,7 +41,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.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java index 9a86c280714..b699f3143c6 100644 --- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT_SimpleSuite.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -79,8 +79,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.test.constraints.NumericValueConstraint; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java index 4fd962fd0aa..52c16242c55 100644 --- a/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/NewTableConfigurationIT_SimpleSuite.java @@ -52,7 +52,7 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iteratorsImpl.IteratorConfigUtil; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java index ac48bc235db..68d6e2016e5 100644 --- a/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/OfflineTableIT.java @@ -49,10 +49,10 @@ import org.apache.accumulo.core.metadata.schema.TabletOperationType; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java index 660f6bced51..77b2be9314c 100644 --- a/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/OrIteratorIT_SimpleSuite.java @@ -46,7 +46,7 @@ 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java index fedb9fb9b98..03bf5bafdd3 100644 --- a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT_SimpleSuite.java @@ -42,8 +42,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java index c7b2c4ade35..af45e39cce8 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryCompactionsAreFlushesIT.java @@ -35,9 +35,9 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/RecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/RecoveryIT.java index 07133ff3080..2e9c8198e68 100644 --- a/test/src/main/java/org/apache/accumulo/test/RecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RecoveryIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -44,7 +44,6 @@ import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.spi.balancer.TableLoadBalancer; import org.apache.accumulo.core.tabletserver.log.LogEntry; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterControl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; @@ -53,6 +52,7 @@ import org.apache.accumulo.server.log.SortedLogState; import org.apache.accumulo.server.manager.recovery.RecoveryPath; import org.apache.accumulo.test.functional.ReadWriteIT; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/RootRecoveryIT.java b/test/src/main/java/org/apache/accumulo/test/RootRecoveryIT.java index 8da680e4152..c73780b9e85 100644 --- a/test/src/main/java/org/apache/accumulo/test/RootRecoveryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/RootRecoveryIT.java @@ -31,10 +31,10 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java index d5f58f173bb..9643d311fc5 100644 --- a/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/SampleIT_SimpleSuite.java @@ -66,7 +66,7 @@ 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanConsistencyIT.java b/test/src/main/java/org/apache/accumulo/test/ScanConsistencyIT.java index 144a5d117c0..23a948556d2 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanConsistencyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanConsistencyIT.java @@ -59,8 +59,8 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java index fdbaf73b819..b0a6a1f635a 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanFlushWithTimeIT.java @@ -37,8 +37,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerAllowedTablesIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerAllowedTablesIT.java index 9c2e20d353b..466f9bd34e6 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerAllowedTablesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerAllowedTablesIT.java @@ -42,10 +42,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java index 52db3b78312..c4fb58aa48a 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerConcurrentTabletScanIT.java @@ -18,9 +18,9 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest; import static org.apache.accumulo.test.ScanServerIT.ingest; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; @@ -42,10 +42,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.zookeeper.KeeperException; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java index 3f9f46ffbb3..3e1e9576a7b 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java @@ -33,10 +33,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java index 9507dbe3fb8..0c3140c38dc 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -70,13 +70,13 @@ import org.apache.accumulo.core.metadata.schema.TabletOperationType; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.metadata.ServerAmpleImpl; import org.apache.accumulo.test.functional.ReadWriteIT; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java index 5004183aa32..abe78e99c2b 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT_SimpleSuite.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -28,9 +28,9 @@ import java.util.stream.Stream; import org.apache.accumulo.core.metadata.ScanServerRefTabletFile; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.ScanServerMetadataEntries; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java index d0d02d0a02d..4bf1aa54ab1 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java @@ -18,8 +18,8 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.apache.accumulo.test.ScanServerIT.ingest; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -53,11 +53,11 @@ import org.apache.accumulo.core.metadata.schema.Ample.DataLevel; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.gc.GCRun; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java index b5eb4e9dbdf..45cda778f08 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerMultipleScansIT.java @@ -18,8 +18,8 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -50,10 +50,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java index 5cfa014d8bb..841b4d9848c 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerShutdownIT.java @@ -38,11 +38,11 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/ScanServer_NoServersIT.java b/test/src/main/java/org/apache/accumulo/test/ScanServer_NoServersIT.java index 1890770c087..aa13621e8c7 100644 --- a/test/src/main/java/org/apache/accumulo/test/ScanServer_NoServersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServer_NoServersIT.java @@ -18,10 +18,10 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.apache.accumulo.test.ScanServerIT.createTableAndIngest; import static org.apache.accumulo.test.ScanServerIT.ingest; import static org.apache.accumulo.test.ScanServerIT.setupTableWithTabletAvailabilityMix; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -42,9 +42,9 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.scan.ConfigurableScanServerSelector; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java index ae78d12d62c..27899f38d9c 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableConfigurationUpdateIT.java @@ -38,10 +38,10 @@ import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.NamespaceConfiguration; import org.apache.accumulo.server.conf.TableConfiguration; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java index cfb633f088d..21c835b0d36 100644 --- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java @@ -78,10 +78,10 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.manager.tableOps.Utils; import org.apache.accumulo.test.functional.BadIterator; import org.apache.accumulo.test.functional.FunctionalTestUtils; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java b/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java index 10d465d0980..d8cd8e31982 100644 --- a/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ThriftServerBindsBeforeZooKeeperLockIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import java.io.IOException; import java.net.HttpURLConnection; @@ -33,7 +33,6 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath; import org.apache.accumulo.core.util.MonitorUtil; import org.apache.accumulo.gc.SimpleGarbageCollector; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.manager.Manager; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; @@ -41,6 +40,7 @@ import org.apache.accumulo.monitor.Monitor; import org.apache.accumulo.server.util.PortUtils; import org.apache.accumulo.test.functional.FunctionalTestUtils; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java index b5e41e4139b..c5c88a63820 100644 --- a/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/TransportCachingIT.java @@ -35,7 +35,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.util.Pair; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.thrift.transport.TTransport; import org.apache.thrift.transport.TTransportException; diff --git a/test/src/main/java/org/apache/accumulo/test/UniqueNameAllocatorIT.java b/test/src/main/java/org/apache/accumulo/test/UniqueNameAllocatorIT.java index 4b3b082851a..facbe5e1b5d 100644 --- a/test/src/main/java/org/apache/accumulo/test/UniqueNameAllocatorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UniqueNameAllocatorIT.java @@ -34,8 +34,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.tablets.UniqueNameAllocator; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/UsersIT.java b/test/src/main/java/org/apache/accumulo/test/UsersIT.java index 298c47354c8..c6ee116909d 100644 --- a/test/src/main/java/org/apache/accumulo/test/UsersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/UsersIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.admin.SecurityOperations; import org.apache.accumulo.core.client.security.SecurityErrorCode; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class UsersIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/WriteAfterCloseIT.java b/test/src/main/java/org/apache/accumulo/test/WriteAfterCloseIT.java index 6d66b26f228..2f42f0a00a1 100644 --- a/test/src/main/java/org/apache/accumulo/test/WriteAfterCloseIT.java +++ b/test/src/main/java/org/apache/accumulo/test/WriteAfterCloseIT.java @@ -53,9 +53,9 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.data.constraints.Constraint; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.params.ParameterizedTest; diff --git a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java index 2fd8f1859e9..51b1e92faf9 100644 --- a/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/YieldScannersIT.java @@ -42,9 +42,9 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.YieldingIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java index fa5b033e230..b5adaadd00a 100644 --- a/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/ZooKeeperPropertiesIT_SimpleSuite.java @@ -36,11 +36,11 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.store.NamespacePropKey; import org.apache.accumulo.server.conf.store.TablePropKey; import org.apache.accumulo.server.util.PropUtil; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java index 716e7664bc4..66ccf0ea42c 100644 --- a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT_SimpleSuite.java @@ -38,9 +38,9 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.test.ample.metadata.TestAmple; import org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java index 85178e1a7ed..bd385f14a15 100644 --- a/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/ample/usage/TabletFileUpdateIT_SimpleSuite.java @@ -40,9 +40,9 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.server.tablets.TabletTime; import org.apache.accumulo.test.ample.metadata.TestAmple; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.tserver.MinorCompactionReason; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/BadCompactionServiceConfigIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/BadCompactionServiceConfigIT.java index 705ffd0bdef..0f79d83b79a 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/BadCompactionServiceConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/BadCompactionServiceConfigIT.java @@ -47,10 +47,10 @@ import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner; import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory; import org.apache.accumulo.core.util.threads.Threads; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java index 8946d2ae839..2162b4eb7af 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java @@ -58,11 +58,11 @@ import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory; import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil; import org.apache.accumulo.core.util.threads.Threads; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ReadWriteIT; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionConfigChangeIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionConfigChangeIT.java index fe1783b8412..8a3f24ec0ac 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionConfigChangeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionConfigChangeIT.java @@ -32,9 +32,9 @@ import org.apache.accumulo.core.clientImpl.ClientContext; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionExecutorIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionExecutorIT.java index 548b972a07a..fc64cee8995 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionExecutorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionExecutorIT.java @@ -69,10 +69,10 @@ import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.spi.compaction.CompactionPlan; import org.apache.accumulo.core.spi.compaction.CompactionPlanner; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.RawLocalFileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java index 3edcc017156..c8df5040c3a 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java @@ -69,13 +69,13 @@ import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.compaction.CompactionJobPrioritizer; import org.apache.accumulo.core.util.threads.Threads; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.functional.CompactionIT; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.util.Wait; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java index fd4d228f6ce..64f89cf6c38 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction2ITBase.java @@ -57,12 +57,12 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.FindCompactionTmpFiles; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java index 2d57c94e607..f8fc634ed79 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction4_IT.java @@ -47,11 +47,11 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ErrorThrowingIterator; import org.apache.accumulo.test.functional.ReadWriteIT; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionMetricsIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionMetricsIT.java index a83950041b7..f3f74319a72 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionMetricsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionMetricsIT.java @@ -53,11 +53,11 @@ import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.threads.Threads; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.miniclusterImpl.ProcessReference; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java index 9dc30dadf88..5454b8b649e 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java @@ -56,10 +56,10 @@ import org.apache.accumulo.core.metrics.MetricsUtil; import org.apache.accumulo.core.util.compaction.RunningCompactionInfo; import org.apache.accumulo.core.util.threads.Threads; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.util.Wait; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java index 6cd9c977b13..5bec14ad872 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java @@ -107,8 +107,6 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.manager.tableOps.AbstractFateOperation; import org.apache.accumulo.manager.tableOps.FateEnv; import org.apache.accumulo.minicluster.ServerType; @@ -116,6 +114,8 @@ import org.apache.accumulo.server.util.FindCompactionTmpFiles; import org.apache.accumulo.test.fate.TestLock; import org.apache.accumulo.test.functional.CompactionIT.ErrorThrowingSelector; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java index b011f3fb9f1..f1edec9bc76 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_3_IT.java @@ -55,14 +55,14 @@ import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil; import org.apache.accumulo.core.util.compaction.RunningCompactionInfo; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.FindCompactionTmpFiles; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java index b3e7b2553fc..8ad58ab5743 100644 --- a/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/compaction/SplitCancelsMajCIT.java @@ -41,10 +41,10 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/ImportExportConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/ImportExportConfigIT.java index 13a0966ca76..5cbed9f686b 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/ImportExportConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/ImportExportConfigIT.java @@ -40,11 +40,11 @@ import org.apache.accumulo.core.data.ResourceGroupId; import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.iteratorsImpl.IteratorConfigUtil; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.conf.util.ExportConfigCommand; import org.apache.accumulo.server.conf.util.ImportConfigCommand; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java index 8c5f7adb7ae..3039cbb3ed8 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT_SimpleSuite.java @@ -20,7 +20,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.accumulo.core.conf.ConfigurationTypeHelper.getMemoryAsBytes; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; @@ -55,11 +55,11 @@ import org.apache.accumulo.core.manager.thrift.ThriftPropertyException; import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.store.NamespacePropKey; import org.apache.accumulo.server.conf.store.SystemPropKey; import org.apache.accumulo.server.conf.store.TablePropKey; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java index bd43be7ef10..3bb57e99695 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/ResourceGroupConfigIT.java @@ -18,8 +18,8 @@ */ package org.apache.accumulo.test.conf; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -56,11 +56,11 @@ import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.store.ResourceGroupPropKey; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java index ddb53c52f70..a80a644ad27 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java @@ -23,7 +23,7 @@ import static org.apache.accumulo.core.conf.Property.TSERV_CLIENTPORT; import static org.apache.accumulo.core.conf.Property.TSERV_NATIVEMAP_ENABLED; import static org.apache.accumulo.core.conf.Property.TSERV_SCAN_MAX_OPENFILES; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java index 234b95ab341..5489b36323a 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.conf.store; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java index 88993320abe..8677ac8ccd2 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.conf.store; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java index 2fc7301d4a6..f719be41229 100644 --- a/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/conf/util/ZooPropEditorIT_SimpleSuite.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.conf.util; import static org.apache.accumulo.core.conf.SiteConfiguration.ACCUMULO_PROPERTIES_PROPERTY; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -33,8 +33,8 @@ import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.ResourceGroupId; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.conf.util.ZooPropEditor; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderITBase.java index 375f35ff672..60badd3025a 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateExecutionOrderITBase.java @@ -57,8 +57,8 @@ import org.apache.accumulo.core.fate.FatePartition; import org.apache.accumulo.core.fate.FateStore; import org.apache.accumulo.core.fate.Repo; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FateITBase.java index 2535e2cadc6..0a226ec798c 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateITBase.java @@ -59,9 +59,9 @@ import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus; import org.apache.accumulo.core.fate.Repo; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.fate.FateTestRunner.TestEnv; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsITBase.java index 5fb90e60c86..3d338ae9eb8 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsITBase.java @@ -70,7 +70,6 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.zookeeper.ZooSession; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; import org.apache.accumulo.server.ServerContext; @@ -80,6 +79,7 @@ import org.apache.accumulo.test.fate.MultipleStoresITBase.LatchTestRepo; import org.apache.accumulo.test.functional.ReadWriteIT; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.easymock.EasyMock; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherITBase.java index 9141e379f57..cddeb1e1c13 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FatePoolsWatcherITBase.java @@ -35,8 +35,8 @@ import org.apache.accumulo.core.fate.FatePartition; import org.apache.accumulo.core.fate.FateStore; import org.apache.accumulo.core.fate.Repo; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateStatusEnforcementITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FateStatusEnforcementITBase.java index 417e08cfc60..1da71897683 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateStatusEnforcementITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStatusEnforcementITBase.java @@ -28,7 +28,7 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.FateStore; import org.apache.accumulo.core.fate.ReadOnlyFateStore; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java index 36e0c0f2474..d539e5eabf0 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreITBase.java @@ -63,10 +63,10 @@ import org.apache.accumulo.core.fate.ReadOnlyRepo; import org.apache.accumulo.core.fate.StackOverflowException; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.fate.FateITBase.TestRepo; import org.apache.accumulo.test.fate.FateTestRunner.TestEnv; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateTestUtil.java b/test/src/main/java/org/apache/accumulo/test/fate/FateTestUtil.java index 53ef30ce507..933a9076746 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/FateTestUtil.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/FateTestUtil.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.fate; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java index a36f8704460..6f39b63be11 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT_SimpleSuite.java @@ -74,7 +74,6 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.manager.merge.FindMergeableRangeTask.UnmergeableReason; import org.apache.accumulo.manager.tableOps.AbstractFateOperation; import org.apache.accumulo.manager.tableOps.FateEnv; @@ -94,6 +93,7 @@ import org.apache.accumulo.test.LargeSplitRowIT; import org.apache.accumulo.test.ample.metadata.TestAmple; import org.apache.accumulo.test.ample.metadata.TestAmple.TestServerAmpleImpl; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresITBase.java b/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresITBase.java index cfea22cd6f4..11f97461a4e 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresITBase.java @@ -48,7 +48,7 @@ import org.apache.accumulo.core.fate.ReadOnlyFateStore; import org.apache.accumulo.core.fate.Repo; import org.apache.accumulo.core.fate.zookeeper.ZooUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.zookeeper.KeeperException; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java b/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java index 6c8aa0dc6a7..c470c726aec 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/RangedTableLocksIT.java @@ -57,9 +57,9 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.zookeeper.LockRange; import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.manager.tableOps.Utils; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java index 9af9ad02f7c..e3007bb147e 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java @@ -18,8 +18,8 @@ */ package org.apache.accumulo.test.fate.meta; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.apache.accumulo.test.fate.TestLock.createDummyLockID; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java index 278996fd21c..f0ad481e6b3 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.fate.meta; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -34,7 +34,7 @@ import java.util.concurrent.Future; import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter; -import org.apache.accumulo.harness.WithTestNames; +import org.apache.accumulo.test.harness.WithTestNames; import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java index acfe46589d2..330e9f5e6ce 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/FateMutatorImplIT_SimpleSuite.java @@ -40,9 +40,9 @@ import org.apache.accumulo.core.fate.ReadOnlyFateStore; import org.apache.accumulo.core.fate.user.FateMutatorImpl; import org.apache.accumulo.core.fate.zookeeper.ZooUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.test.fate.FateITBase.TestRepo; import org.apache.accumulo.test.fate.FateTestRunner.TestEnv; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java index 5e4adc459fd..e0848bf5bcd 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT_SimpleSuite.java @@ -41,9 +41,9 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.fate.FateITBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java index bdc28cebef6..ebbf6da057e 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFatePoolsWatcherIT_SimpleSuite.java @@ -26,8 +26,8 @@ import org.apache.accumulo.core.fate.AbstractFateStore; import org.apache.accumulo.core.fate.FateStore; import org.apache.accumulo.core.fate.user.UserFateStore; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.test.fate.FatePoolsWatcherITBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java index 0a7ec1a6f73..47878c3e7dd 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT_SimpleSuite.java @@ -24,8 +24,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.test.fate.FateStatusEnforcementITBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java index c3a908f2c51..db22322d1df 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT_SimpleSuite.java @@ -33,9 +33,9 @@ import org.apache.accumulo.core.fate.FateStore; import org.apache.accumulo.core.fate.user.UserFateStore; import org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.fate.FateStoreITBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java index 47b2513dd9c..41f95b70d0a 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserMultipleStoresIT_SimpleSuite.java @@ -30,8 +30,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.test.fate.MultipleStoresITBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java index 9556f650258..d6051746f37 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloClientIT.java @@ -40,7 +40,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloConfigurationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloConfigurationIT.java index 4a2865f8dc9..9ea4c9f38f8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AccumuloConfigurationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AccumuloConfigurationIT.java @@ -25,10 +25,10 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.util.Timer; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java index c33c636954d..52cd4550f83 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT_SimpleSuite.java @@ -56,7 +56,7 @@ 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java index c051fea6f5c..713eabdf82b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java @@ -104,9 +104,9 @@ import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.tabletserver.log.LogEntry; import org.apache.accumulo.core.util.time.SteadyTime; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.metadata.AsyncConditionalTabletsMutatorImpl; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java index 75ee53147df..7680ee26831 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincIT.java @@ -32,7 +32,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java index a5848b9354f..4b219d73ad8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BadLocalityGroupMincIT.java @@ -32,7 +32,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java index 3b6670ffd37..42d512f8917 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java @@ -39,12 +39,12 @@ import org.apache.accumulo.core.client.admin.TabletAvailability; import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.BalanceIT; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java index c27128ec72d..ebe2a23175e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitIT.java @@ -35,7 +35,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java index fc4e9048542..3b1e053b1b7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java @@ -50,7 +50,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.threads.ThreadPools; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BigRootTabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BigRootTabletIT.java index 100e67ab4e8..7cadd0458ef 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BigRootTabletIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BigRootTabletIT.java @@ -29,8 +29,8 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java index 05b278d3aad..954b7d4ba0a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BinaryIT.java @@ -25,8 +25,8 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.NewTableConfiguration; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestBinaryRows; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BinaryStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BinaryStressIT.java index 4cbc5d67c56..eb1bf24b6b2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BinaryStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BinaryStressIT.java @@ -34,9 +34,9 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java index 461a647dbd3..05711faf2df 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterIT.java @@ -46,9 +46,9 @@ import org.apache.accumulo.core.file.keyfunctor.ColumnQualifierFunctor; import org.apache.accumulo.core.file.keyfunctor.RowFunctor; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java index 1f4e2508c56..887cb297ff0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkIT.java @@ -26,11 +26,11 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java index 1ba19ca08fa..36ed26a3fb3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewIT.java @@ -101,14 +101,14 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.constraints.MetadataConstraints; import org.apache.accumulo.server.constraints.SystemEnvironment; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewMetadataSkipIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewMetadataSkipIT.java index f92baada64b..98d7e30f488 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkNewMetadataSkipIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkNewMetadataSkipIT.java @@ -52,10 +52,10 @@ import org.apache.accumulo.core.metadata.UnreferencedTabletFile; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java index bd29f6e10e5..8a4c3d87c50 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java @@ -31,10 +31,10 @@ import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.util.Timer; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java index fe0419ee6d6..e0121641727 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java @@ -28,12 +28,12 @@ import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.util.Pair; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.ChaoticLoadBalancer; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java index c0c393af66f..ab70614f419 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT_SimpleSuite.java @@ -68,8 +68,8 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CombinerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CombinerIT.java index e54c0fff6d1..94e04656c8c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CombinerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CombinerIT.java @@ -33,7 +33,7 @@ import org.apache.accumulo.core.iterators.LongCombiner.Type; import org.apache.accumulo.core.iterators.user.SummingCombiner; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class CombinerIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CompactionITBase.java b/test/src/main/java/org/apache/accumulo/test/functional/CompactionITBase.java index a64de7b00e7..05c6a0ec3a5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionITBase.java @@ -38,9 +38,9 @@ import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; import org.apache.accumulo.core.spi.compaction.CompactionKind; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.compaction.ExternalCompactionTestUtils; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java index 32a82096c81..733448ed5e8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyIT.java @@ -33,8 +33,8 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java index 7072581acdc..67e5e03a54e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentDeleteTableIT.java @@ -49,7 +49,7 @@ import org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentTableNameOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentTableNameOperationsIT.java index 5d868cca8cc..571fbbd334f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentTableNameOperationsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConcurrentTableNameOperationsIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java index 0cf23c0759d..90b2238f9c8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConfigurableMacBase.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; @@ -32,14 +32,14 @@ import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.harness.AccumuloITBase; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.miniclusterImpl.ClusterServerConfiguration; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.miniclusterImpl.ZooKeeperBindException; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloITBase; import org.apache.accumulo.test.util.CertUtils; import org.apache.accumulo.tserver.memory.NativeMapLoader; import org.apache.commons.io.FileUtils; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java index d5f367e9781..c4811605111 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ConstraintIT.java @@ -40,9 +40,9 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.test.constraints.AlphaNumKeyConstraint; import org.apache.accumulo.test.constraints.NumericValueConstraint; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java index 6d01fdd7c8e..ed60631da6c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseIT.java @@ -38,7 +38,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java index 40cf9b0f512..df7f62df5d6 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateInitialSplitsIT.java @@ -41,9 +41,9 @@ import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TabletMergeability; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java index 2b727800aa8..0f54a3d6982 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersIT.java @@ -23,7 +23,7 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class CreateManyScannersIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java index e0ae33b3d4f..a25b55cb8b3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CredentialsIT.java @@ -42,7 +42,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DebugClientConnectionIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DebugClientConnectionIT.java index d977d76d8fb..7f09a9bb940 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DebugClientConnectionIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DebugClientConnectionIT.java @@ -30,8 +30,8 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.rpc.clients.TServerClient; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java index 5df68c32f75..479c1a6d308 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingIT.java @@ -31,8 +31,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java index e72dd7eb605..dde957c14f3 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteFailIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.iteratorsImpl.system.DeletingIterator.Behavior; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class DeleteFailIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java index ced58c0dec9..552fd5b91fc 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java @@ -25,11 +25,11 @@ import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestRandomDeletes; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class DeleteIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java index 62be26a053a..723a4088c4c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsIT.java @@ -49,7 +49,7 @@ import org.apache.accumulo.core.metadata.StoredTabletFile; import org.apache.accumulo.core.metadata.schema.DataFileValue; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java index e8b04be8f2c..ec88a12a742 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitIT.java @@ -37,7 +37,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java index c53e3d17921..427e9f5fae4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT_SimpleSuite.java @@ -28,7 +28,7 @@ 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java index 510b48342df..ba87fe2cf81 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ExitCodesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ExitCodesIT.java index 5adbcef89c5..c023f8ee9f8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ExitCodesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ExitCodesIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -36,12 +36,12 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.ResourceGroupId; import org.apache.accumulo.gc.SimpleGarbageCollector; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.manager.Manager; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo; import org.apache.accumulo.server.AbstractServer; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.accumulo.tserver.ScanServer; import org.apache.accumulo.tserver.TabletServer; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java index d7dff6be447..b00efe67e2f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java @@ -56,9 +56,9 @@ import org.apache.accumulo.core.manager.state.tables.TableState; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.SlowOps; import org.apache.accumulo.test.util.Wait; import org.apache.zookeeper.KeeperException; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java index 7e2df20c76c..d80be33af93 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationIT.java @@ -34,10 +34,10 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FileMetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FileMetadataIT.java index 7e986189e87..f9fd86fc7b2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FileMetadataIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FileMetadataIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.apache.accumulo.test.util.FileMetadataUtil.printAndVerifyFileMetadata; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -48,13 +48,13 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java index 122ffa2b4e5..bf83e71977b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FileNormalizationIT_SimpleSuite.java @@ -40,9 +40,9 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java index 8d847c9eeed..92a414a97db 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FindCompactionTmpFilesIT_SimpleSuite.java @@ -34,11 +34,11 @@ 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.SharedMiniClusterBase; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.tablets.TabletNameGenerator; import org.apache.accumulo.server.util.FindCompactionTmpFiles; import org.apache.accumulo.server.util.FindCompactionTmpFiles.DeleteStats; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FlushNoFileIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FlushNoFileIT.java index b70cb831a8c..f14e31d54b6 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/FlushNoFileIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/FlushNoFileIT.java @@ -49,7 +49,7 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java index 338a75fcbc8..0257ff136e5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java @@ -56,14 +56,14 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner; import org.apache.accumulo.core.spi.compaction.SimpleCompactionDispatcher; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterControl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.util.adminCommand.StopServers; import org.apache.accumulo.test.compaction.ExternalCompactionTestUtils; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTablet2IT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTablet2IT.java index d0aac318109..a0a24b47d07 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTablet2IT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTablet2IT.java @@ -27,9 +27,9 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.spi.fs.DelegatingChooser; import org.apache.accumulo.core.spi.fs.PreferredVolumeChooser; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTabletIT.java index 841e93239e7..015dd489c39 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTabletIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfClosedTabletIT.java @@ -40,11 +40,11 @@ import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.conf.store.TablePropKey; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java index dbed94ace4f..d38928c5b2f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java @@ -43,10 +43,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.accumulo.tserver.TabletServer; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java index 4b44fccfbd4..f27191ce49b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java @@ -41,7 +41,7 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope; import org.apache.accumulo.core.iteratorsImpl.IteratorConfigUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/IteratorMincClassCastBugIT.java b/test/src/main/java/org/apache/accumulo/test/functional/IteratorMincClassCastBugIT.java index ebc7a9e8fcb..d021c0b83d0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/IteratorMincClassCastBugIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/IteratorMincClassCastBugIT.java @@ -41,8 +41,8 @@ import org.apache.accumulo.core.iterators.IteratorEnvironment; import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.iterators.SortedKeyValueIterator; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java index fa06da9336f..968d1d5dd4a 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -20,7 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -64,13 +64,13 @@ 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.AccumuloITBase; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.MiniClusterHarness; -import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloITBase; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.MiniClusterHarness; +import org.apache.accumulo.test.harness.TestingKdc; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java index bf74c91166f..250e0377cdb 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.functional; import static java.util.concurrent.TimeUnit.MINUTES; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import java.time.Duration; @@ -40,10 +40,10 @@ import org.apache.accumulo.core.data.PartialKey; 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.MiniClusterHarness; -import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.test.harness.AccumuloITBase; +import org.apache.accumulo.test.harness.MiniClusterHarness; +import org.apache.accumulo.test.harness.TestingKdc; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java index 715f47f4701..76a2af827ff 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LargeRowIT.java @@ -38,11 +38,11 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java index 4ba9d0c9909..a5367c218bd 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LocalityGroupIT.java @@ -54,7 +54,7 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java index 2d44adf5c70..f3ce1953f34 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeIT.java @@ -30,7 +30,7 @@ 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.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java index 593f382dfd8..571dfefd647 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java @@ -45,7 +45,7 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java index aec39e56f7e..b28ef8d3d9d 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java @@ -80,8 +80,8 @@ import org.apache.accumulo.core.spi.ondemand.LastAccessTimeOnDemandTabletUnloader; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java index da869dcc041..004be25a1bb 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerFailoverIT.java @@ -26,12 +26,12 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManyWriteAheadLogsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManyWriteAheadLogsIT.java index 04130a74a68..06841fa7d09 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ManyWriteAheadLogsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ManyWriteAheadLogsIT.java @@ -36,11 +36,11 @@ import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Mutation; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.log.WalStateManager.WalState; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java index 8e1a2f5c1ee..355edd043e5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenIT.java @@ -34,11 +34,11 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java index 8c68a2597b2..6821fd1f539 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMajCIT.java @@ -41,10 +41,10 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMinCIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMinCIT.java index 75602895f36..c7b14e173c9 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMinCIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedMinCIT.java @@ -40,11 +40,11 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.metrics.MetricsInfo; import org.apache.accumulo.core.metrics.MetricsUtil; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java index 1d9c3c8148c..14b9ac16a44 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java @@ -51,11 +51,11 @@ import org.apache.accumulo.core.metrics.MetricsInfo; import org.apache.accumulo.core.metrics.MetricsUtil; import org.apache.accumulo.core.spi.metrics.LoggingMeterRegistryFactory; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.metrics.TestStatsDSink.Metric; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java index 148f5cc8e5d..334493cdb02 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsFlakyFateIT.java @@ -18,9 +18,9 @@ */ package org.apache.accumulo.test.functional; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.test.fate.FlakyFateManager; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsITBase.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsITBase.java index 5a43744bd95..0c044b0f6e2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsITBase.java @@ -74,11 +74,11 @@ import org.apache.accumulo.core.spi.compaction.CompactionKind; import org.apache.accumulo.core.util.FastFormat; import org.apache.accumulo.core.util.Merge; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java index cb06ccd4d96..a43750caaea 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MergeTabletsIT_SimpleSuite.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java index b29eba20037..d51d1cf6db6 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java @@ -60,7 +60,7 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.time.SteadyTime; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java index a4e3731eff2..ceacb53051f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/NativeMapIT.java @@ -20,7 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java index 2fc43ff3abf..28d057ae5db 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingFlakyAmpleIT.java @@ -29,10 +29,10 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.spi.ondemand.LastAccessTimeOnDemandTabletUnloader; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.test.ample.FlakyAmpleManager; import org.apache.accumulo.test.ample.FlakyAmpleTserver; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java index 418092bfdfa..06516ea91be 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/OnDemandTabletUnloadingIT.java @@ -53,8 +53,8 @@ import org.apache.accumulo.core.spi.ondemand.LastAccessTimeOnDemandTabletUnloader; import org.apache.accumulo.core.spi.scan.ConfigurableScanServerSelector; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.util.Wait; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java index 66a5cb7eed5..7a4085680d8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PerTableCryptoIT.java @@ -49,11 +49,11 @@ import org.apache.accumulo.core.spi.crypto.AESCryptoService; import org.apache.accumulo.core.spi.crypto.GenericCryptoServiceFactory; import org.apache.accumulo.core.spi.crypto.PerTableCryptoServiceFactory; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.log.WalStateManager; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.tserver.logger.LogReader; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java index f18f8196c04..9dfe7d05d0c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -56,7 +56,7 @@ 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.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ProcessMetricsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ProcessMetricsIT.java index 06927af3d42..2b96c30454f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ProcessMetricsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ProcessMetricsIT.java @@ -49,10 +49,10 @@ import org.apache.accumulo.core.metrics.MetricsUtil; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.metrics.TestStatsDRegistryFactory; import org.apache.accumulo.test.metrics.TestStatsDSink; import org.apache.accumulo.test.util.Wait; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java index 24a1773dfed..a4d4e1f5cb8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -19,8 +19,8 @@ package org.apache.accumulo.test.functional; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; -import static org.apache.accumulo.harness.AccumuloITBase.STANDALONE_CAPABLE_CLUSTER; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.STANDALONE_CAPABLE_CLUSTER; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -49,13 +49,13 @@ import org.apache.accumulo.core.lock.ServiceLock; import org.apache.accumulo.core.lock.ServiceLockData; import org.apache.accumulo.core.util.MonitorUtil; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java index 4e9340943a1..431b7f4f870 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RenameIT.java @@ -22,10 +22,10 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class RenameIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java index 2f42b8391d6..0360aa430a2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartIT.java @@ -39,13 +39,13 @@ import org.apache.accumulo.core.lock.ServiceLockData; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.zookeeper.ZooCache; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java index 58ecffd218c..7fdaacc0205 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java @@ -30,12 +30,12 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java index d983884f727..55c0f1a048f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteIT.java @@ -38,8 +38,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java index 5b974944d89..c9c0d33d225 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIdIT.java @@ -61,7 +61,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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java index a27507174d8..c1caae73cc1 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorIT.java @@ -54,7 +54,7 @@ import org.apache.accumulo.core.iterators.WrappingIterator; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java index 2536d2e971e..3211b8c73ba 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeIT.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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java index fb7911d46db..872d4cf3f2c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutIT.java @@ -39,8 +39,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ScannerContextIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ScannerContextIT.java index 58857a1f7d2..7c7ea5d8490 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ScannerContextIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ScannerContextIT.java @@ -43,8 +43,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java index 5b8f41301d1..f2f955034ac 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorIT.java @@ -38,7 +38,7 @@ 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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java index 51bbf558b75..35cbc310d1b 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SessionDurabilityIT.java @@ -38,9 +38,9 @@ import org.apache.accumulo.core.data.ConditionalMutation; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.ProcessReference; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java index 3f286c1a6c1..85dfdf053f7 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.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.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java index 2acdc478cc5..a63050583d4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java @@ -72,7 +72,6 @@ import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.Pair; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; @@ -80,6 +79,7 @@ import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java index c2251091cfa..f0c11a29f96 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/StartIT.java @@ -24,8 +24,8 @@ import java.time.Duration; import org.apache.accumulo.cluster.ClusterControl; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.start.TestMain; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class StartIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java index cee7832f267..e37fdd61b49 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SummaryIT.java @@ -84,9 +84,9 @@ import org.apache.accumulo.core.iterators.Filter; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.TablePermission; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java index 33b387c93cb..a21d4fcf0a0 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TableIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -39,11 +39,11 @@ import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletAvailabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletAvailabilityIT.java index 7d1ac7d1ebc..6402f3ef0c5 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletAvailabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletAvailabilityIT.java @@ -46,7 +46,7 @@ import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.RowRange; import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java index 531a9ef0d2c..f0bd2b81991 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java @@ -37,8 +37,8 @@ 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.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletManagementIteratorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletManagementIteratorIT.java index 90a184f9e43..8936f6e80bd 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletManagementIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletManagementIteratorIT.java @@ -23,7 +23,7 @@ import static org.apache.accumulo.core.manager.state.TabletManagement.ManagementAction.NEEDS_RECOVERY; import static org.apache.accumulo.core.manager.state.TabletManagement.ManagementAction.NEEDS_SPLITTING; import static org.apache.accumulo.core.manager.state.TabletManagement.ManagementAction.NEEDS_VOLUME_REPLACEMENT; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -98,12 +98,12 @@ import org.apache.accumulo.core.tabletserver.log.LogEntry; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.core.util.time.SteadyTime; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.manager.LiveTServerSet; import org.apache.accumulo.server.manager.state.TabletManagementIterator; import org.apache.accumulo.server.manager.state.TabletManagementParameters; import org.apache.accumulo.server.metadata.TabletsMutatorImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletMergeabilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletMergeabilityIT.java index 4cfc94c35a1..91d4517ebd4 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletMergeabilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletMergeabilityIT.java @@ -53,13 +53,13 @@ import org.apache.accumulo.core.metadata.schema.MetadataSchema; import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.FileMetadataUtil; import org.apache.accumulo.test.util.Wait; import org.apache.commons.lang3.StringUtils; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletResourceGroupBalanceIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletResourceGroupBalanceIT.java index 0f44b423355..7dca8195189 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletResourceGroupBalanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletResourceGroupBalanceIT.java @@ -55,11 +55,11 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location; import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletsMetadataIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletsMetadataIT_SimpleSuite.java index 10c1a17348d..7c9b319d8fd 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletsMetadataIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletsMetadataIT_SimpleSuite.java @@ -42,7 +42,7 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; import org.apache.accumulo.core.metadata.schema.TabletsMetadata; import org.apache.accumulo.core.metadata.schema.filters.HasColumnFilter; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java index 773a18b84f8..5e7d6d1b31f 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT_SimpleSuite.java index be8a3b9cf97..9d9b102af17 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TimeoutIT_SimpleSuite.java @@ -37,7 +37,7 @@ import org.apache.accumulo.core.clientImpl.ThriftScanner; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java index 96cc472f8c7..40fe8b4c87e 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/VisibilityIT.java @@ -46,7 +46,7 @@ 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.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java index d9980933515..3a672c4ab53 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WALSunnyDayIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.functional; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java index 1bbceac3ece..91e1a176017 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogEncryptedIT.java @@ -25,8 +25,8 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.spi.crypto.AESCryptoService; import org.apache.accumulo.core.spi.crypto.GenericCryptoServiceFactory; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java index 7b617f28245..d9e5fe314b8 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteAheadLogIT.java @@ -21,12 +21,12 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java index cce3fd08c14..de8fe05aa88 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/WriteLotsIT.java @@ -27,11 +27,11 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.BatchWriterConfig; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestIngest.IngestParams; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.junit.jupiter.api.Test; public class WriteLotsIT extends AccumuloClusterHarness { diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterConfiguration.java similarity index 90% rename from test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java rename to test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterConfiguration.java index d944d7a7f93..f1094668e0a 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterConfiguration.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness.conf; +package org.apache.accumulo.test.harness; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; -import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; +import org.apache.accumulo.test.harness.AccumuloClusterHarness.ClusterType; /** * Base functionality that must be provided as configuration to the test diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java similarity index 97% rename from test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java rename to test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java index 047d9562ab9..001201aabc9 100644 --- a/test/src/main/java/org/apache/accumulo/harness/AccumuloClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterHarness.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.STANDALONE_CAPABLE_CLUSTER; +import static org.apache.accumulo.test.harness.AccumuloITBase.STANDALONE_CAPABLE_CLUSTER; import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.io.IOException; @@ -38,9 +38,6 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.clientImpl.ClientInfo; -import org.apache.accumulo.harness.conf.AccumuloClusterConfiguration; -import org.apache.accumulo.harness.conf.AccumuloClusterPropertyConfiguration; -import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterPropertyConfiguration.java similarity index 98% rename from test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java rename to test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterPropertyConfiguration.java index e5029d77d24..ed0378a20dd 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloClusterPropertyConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloClusterPropertyConfiguration.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness.conf; +package org.apache.accumulo.test.harness; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; +import static org.apache.accumulo.test.harness.AccumuloClusterHarness.ClusterType; import java.io.BufferedReader; import java.io.IOException; @@ -30,7 +31,6 @@ import java.util.Map.Entry; import java.util.Properties; -import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloITBase.java similarity index 99% rename from test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java rename to test/src/main/java/org/apache/accumulo/test/harness/AccumuloITBase.java index 714ab946d51..5e01447fc34 100644 --- a/test/src/main/java/org/apache/accumulo/harness/AccumuloITBase.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloITBase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static com.google.common.collect.MoreCollectors.onlyElement; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java similarity index 94% rename from test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java rename to test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java index dabe07b8071..6780981afc0 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/AccumuloMiniClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/AccumuloMiniClusterConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness.conf; +package org.apache.accumulo.test.harness; import java.io.IOException; import java.util.Map; @@ -25,9 +25,7 @@ import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.KerberosToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; -import org.apache.accumulo.harness.MiniClusterHarness; +import org.apache.accumulo.test.harness.AccumuloClusterHarness.ClusterType; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; diff --git a/test/src/main/java/org/apache/accumulo/harness/MiniClusterConfigurationCallback.java b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterConfigurationCallback.java similarity index 97% rename from test/src/main/java/org/apache/accumulo/harness/MiniClusterConfigurationCallback.java rename to test/src/main/java/org/apache/accumulo/test/harness/MiniClusterConfigurationCallback.java index a2fcedaedb1..a01c978dc52 100644 --- a/test/src/main/java/org/apache/accumulo/harness/MiniClusterConfigurationCallback.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterConfigurationCallback.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java similarity index 99% rename from test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java rename to test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java index 670aaba303f..9fa60321098 100644 --- a/test/src/main/java/org/apache/accumulo/harness/MiniClusterHarness.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/MiniClusterHarness.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static com.google.common.base.Preconditions.checkArgument; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java similarity index 98% rename from test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java rename to test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java index b1d90ce7f91..11a5ae01d1a 100644 --- a/test/src/main/java/org/apache/accumulo/harness/SharedMiniClusterBase.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/SharedMiniClusterBase.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import java.io.File; import java.lang.StackWalker.StackFrame; diff --git a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java similarity index 98% rename from test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java rename to test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java index 2130403f30b..91ebaa8b1c7 100644 --- a/test/src/main/java/org/apache/accumulo/harness/conf/StandaloneAccumuloClusterConfiguration.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/StandaloneAccumuloClusterConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness.conf; +package org.apache.accumulo.test.harness; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -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.clientImpl.ClientInfo; -import org.apache.accumulo.harness.AccumuloClusterHarness.ClusterType; +import org.apache.accumulo.test.harness.AccumuloClusterHarness.ClusterType; import org.apache.hadoop.fs.Path; import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; diff --git a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java similarity index 99% rename from test/src/main/java/org/apache/accumulo/harness/TestingKdc.java rename to test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java index 2b76541444d..3e255126586 100644 --- a/test/src/main/java/org/apache/accumulo/harness/TestingKdc.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/TestingKdc.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; diff --git a/test/src/main/java/org/apache/accumulo/harness/Timeout.java b/test/src/main/java/org/apache/accumulo/test/harness/Timeout.java similarity index 98% rename from test/src/main/java/org/apache/accumulo/harness/Timeout.java rename to test/src/main/java/org/apache/accumulo/test/harness/Timeout.java index 038e42b2183..59bc8fbb090 100644 --- a/test/src/main/java/org/apache/accumulo/harness/Timeout.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/Timeout.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively; diff --git a/test/src/main/java/org/apache/accumulo/harness/WithTestNames.java b/test/src/main/java/org/apache/accumulo/test/harness/WithTestNames.java similarity index 97% rename from test/src/main/java/org/apache/accumulo/harness/WithTestNames.java rename to test/src/main/java/org/apache/accumulo/test/harness/WithTestNames.java index d053a17eedc..50fc57053e7 100644 --- a/test/src/main/java/org/apache/accumulo/harness/WithTestNames.java +++ b/test/src/main/java/org/apache/accumulo/test/harness/WithTestNames.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.accumulo.harness; +package org.apache.accumulo.test.harness; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; diff --git a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java index 59315f82344..8324e84eb40 100644 --- a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java +++ b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.lock; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockPathsIT.java b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockPathsIT.java index d35c98b5cab..6b8e00d5e34 100644 --- a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockPathsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockPathsIT.java @@ -27,9 +27,9 @@ import org.apache.accumulo.core.lock.ServiceLockPaths; import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java index e69ebec9dc8..d298105e73d 100644 --- a/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/manager/SuspendedTabletsIT.java @@ -58,13 +58,13 @@ import org.apache.accumulo.core.metadata.schema.TabletMetadata; import org.apache.accumulo.core.metadata.schema.TabletMetadata.LocationType; import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.miniclusterImpl.ProcessNotFoundException; import org.apache.accumulo.miniclusterImpl.ProcessReference; import org.apache.accumulo.test.functional.TabletResourceGroupBalanceIT; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.accumulo.tserver.TabletServer; import org.apache.hadoop.conf.Configuration; diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/ThriftBehaviorIT.java b/test/src/main/java/org/apache/accumulo/test/rpc/ThriftBehaviorIT.java index e72f93b13de..9d0fce73c4b 100644 --- a/test/src/main/java/org/apache/accumulo/test/rpc/ThriftBehaviorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/rpc/ThriftBehaviorIT.java @@ -19,12 +19,12 @@ package org.apache.accumulo.test.rpc; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.apache.accumulo.harness.WithTestNames; +import org.apache.accumulo.test.harness.WithTestNames; import org.apache.accumulo.test.rpc.thrift.SimpleThriftService; import org.apache.thrift.TApplicationException; import org.apache.thrift.TException; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java index 3e7be065447..1b91b623cfb 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ConfigSetIT_SimpleSuite.java @@ -20,13 +20,13 @@ import static org.apache.accumulo.core.conf.Property.COMPACTION_SERVICE_DEFAULT_GROUPS; import static org.apache.accumulo.core.conf.Property.MONITOR_RESOURCES_EXTERNAL; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; 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.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java index 7518cc6680f..e1cfb4189a2 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellAuthenticatorIT_SimpleSuite.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.TimeZone; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.shell.MockShell.TestShell; import org.apache.accumulo.test.shell.ShellIT.StringInputStream; import org.apache.accumulo.test.shell.ShellIT.TestOutputStream; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellConfigIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellConfigIT.java index 1e624c921cc..f0469c5e739 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellConfigIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellConfigIT.java @@ -30,10 +30,10 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.clientImpl.Namespace; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.harness.AccumuloClusterHarness; -import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl; import org.apache.accumulo.test.FairVolumeChooser; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; +import org.apache.accumulo.test.harness.StandaloneAccumuloClusterConfiguration; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateNamespaceIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateNamespaceIT.java index 0748a3fdc24..b16e36ea814 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateNamespaceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateNamespaceIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.shell; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -26,9 +26,9 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateTableIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateTableIT.java index a4c3870c2e0..6b8ab6d3dbf 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellCreateTableIT.java @@ -22,7 +22,7 @@ import static java.nio.file.Files.newBufferedReader; import static java.util.Objects.requireNonNull; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; @@ -54,10 +54,10 @@ import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.iterators.IteratorUtil; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.conf.store.TablePropKey; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; 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.java index 307487661b6..fab42b0446c 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.shell; import static org.apache.accumulo.core.conf.Property.COMPACTION_WARN_TIME; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -39,9 +39,9 @@ import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.conf.PropertyType; import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.server.conf.TableConfiguration; import org.apache.accumulo.shell.Shell; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.shell.MockShell.TestShell; import org.jline.reader.LineReader; import org.jline.reader.LineReaderBuilder; diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java index 0c024105133..4283c8d837d 100644 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java @@ -21,7 +21,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.accumulo.core.util.LazySingletons.RANDOM; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -91,12 +91,12 @@ import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory; import org.apache.accumulo.core.util.format.Formatter; import org.apache.accumulo.core.util.format.FormatterConfig; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.ImportExportIT; import org.apache.accumulo.test.functional.SlowIterator; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java index e97eeb09719..f277baeeee5 100644 --- a/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java +++ b/test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.start; -import static org.apache.accumulo.harness.AccumuloITBase.SUNNY_DAY; +import static org.apache.accumulo.test.harness.AccumuloITBase.SUNNY_DAY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/test/src/main/java/org/apache/accumulo/test/suites/SimpleSharedMacTestSuiteIT.java b/test/src/main/java/org/apache/accumulo/test/suites/SimpleSharedMacTestSuiteIT.java index 68ec976a81d..58f6b4bf497 100644 --- a/test/src/main/java/org/apache/accumulo/test/suites/SimpleSharedMacTestSuiteIT.java +++ b/test/src/main/java/org/apache/accumulo/test/suites/SimpleSharedMacTestSuiteIT.java @@ -18,8 +18,8 @@ */ package org.apache.accumulo.test.suites; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.junit.platform.suite.api.AfterSuite; import org.junit.platform.suite.api.BeforeSuite; import org.junit.platform.suite.api.IncludeClassNamePatterns; diff --git a/test/src/main/java/org/apache/accumulo/test/upgrade/ScanServerUpgrade11to12TestIT.java b/test/src/main/java/org/apache/accumulo/test/upgrade/ScanServerUpgrade11to12TestIT.java index bb922533a1d..2d064e56ec6 100644 --- a/test/src/main/java/org/apache/accumulo/test/upgrade/ScanServerUpgrade11to12TestIT.java +++ b/test/src/main/java/org/apache/accumulo/test/upgrade/ScanServerUpgrade11to12TestIT.java @@ -18,7 +18,7 @@ */ package org.apache.accumulo.test.upgrade; -import static org.apache.accumulo.harness.AccumuloITBase.MINI_CLUSTER_ONLY; +import static org.apache.accumulo.test.harness.AccumuloITBase.MINI_CLUSTER_ONLY; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map.Entry; @@ -42,11 +42,11 @@ import org.apache.accumulo.core.metadata.ScanServerRefTabletFile; import org.apache.accumulo.core.metadata.schema.Ample; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.harness.MiniClusterConfigurationCallback; -import org.apache.accumulo.harness.SharedMiniClusterBase; import org.apache.accumulo.manager.upgrade.Upgrader11to12; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.MiniClusterConfigurationCallback; +import org.apache.accumulo.test.harness.SharedMiniClusterBase; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeIT.java b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeIT.java index 20986e29df7..5554d6e2def 100644 --- a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeIT.java +++ b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeIT.java @@ -36,12 +36,12 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.zookeeper.ZooSession; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.manager.Manager; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.server.AbstractServer; import org.apache.accumulo.server.ServerContext; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; import org.junit.jupiter.api.Test; diff --git a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeProgressTrackerIT.java b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeProgressTrackerIT.java index a8ae38128fd..1d15b6438af 100644 --- a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeProgressTrackerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeProgressTrackerIT.java @@ -20,7 +20,7 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.accumulo.core.util.LazySingletons.GSON; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; diff --git a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeUtilIT.java b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeUtilIT.java index 48d903cce7a..c4c911746ba 100644 --- a/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeUtilIT.java +++ b/test/src/main/java/org/apache/accumulo/test/upgrade/UpgradeUtilIT.java @@ -36,13 +36,13 @@ import org.apache.accumulo.core.fate.zookeeper.ZooUtil; import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.core.volume.Volume; -import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.server.AccumuloDataVersion; import org.apache.accumulo.server.ServerContext; import org.apache.accumulo.server.ServerDirs; import org.apache.accumulo.server.util.UpgradeUtil; import org.apache.accumulo.server.util.upgrade.UpgradeProgress; +import org.apache.accumulo.test.harness.AccumuloClusterHarness; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; diff --git a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java index fdd70deaa4f..d3269eb4dc7 100644 --- a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java +++ b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.zookeeper; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperChrootWatchedPathsIT.java b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperChrootWatchedPathsIT.java index 589f99f9fe8..18bc49b7390 100644 --- a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperChrootWatchedPathsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperChrootWatchedPathsIT.java @@ -19,7 +19,7 @@ package org.apache.accumulo.test.zookeeper; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; +import static org.apache.accumulo.test.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER; import static org.apache.zookeeper.Watcher.Event.EventType.NodeChildrenChanged; import static org.apache.zookeeper.Watcher.Event.EventType.NodeCreated; import static org.apache.zookeeper.Watcher.Event.EventType.NodeDataChanged; @@ -40,7 +40,7 @@ import org.apache.accumulo.core.fate.zookeeper.ZooUtil; import org.apache.accumulo.core.zookeeper.ZooSession; import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil; -import org.apache.accumulo.harness.WithTestNames; +import org.apache.accumulo.test.harness.WithTestNames; import org.apache.accumulo.test.util.Wait; import org.apache.zookeeper.AddWatchMode; import org.apache.zookeeper.CreateMode; diff --git a/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java b/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java index 6f709521d9d..a1b83d06e3b 100644 --- a/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java +++ b/test/src/test/java/org/apache/accumulo/test/security/KerberosTokenEmbeddedKDCTest.java @@ -25,8 +25,8 @@ import java.io.File; import org.apache.accumulo.core.client.security.tokens.KerberosToken; -import org.apache.accumulo.harness.TestingKdc; -import org.apache.accumulo.harness.WithTestNames; +import org.apache.accumulo.test.harness.TestingKdc; +import org.apache.accumulo.test.harness.WithTestNames; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; diff --git a/test/src/test/java/org/apache/accumulo/test/util/CertUtilsTest.java b/test/src/test/java/org/apache/accumulo/test/util/CertUtilsTest.java index c512f5d0147..90db6ec425d 100644 --- a/test/src/test/java/org/apache/accumulo/test/util/CertUtilsTest.java +++ b/test/src/test/java/org/apache/accumulo/test/util/CertUtilsTest.java @@ -30,7 +30,7 @@ import java.security.SignatureException; import java.security.cert.Certificate; -import org.apache.accumulo.harness.WithTestNames; +import org.apache.accumulo.test.harness.WithTestNames; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir;