This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch feature/GEODE-5363
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 02d42d15d4245ab2ea24aeb1a28aff28db13887b
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Wed Jul 11 07:41:24 2018 -0700
GEODE-5363: Remove acceptanceTest category
---
.../cli/commands/ConfigureEvictionThroughGfsh.java | 3 ---
.../cli/commands/DeployWithLargeJarTest.java | 3 ---
.../cli/commands/DestroyIndexIfExistsTest.java | 3 ---
.../cli/commands/GfshStartLocatorLogTest.java | 3 ---
.../cli/commands/ImportClusterConfigTest.java | 3 ---
...scribeConfigAreFullyRedactedAcceptanceTest.java | 3 ---
.../cli/commands/PutCommandWithJsonTest.java | 3 ---
.../cli/commands/StartLocatorAcceptanceTest.java | 3 ---
.../cli/commands/StatusLocatorRealGfshTest.java | 3 ---
.../cli/commands/StopServerAcceptanceTest.java | 3 ---
.../StopServerWithSecurityAcceptanceTest.java | 3 ---
.../cli/shell/GfshDisconnectWithinScript.java | 3 ---
.../shell/StatusLocatorExitCodeAcceptanceTest.java | 3 ---
.../shell/StatusServerExitCodeAcceptanceTest.java | 3 ---
.../jdbc/JdbcAsyncWriterIntegrationTest.java | 3 ---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 3 ---
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 3 ---
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcAsyncWriterIntegrationTest.java | 3 ---
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 3 ---
.../jdbc/MySqlJdbcLoaderIntegrationTest.java | 3 ---
.../jdbc/MySqlJdbcWriterIntegrationTest.java | 3 ---
.../PostgresJdbcAsyncWriterIntegrationTest.java | 3 ---
.../jdbc/PostgresJdbcDistributedTest.java | 3 ---
.../jdbc/PostgresJdbcLoaderIntegrationTest.java | 3 ---
.../jdbc/PostgresJdbcWriterIntegrationTest.java | 3 ---
.../MySqlTableMetaDataManagerIntegrationTest.java | 3 ---
...ostgresTableMetaDataManagerIntegrationTest.java | 3 ---
.../TableMetaDataManagerIntegrationTest.java | 3 ---
.../test/junit/categories/AcceptanceTest.java | 26 ----------------------
30 files changed, 113 deletions(-)
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
index 710abc9..e40ec3a 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConfigureEvictionThroughGfsh.java
@@ -22,16 +22,13 @@ import java.io.IOException;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
// GEODE-1897 Users should be able to configure eviction through gfsh
-@Category(AcceptanceTest.class)
public class ConfigureEvictionThroughGfsh {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
index 82d0900..2cf835d 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DeployWithLargeJarTest.java
@@ -21,14 +21,11 @@ import java.util.stream.Collectors;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class DeployWithLargeJarTest {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
index f17f78c..12e47af 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/DestroyIndexIfExistsTest.java
@@ -19,14 +19,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class DestroyIndexIfExistsTest {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
index dc9fc3b..b7169f4 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/GfshStartLocatorLogTest.java
@@ -22,14 +22,11 @@ import java.nio.charset.StandardCharsets;
import com.google.common.io.Files;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class GfshStartLocatorLogTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
index 2b6a38b..2da651b 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigTest.java
@@ -21,15 +21,12 @@ import static
org.assertj.core.api.Java6Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import
org.apache.geode.management.internal.configuration.ClusterConfigTestBase;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class ImportClusterConfigTest extends ClusterConfigTestBase {
private static final String locatorName = "locator";
private static final String serverNotShutDownName = "serverNotShutDown";
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
index 35a21a0..9a860c6 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java
@@ -31,11 +31,9 @@ import org.assertj.core.api.SoftAssertions;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.examples.security.ExampleSecurityManager;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.util.test.TestUtil;
@@ -48,7 +46,6 @@ import org.apache.geode.util.test.TestUtil;
*
* Each password shares the string below for easier log scanning.
*/
-@Category(AcceptanceTest.class)
public class LogsAndDescribeConfigAreFullyRedactedAcceptanceTest {
private static String sharedPasswordString = "abcdefg";
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
index 6950b4b..4ccdb30 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/PutCommandWithJsonTest.java
@@ -22,15 +22,12 @@ import java.io.IOException;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.compiler.JarBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class PutCommandWithJsonTest {
private File jarToDeploy;
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
index faa80d6..0e9897e 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StartLocatorAcceptanceTest.java
@@ -18,14 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StartLocatorAcceptanceTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
index dfad50e..b8d6245 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StatusLocatorRealGfshTest.java
@@ -16,13 +16,10 @@ package org.apache.geode.management.internal.cli.commands;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StatusLocatorRealGfshTest {
@Rule
public GfshRule gfshRule = new GfshRule();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
index 126c66b..3ccf59d 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerAcceptanceTest.java
@@ -17,13 +17,10 @@ package org.apache.geode.management.internal.cli.commands;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StopServerAcceptanceTest {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
index 7d5405a..b58e1f2 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/StopServerWithSecurityAcceptanceTest.java
@@ -24,16 +24,13 @@ import java.util.Properties;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.examples.SimpleSecurityManager;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
-@Category(AcceptanceTest.class)
public class StopServerWithSecurityAcceptanceTest {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
index 064aa1b..e2ebd32 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/GfshDisconnectWithinScript.java
@@ -17,12 +17,9 @@ package org.apache.geode.management.internal.cli.shell;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
-@Category(AcceptanceTest.class)
public class GfshDisconnectWithinScript {
@Rule
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
index f043ceb..2b07229 100644
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusLocatorExitCodeAcceptanceTest.java
@@ -25,14 +25,12 @@ import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.process.PidFile;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
@@ -40,7 +38,6 @@ import org.apache.geode.test.junit.rules.gfsh.GfshScript;
/**
* See also
org.apache.geode.management.internal.cli.shell.StatusServerExitCodeAcceptanceTest
*/
-@Category(AcceptanceTest.class)
public class StatusLocatorExitCodeAcceptanceTest {
private static File toolsJar;
private static final ThreePhraseGenerator nameGenerator = new
ThreePhraseGenerator();
diff --git
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
index 9d0e766..28277f8 100755
---
a/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
+++
b/geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/shell/StatusServerExitCodeAcceptanceTest.java
@@ -24,14 +24,12 @@ import org.junit.Assume;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.ExitCode;
import org.apache.geode.internal.process.PidFile;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.management.internal.cli.util.ThreePhraseGenerator;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.gfsh.GfshExecution;
import org.apache.geode.test.junit.rules.gfsh.GfshRule;
import org.apache.geode.test.junit.rules.gfsh.GfshScript;
@@ -41,7 +39,6 @@ import org.apache.geode.test.junit.rules.gfsh.GfshScript;
/**
* See also
org.apache.geode.management.internal.cli.shell.StatusLocatorExitCodeAcceptanceTest
*/
-@Category(AcceptanceTest.class)
public class StatusServerExitCodeAcceptanceTest {
private static File toolsJar;
private static final ThreePhraseGenerator nameGenerator = new
ThreePhraseGenerator();
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index 819551b..c3da482 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -27,7 +27,6 @@ import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -40,9 +39,7 @@ import
org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcAsyncWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index 4046244..4243799 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -35,7 +35,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.ClientCacheFactory;
@@ -49,14 +48,12 @@ import org.apache.geode.test.dunit.rules.ClientVM;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
import org.apache.geode.test.dunit.rules.DistributedRestoreSystemProperties;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
/**
* End-to-end dunits for JDBC connector
*/
-@Category(AcceptanceTest.class)
public abstract class JdbcDistributedTest implements Serializable {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
index 805f8b4..2febfb6 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -29,7 +29,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -45,9 +44,7 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
import org.apache.geode.pdx.internal.AutoSerializableManager;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcLoaderIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
index dbdc18a..404d7c2 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
@@ -42,9 +41,7 @@ import
org.apache.geode.connectors.jdbc.internal.TestConfigService;
import org.apache.geode.connectors.jdbc.internal.TestableConnectionManager;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class JdbcWriterIntegrationTest {
static final String DB_NAME = "test";
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
index 1391fb9..838b262 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcAsyncWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
index 7d79c70..a84d543 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcDistributedTest.java
@@ -23,17 +23,14 @@ import java.sql.Statement;
import java.sql.Types;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(AcceptanceTest.class)
public class MySqlJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
index f74fd0b..30bc01d 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcLoaderIntegrationTest.java
@@ -20,13 +20,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcLoaderIntegrationTest extends JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
index 329b8c1..012ac1b 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/MySqlJdbcWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlJdbcWriterIntegrationTest extends JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
index dcaaaf0..fd3fb59 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcAsyncWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcAsyncWriterIntegrationTest extends
JdbcAsyncWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
index 0ec4eb5..f4931c9 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcDistributedTest.java
@@ -22,16 +22,13 @@ import java.sql.Statement;
import java.sql.Types;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
import org.apache.geode.test.junit.rules.SqlDatabaseConnectionRule;
/**
* End-to-end dunits for jdbc connector
*/
-@Category(AcceptanceTest.class)
public class PostgresJdbcDistributedTest extends JdbcDistributedTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
index f90a37c..f7d47d2 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcLoaderIntegrationTest.java
@@ -20,13 +20,10 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcLoaderIntegrationTest extends
JdbcLoaderIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
index 7b324c3..7a5c76a 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/PostgresJdbcWriterIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresJdbcWriterIntegrationTest extends
JdbcWriterIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
index e75472f..7684542 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/MySqlTableMetaDataManagerIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.MySqlConnectionRule;
-@Category(AcceptanceTest.class)
public class MySqlTableMetaDataManagerIntegrationTest extends
TableMetaDataManagerIntegrationTest {
private static final URL COMPOSE_RESOURCE_PATH =
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
index 0697abd..7fca1fd 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/PostgresTableMetaDataManagerIntegrationTest.java
@@ -19,13 +19,10 @@ import java.sql.Connection;
import java.sql.SQLException;
import org.junit.ClassRule;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
import org.apache.geode.test.junit.rules.DatabaseConnectionRule;
import org.apache.geode.test.junit.rules.PostgresConnectionRule;
-@Category(AcceptanceTest.class)
public class PostgresTableMetaDataManagerIntegrationTest
extends TableMetaDataManagerIntegrationTest {
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
index ffbebde..2136f4a 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
@@ -27,11 +27,8 @@ import java.sql.Types;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.test.junit.categories.AcceptanceTest;
-@Category(AcceptanceTest.class)
public abstract class TableMetaDataManagerIntegrationTest {
private static final String REGION_TABLE_NAME = "employees";
diff --git
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
b/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
deleted file mode 100644
index 78b78fd..0000000
---
a/geode-junit/src/main/java/org/apache/geode/test/junit/categories/AcceptanceTest.java
+++ /dev/null
@@ -1,26 +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.geode.test.junit.categories;
-
-/**
- * JUnit Test Category that specifies a test to determine whether or not a
system satisfies the
- * acceptance criteria and to determine whether or not to accept the system.
- *
- * Based on definition by ISTQB.
- *
- * @see <a
href="http://softwaretestingfundamentals.com/acceptance-testing/";>Acceptance
Testing</a>
- */
-public interface AcceptanceTest {
-}
