ACCUMULO-4437 Annotate remaining ITs * Annotate CyclicReplcationIT and AccumuloOutputFormatIT as MiniClusterOnlyTests * Rename test categories to reflect explicit intentions, based on conversation in JIRA * Minor grammatical change: make category names plural (the category describes a set of tests)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cead3978 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cead3978 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cead3978 Branch: refs/heads/master Commit: cead3978fea56d13be675bb0a0edc5049186b5fe Parents: 3bc3c6d Author: Christopher Tubbs <[email protected]> Authored: Wed Aug 31 19:13:24 2016 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Thu Sep 1 13:16:50 2016 -0400 ---------------------------------------------------------------------- TESTING.md | 10 ++++---- .../accumulo/harness/AccumuloClusterIT.java | 4 ++-- .../accumulo/harness/SharedMiniClusterIT.java | 4 ++-- .../accumulo/test/AccumuloOutputFormatIT.java | 3 +++ .../org/apache/accumulo/test/NamespacesIT.java | 4 ++-- .../org/apache/accumulo/test/ShellServerIT.java | 4 ++-- .../test/categories/AnyClusterTest.java | 25 -------------------- .../test/categories/MiniClusterOnlyTest.java | 24 ------------------- .../test/categories/MiniClusterOnlyTests.java | 22 +++++++++++++++++ .../StandaloneCapableClusterTests.java | 23 ++++++++++++++++++ .../accumulo/test/functional/ClassLoaderIT.java | 4 ++-- .../test/functional/ConfigurableMacIT.java | 4 ++-- .../accumulo/test/functional/ExamplesIT.java | 4 ++-- .../accumulo/test/functional/KerberosIT.java | 4 ++-- .../test/functional/KerberosProxyIT.java | 4 ++-- .../test/functional/KerberosRenewalIT.java | 4 ++-- .../accumulo/test/functional/PermissionsIT.java | 4 ++-- .../accumulo/test/functional/ReadWriteIT.java | 4 ++-- .../accumulo/test/functional/TableIT.java | 4 ++-- .../accumulo/test/proxy/TCompactProxyIT.java | 4 ++-- .../test/replication/CyclicReplicationIT.java | 6 ++--- .../test/replication/KerberosReplicationIT.java | 4 ++-- 22 files changed, 87 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/TESTING.md ---------------------------------------------------------------------- diff --git a/TESTING.md b/TESTING.md index 709eb18..c3a9e06 100644 --- a/TESTING.md +++ b/TESTING.md @@ -63,7 +63,7 @@ These tests will run by default during the `integration-test` lifecycle phase us To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.SunnyDayTests` To execute everything except these tests, use `mvn verify -Dfailsafe.excludedGroups=org.apache.accumulo.test.categories.SunnyDayTests` -### MiniAccumuloCluster (`MiniClusterOnlyTest`) +### MiniAccumuloCluster (`MiniClusterOnlyTests`) These tests use MiniAccumuloCluster (MAC) which is a multi-process "implementation" of Accumulo, managed through Java APIs. This MiniAccumuloCluster has the ability to use the local filesystem or Apache Hadoop's @@ -76,9 +76,10 @@ increases the actual runtime of the test by, on average, 10x. Some times the tes test is being destructive or some special environment setup (e.g. Kerberos). These tests will run by default during the `integration-test` lifecycle phase using `mvn verify`. -To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.MiniClusterOnlyTest` +To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.MiniClusterOnlyTests` +To execute everything except these tests, use `mvn verify -Dfailsafe.excludedGroups=org.apache.accumulo.test.categories.MiniClusterOnlyTests` -### Standalone Cluster (`AnyClusterTest`) +### Standalone Cluster (`StandaloneCapableClusterTests`) An alternative to the MiniAccumuloCluster for testing, a standalone Accumulo cluster can also be configured for use by most tests. This requires a manual step of building and deploying the Accumulo cluster by hand. The build can then be @@ -91,7 +92,8 @@ providing a Java properties file on the Maven command line. The use of a propert typically a fixed file per standalone cluster you want to run the tests against. These tests will run by default during the `integration-test` lifecycle phase using `mvn verify`. -To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.AnyClusterTest` +To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.StandaloneCapableClusterTests` +To execute everything except these tests, use `mvn verify -Dfailsafe.excludedGroups=org.apache.accumulo.test.categories.StandaloneCapableClusterTests` ## Configuration for Standalone clusters http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/harness/AccumuloClusterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/harness/AccumuloClusterIT.java b/test/src/test/java/org/apache/accumulo/harness/AccumuloClusterIT.java index 436ceb5..c801886 100644 --- a/test/src/test/java/org/apache/accumulo/harness/AccumuloClusterIT.java +++ b/test/src/test/java/org/apache/accumulo/harness/AccumuloClusterIT.java @@ -43,7 +43,7 @@ import org.apache.accumulo.harness.conf.AccumuloMiniClusterConfiguration; import org.apache.accumulo.harness.conf.StandaloneAccumuloClusterConfiguration; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.categories.AnyClusterTest; +import org.apache.accumulo.test.categories.StandaloneCapableClusterTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; /** * General Integration-Test base class that provides access to an Accumulo instance for testing. This instance could be MAC or a standalone instance. */ -@Category(AnyClusterTest.class) +@Category(StandaloneCapableClusterTests.class) public abstract class AccumuloClusterIT extends AccumuloIT implements MiniClusterConfigurationCallback, ClusterUsers { private static final Logger log = LoggerFactory.getLogger(AccumuloClusterIT.class); private static final String TRUE = Boolean.toString(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/harness/SharedMiniClusterIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/harness/SharedMiniClusterIT.java b/test/src/test/java/org/apache/accumulo/harness/SharedMiniClusterIT.java index 644055f..cc08d7a 100644 --- a/test/src/test/java/org/apache/accumulo/harness/SharedMiniClusterIT.java +++ b/test/src/test/java/org/apache/accumulo/harness/SharedMiniClusterIT.java @@ -31,7 +31,7 @@ import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; * a method annotated with the {@link org.junit.BeforeClass} JUnit annotation and {@link #stopMiniCluster()} in a method annotated with the * {@link org.junit.AfterClass} JUnit annotation. */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public abstract class SharedMiniClusterIT extends AccumuloIT implements ClusterUsers { private static final Logger log = LoggerFactory.getLogger(SharedMiniClusterIT.class); public static final String TRUE = Boolean.toString(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java index 20556ab..f54e285 100644 --- a/test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java +++ b/test/src/test/java/org/apache/accumulo/test/AccumuloOutputFormatIT.java @@ -36,6 +36,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.MiniAccumuloConfig; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.RecordWriter; @@ -43,12 +44,14 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; /** * Prevent regression of ACCUMULO-3709. Exists as a mini test because mock instance doesn't produce this error when dynamically changing the table permissions. */ +@Category(MiniClusterOnlyTests.class) public class AccumuloOutputFormatIT { private static final String TABLE = "abc"; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java index 6ec2127..51d3739 100644 --- a/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/NamespacesIT.java @@ -77,7 +77,7 @@ import org.apache.accumulo.core.security.TablePermission; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.examples.simple.constraints.NumericValueConstraint; import org.apache.accumulo.harness.AccumuloClusterIT; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.io.Text; import org.junit.After; import org.junit.Assume; @@ -87,7 +87,7 @@ import org.junit.experimental.categories.Category; // Testing default namespace configuration with inheritance requires altering the system state and restoring it back to normal // Punt on this for now and just let it use a minicluster. -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class NamespacesIT extends AccumuloClusterIT { private Connector c; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index 4b7e860..6925e85 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -64,7 +64,7 @@ import org.apache.accumulo.harness.MiniClusterConfigurationCallback; import org.apache.accumulo.harness.SharedMiniClusterIT; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.shell.Shell; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.accumulo.test.categories.SunnyDayTests; import org.apache.accumulo.test.functional.SlowIterator; import org.apache.accumulo.tracer.TraceServer; @@ -93,7 +93,7 @@ import com.google.common.collect.Iterators; import jline.console.ConsoleReader; -@Category({MiniClusterOnlyTest.class, SunnyDayTests.class}) +@Category({MiniClusterOnlyTests.class, SunnyDayTests.class}) public class ShellServerIT extends SharedMiniClusterIT { public static class TestOutputStream extends OutputStream { StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/categories/AnyClusterTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/categories/AnyClusterTest.java b/test/src/test/java/org/apache/accumulo/test/categories/AnyClusterTest.java deleted file mode 100644 index 765057e..0000000 --- a/test/src/test/java/org/apache/accumulo/test/categories/AnyClusterTest.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to you under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.test.categories; - -/** - * Interface to be used with JUnit Category annotation to denote that the IntegrationTest can be used with any kind of cluster (a MiniAccumuloCluster or a - * StandaloneAccumuloCluster). - */ -public interface AnyClusterTest { - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java b/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java deleted file mode 100644 index 1a972ef..0000000 --- a/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTest.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to you under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.accumulo.test.categories; - -/** - * Interface to be used with JUnit Category annotation to denote that the IntegrationTest requires the use of a MiniAccumuloCluster. - */ -public interface MiniClusterOnlyTest { - -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java b/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java new file mode 100644 index 0000000..57d6b02 --- /dev/null +++ b/test/src/test/java/org/apache/accumulo/test/categories/MiniClusterOnlyTests.java @@ -0,0 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.test.categories; + +/** + * Interface to be used with JUnit Category annotation to denote that the IntegrationTest requires the use of a MiniAccumuloCluster. + */ +public interface MiniClusterOnlyTests {} http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java b/test/src/test/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java new file mode 100644 index 0000000..dd5003b --- /dev/null +++ b/test/src/test/java/org/apache/accumulo/test/categories/StandaloneCapableClusterTests.java @@ -0,0 +1,23 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.test.categories; + +/** + * Interface to be used with JUnit Category annotation to denote that the IntegrationTest can be used with any kind of cluster (a MiniAccumuloCluster or a + * StandaloneAccumuloCluster). + */ +public interface StandaloneCapableClusterTests {} http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java index d09e2a6..7b2f4b5 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ClassLoaderIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.harness.AccumuloClusterIT; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.hamcrest.CoreMatchers; @@ -49,7 +49,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class ClassLoaderIT extends AccumuloClusterIT { private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000; http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java index 6d04610..27dab28 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java @@ -40,7 +40,7 @@ import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ZooKeeperBindException; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.accumulo.test.util.CertUtils; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; @@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory; * General Integration-Test base class that provides access to a {@link MiniAccumuloCluster} for testing. Tests using these typically do very disruptive things * to the instance, and require specific configuration. Most tests don't need this level of control and should extend {@link AccumuloClusterIT} instead. */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class ConfigurableMacIT extends AccumuloIT { public static final Logger log = LoggerFactory.getLogger(ConfigurableMacIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java index 9ae4dfb..8965107 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java @@ -87,7 +87,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl.LogWriter; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.start.Main; import org.apache.accumulo.test.TestIngest; -import org.apache.accumulo.test.categories.AnyClusterTest; +import org.apache.accumulo.test.categories.StandaloneCapableClusterTests; import org.apache.accumulo.test.categories.SunnyDayTests; import org.apache.accumulo.tracer.TraceServer; import org.apache.hadoop.conf.Configuration; @@ -106,7 +106,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -@Category({AnyClusterTest.class, SunnyDayTests.class}) +@Category({StandaloneCapableClusterTests.class, SunnyDayTests.class}) public class ExamplesIT extends AccumuloClusterIT { private static final Logger log = LoggerFactory.getLogger(ExamplesIT.class); private static final BatchWriterOpts bwOpts = new BatchWriterOpts(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java b/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java index a3da827..bb61391 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/KerberosIT.java @@ -68,7 +68,7 @@ import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; @@ -88,7 +88,7 @@ import com.google.common.collect.Sets; /** * MAC test which uses {@link MiniKdc} to simulate ta secure environment. Can be used as a sanity check for Kerberos/SASL testing. */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class KerberosIT extends AccumuloIT { private static final Logger log = LoggerFactory.getLogger(KerberosIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java index 2bef539..e03a1a8 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/KerberosProxyIT.java @@ -56,7 +56,7 @@ import org.apache.accumulo.proxy.thrift.ScanResult; import org.apache.accumulo.proxy.thrift.TimeType; import org.apache.accumulo.proxy.thrift.WriterOptions; import org.apache.accumulo.server.util.PortUtils; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.security.UserGroupInformation; @@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory; /** * Tests impersonation of clients by the proxy over SASL */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class KerberosProxyIT extends AccumuloIT { private static final Logger log = LoggerFactory.getLogger(KerberosProxyIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java b/test/src/test/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java index 07e0662..a0ad084 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/KerberosRenewalIT.java @@ -45,7 +45,7 @@ import org.apache.accumulo.harness.MiniClusterHarness; import org.apache.accumulo.harness.TestingKdc; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeysPublic; import org.apache.hadoop.minikdc.MiniKdc; @@ -64,7 +64,7 @@ import com.google.common.collect.Iterables; /** * MAC test which uses {@link MiniKdc} to simulate ta secure environment. Can be used as a sanity check for Kerberos/SASL testing. */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class KerberosRenewalIT extends AccumuloIT { private static final Logger log = LoggerFactory.getLogger(KerberosRenewalIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java index 6967a48..30ac069 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/PermissionsIT.java @@ -53,7 +53,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.AccumuloClusterIT; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.io.Text; import org.junit.Assume; import org.junit.Before; @@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory; // This test verifies the default permissions so a clean instance must be used. A shared instance might // not be representative of a fresh installation. -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class PermissionsIT extends AccumuloClusterIT { private static final Logger log = LoggerFactory.getLogger(PermissionsIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java index d6af3a1..a6b7305 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java @@ -89,7 +89,7 @@ import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.TestMultiTableIngest; import org.apache.accumulo.test.VerifyIngest; -import org.apache.accumulo.test.categories.AnyClusterTest; +import org.apache.accumulo.test.categories.StandaloneCapableClusterTests; import org.apache.accumulo.test.categories.SunnyDayTests; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; @@ -101,7 +101,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterators; -@Category({AnyClusterTest.class, SunnyDayTests.class}) +@Category({StandaloneCapableClusterTests.class, SunnyDayTests.class}) public class ReadWriteIT extends AccumuloClusterIT { private static final Logger log = LoggerFactory.getLogger(ReadWriteIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java index 0bfdc00..eaea61c 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/TableIT.java @@ -39,7 +39,7 @@ import org.apache.accumulo.harness.AccumuloClusterIT; import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; @@ -50,7 +50,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Iterators; -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class TableIT extends AccumuloClusterIT { @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java b/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java index a06baf8..dd50fee 100644 --- a/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java +++ b/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java @@ -17,13 +17,13 @@ package org.apache.accumulo.test.proxy; import org.apache.accumulo.harness.SharedMiniClusterIT; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.accumulo.test.categories.SunnyDayTests; import org.apache.thrift.protocol.TCompactProtocol; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category({MiniClusterOnlyTest.class, SunnyDayTests.class}) +@Category({MiniClusterOnlyTests.class, SunnyDayTests.class}) public class TCompactProxyIT extends SimpleProxyBase { @BeforeClass http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java index f6aa89b..cbcd447 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/CyclicReplicationIT.java @@ -49,6 +49,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.minicluster.impl.ZooKeeperBindException; import org.apache.accumulo.server.replication.ReplicaSystemFactory; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.accumulo.test.functional.ConfigurableMacIT; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; @@ -58,6 +59,7 @@ import org.apache.hadoop.fs.RawLocalFileSystem; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestName; import org.junit.rules.Timeout; import org.slf4j.Logger; @@ -65,9 +67,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Iterables; -/** - * - */ +@Category(MiniClusterOnlyTests.class) public class CyclicReplicationIT { private static final Logger log = LoggerFactory.getLogger(CyclicReplicationIT.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/cead3978/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java b/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java index 933dfb8..c2683a3 100644 --- a/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java +++ b/test/src/test/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java @@ -41,7 +41,7 @@ import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.minicluster.impl.ProcessReference; import org.apache.accumulo.server.replication.ReplicaSystemFactory; -import org.apache.accumulo.test.categories.MiniClusterOnlyTest; +import org.apache.accumulo.test.categories.MiniClusterOnlyTests; import org.apache.accumulo.test.functional.KerberosIT; import org.apache.accumulo.tserver.TabletServer; import org.apache.accumulo.tserver.replication.AccumuloReplicaSystem; @@ -64,7 +64,7 @@ import com.google.common.collect.Iterators; /** * Ensure that replication occurs using keytabs instead of password (not to mention SASL) */ -@Category(MiniClusterOnlyTest.class) +@Category(MiniClusterOnlyTests.class) public class KerberosReplicationIT extends AccumuloIT { private static final Logger log = LoggerFactory.getLogger(KerberosIT.class);
