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 dc3f323e46e548e86ea010e5a72f9e475b0f563e Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Fri Jun 29 21:59:11 2018 -0700 GEODE-5363: Moves distributed tests into new source set. --- .../org/apache/geode/cache/client/internal/LocatorTestBase.java | 0 .../java/org/apache/geode/cache/query/QueryTestUtils.java | 0 .../apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java | 0 .../org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java | 0 .../java/org/apache/geode/cache30/CacheSerializableRunnable.java | 0 .../java/org/apache/geode/cache30/ClientServerTestCase.java | 0 .../org/apache/geode/internal/cache/DistributedCacheTestCase.java | 0 .../cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java | 0 .../apache/geode/internal/cache/execute/FunctionServiceBase.java | 0 .../cache/execute/FunctionServiceClientAccessorPRBase.java | 0 .../geode/internal/cache/execute/FunctionServiceClientBase.java | 0 .../internal/cache/execute/FunctionServiceClientOnServerBase.java | 0 .../internal/cache/execute/FunctionServicePeerAccessorPRBase.java | 0 .../geode/internal/cache/execute/MyTransactionFunction.java | 0 .../geode/internal/cache/execute/PRClientServerTestBase.java | 0 .../java/org/apache/geode/internal/cache/execute/data/CustId.java | 0 .../org/apache/geode/internal/cache/execute/data/Customer.java | 0 .../java/org/apache/geode/internal/cache/execute/data/Order.java | 0 .../org/apache/geode/internal/cache/execute/data/OrderId.java | 0 .../org/apache/geode/internal/cache/execute/data/Shipment.java | 0 .../org/apache/geode/internal/cache/execute/data/ShipmentId.java | 0 .../geode/internal/cache/functions/DistributedRegionFunction.java | 0 .../org/apache/geode/internal/cache/functions/TestFunction.java | 0 .../cache/partitioned/PersistentPartitionedRegionTestBase.java | 0 .../internal/cache/persistence/PersistentReplicatedTestBase.java | 0 .../geode/internal/cache/tier/sockets/CacheServerTestUtil.java | 0 .../internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java | 0 .../geode/internal/cache/versions/RegionVersionVectorTest.java | 0 .../geode/management/internal/configuration/ClusterConfig.java | 0 .../internal/configuration/SharedConfigurationTestUtils.java | 0 .../org/apache/geode/security/ClientAuthenticationTestCase.java | 0 .../org/apache/geode/security/ClientAuthenticationTestUtils.java | 0 .../org/apache/geode/security/ClientAuthorizationTestCase.java | 0 .../java/org/apache/geode/security/SecurityTestUtils.java | 0 .../geode/security/generator/LdapUserCredentialGenerator.java | 0 .../java/org/apache/geode/security/query/QuerySecurityBase.java | 0 .../java/org/apache/geode/test/junit/rules/GfshCommandRule.java | 0 .../org/apache/geode/test/junit/rules/LocatorStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/MemberStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/ServerStarterRule.java | 0 .../java/org/apache/geode/test/junit/rules/VMProvider.java | 0 .../java/org/apache/geode/internal/DataSerializableJUnitTest.java | 8 +------- 42 files changed, 1 insertion(+), 7 deletions(-) diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/LocatorTestBase.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/QueryTestUtils.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/query/partitioned/PRQueryDUnitHelper.java diff --git a/geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java b/geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache/snapshot/TestSnapshotFileMapper.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/CacheSerializableRunnable.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheSerializableRunnable.java diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/cache30/ClientServerTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/cache30/ClientServerTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/DistributedCacheTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/ReplicateBackupPrepareAndFinishMsgDUnitTest.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientAccessorPRBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServiceClientOnServerBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/FunctionServicePeerAccessorPRBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/MyTransactionFunction.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PRClientServerTestBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Customer.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Customer.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Customer.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Order.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Order.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Order.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Shipment.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/Shipment.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/Shipment.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/DistributedRegionFunction.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/TestFunction.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/functions/TestFunction.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/CacheServerTestUtil.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/tier/sockets/UpdatePropagationPRDUnitTest.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java rename to geode-core/src/distributedTest/java/org/apache/geode/internal/cache/versions/RegionVersionVectorTest.java diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfig.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfig.java rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfig.java diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java rename to geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/SharedConfigurationTestUtils.java diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestUtils.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthenticationTestUtils.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthenticationTestUtils.java diff --git a/geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationTestCase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/ClientAuthorizationTestCase.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/ClientAuthorizationTestCase.java diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java b/geode-core/src/distributedTest/java/org/apache/geode/security/SecurityTestUtils.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/SecurityTestUtils.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/SecurityTestUtils.java diff --git a/geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/generator/LdapUserCredentialGenerator.java diff --git a/geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityBase.java b/geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityBase.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/security/query/QuerySecurityBase.java rename to geode-core/src/distributedTest/java/org/apache/geode/security/query/QuerySecurityBase.java diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/GfshCommandRule.java rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/GfshCommandRule.java diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/MemberStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/MemberStarterRule.java rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/MemberStarterRule.java diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/ServerStarterRule.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/ServerStarterRule.java rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/ServerStarterRule.java diff --git a/geode-core/src/test/java/org/apache/geode/test/junit/rules/VMProvider.java b/geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/VMProvider.java similarity index 100% rename from geode-core/src/test/java/org/apache/geode/test/junit/rules/VMProvider.java rename to geode-core/src/distributedTest/java/org/apache/geode/test/junit/rules/VMProvider.java diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java index 3b893a2..b3b24af 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java @@ -14,13 +14,6 @@ */ package org.apache.geode.internal; -import static org.apache.geode.test.dunit.Assert.assertEquals; -import static org.apache.geode.test.dunit.Assert.assertFalse; -import static org.apache.geode.test.dunit.Assert.assertNotSame; -import static org.apache.geode.test.dunit.Assert.assertSame; -import static org.apache.geode.test.dunit.Assert.assertTrue; -import static org.apache.geode.test.dunit.Assert.fail; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInput; @@ -56,6 +49,7 @@ import java.util.UUID; import java.util.Vector; import java.util.concurrent.TimeUnit; +import static org.junit.Assert.*; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule;