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 1f4b251d84607705b7f17a2b1fead4101828627b
Author: Jacob Barrett <jbarr...@pivotal.io>
AuthorDate: Mon Jul 2 09:06:52 2018 -0700
GEODE-5363: Moves distributed tests into new source set.
---
.../geode/cache30/CacheListenerTestCase.java | 0
.../apache/geode/cache30/CacheLoaderTestCase.java | 0
.../org/apache/geode/cache30/CacheTestCase.java | 0
.../apache/geode/cache30/CacheWriterTestCase.java | 0
.../apache/geode/cache30/CacheXml66DUnitTest.java | 0
.../org/apache/geode/cache30/CacheXmlTestCase.java | 0
.../cache30/CertifiableTestCacheListener.java | 0
.../DiskDistributedNoAckRegionTestCase.java | 0
.../apache/geode/cache30/DiskRegionTestImpl.java | 0
...tedMulticastRegionWithUDPSecurityDUnitTest.java | 0
.../geode/cache30/MultiVMRegionTestCase.java | 0
.../geode/cache30/RegionAttributesTestCase.java | 0
.../geode/cache30/RegionReliabilityTestCase.java | 0
.../org/apache/geode/cache30/RegionTestCase.java | 0
.../apache/geode/cache30/ReliabilityTestCase.java | 0
.../apache/geode/cache30/TestCacheCallback.java | 0
.../apache/geode/cache30/TestCacheListener.java | 0
.../org/apache/geode/cache30/TestCacheLoader.java | 0
.../org/apache/geode/cache30/TestCacheWriter.java | 0
.../geode/cache30/TestTransactionListener.java | 0
...titionedBackupPrepareAndFinishMsgDUnitTest.java | 0
.../cache/execute/CustomerIDPartitionResolver.java | 0
.../geode/internal/cache/execute/PerfFunction.java | 0
.../internal/cache/execute/PerfTxFunction.java | 0
.../fixed/CustomerFixedPartitionResolver.java | 0
.../fixed/FixedPartitioningTestBaseJUnitTest.java | 0
.../geode/internal/jta/dunit/CommitThread.java | 0
.../geode/internal/jta/dunit/RollbackThread.java | 0
.../geode/internal/offheap/OffHeapRegionBase.java | 0
.../org/apache/geode/management/MBeanUtil.java | 0
.../geode/management/ManagementTestBase.java | 0
.../geode/management/ManagementTestRule.java | 0
.../internal/cli/commands/CliCommandTestBase.java | 0
.../configuration/ClusterConfigTestBase.java | 0
.../generator/AuthzCredentialGenerator.java | 0
.../security/generator/CredentialGenerator.java | 0
.../generator/DummyAuthzCredentialGenerator.java | 0
.../generator/DummyCredentialGenerator.java | 0
.../generator/PKCSCredentialGenerator.java | 0
.../security/generator/SSLCredentialGenerator.java | 0
.../UserPasswordWithExtraPropsAuthInit.java | 0
.../generator/XmlAuthzCredentialGenerator.java | 0
.../geode/internal/DataSerializableJUnitTest.java | 8 +--
.../cache/CustomerIDPartitionResolver.java | 76 ----------------------
.../geode/internal/cache/execute/data/CustId.java | 0
.../geode/internal/cache/execute/data/OrderId.java | 0
.../internal/cache/execute/data/ShipmentId.java | 0
.../DescribeDiskStoreFunctionJUnitTest.java | 11 ----
48 files changed, 4 insertions(+), 91 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CacheListenerTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheListenerTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CacheLoaderTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheLoaderTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/cache30/CacheTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CacheWriterTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheWriterTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CacheXmlTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CacheXmlTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/CertifiableTestCacheListener.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskDistributedNoAckRegionTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionTestImpl.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/DiskRegionTestImpl.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/DiskRegionTestImpl.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/DistributedMulticastRegionWithUDPSecurityDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionAttributesTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/RegionAttributesTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionAttributesTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionReliabilityTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/RegionTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/ReliabilityTestCase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/ReliabilityTestCase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/ReliabilityTestCase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/TestCacheCallback.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheCallback.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/TestCacheListener.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheListener.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/TestCacheLoader.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheLoader.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/TestCacheWriter.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestCacheWriter.java
diff --git
a/geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache30/TestTransactionListener.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/cache30/TestTransactionListener.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/cache30/TestTransactionListener.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/backup/PartitionedBackupPrepareAndFinishMsgDUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/CustomerIDPartitionResolver.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfFunction.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfFunction.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfFunction.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfFunction.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/PerfTxFunction.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/CustomerFixedPartitionResolver.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBaseJUnitTest.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/CommitThread.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/jta/dunit/CommitThread.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/CommitThread.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/jta/dunit/RollbackThread.java
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/internal/offheap/OffHeapRegionBase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/MBeanUtil.java
similarity index 100%
rename from geode-core/src/test/java/org/apache/geode/management/MBeanUtil.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/MBeanUtil.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/ManagementTestBase.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestBase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/ManagementTestBase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestBase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/ManagementTestRule.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestRule.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/ManagementTestRule.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/ManagementTestRule.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CliCommandTestBase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/management/internal/configuration/ClusterConfigTestBase.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/AuthzCredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/CredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/CredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/CredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyAuthzCredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/DummyCredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/PKCSCredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/SSLCredentialGenerator.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/UserPasswordWithExtraPropsAuthInit.java
diff --git
a/geode-core/src/test/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
b/geode-core/src/distributedTest/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
similarity index 100%
rename from
geode-core/src/test/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.java
rename to
geode-core/src/distributedTest/java/org/apache/geode/security/generator/XmlAuthzCredentialGenerator.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 b3b24af..5ffd100 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
@@ -1898,7 +1898,7 @@ public class DataSerializableJUnitTest implements
Serializable {
if (e instanceof VirtualMachineError) {
SystemFailure.setFailure((VirtualMachineError) e); // don't throw
}
- fail("Uncaught exception in thread " + t, e);
+ fail("Uncaught exception in thread " + t + e);
}
};
Thread thread = new Thread(group, "Registrar") {
@@ -1908,7 +1908,7 @@ public class DataSerializableJUnitTest implements
Serializable {
DataSerializer.register(c);
} catch (Exception ex) {
- fail("Interrupted while registering", ex);
+ fail("Interrupted while registering" + ex);
}
}
};
@@ -1956,7 +1956,7 @@ public class DataSerializableJUnitTest implements
Serializable {
if (e instanceof VirtualMachineError) {
SystemFailure.setFailure((VirtualMachineError) e); // don't throw
}
- fail("Uncaught exception in thread " + t, e);
+ fail("Uncaught exception in thread " + t + e);
}
};
Thread thread = new Thread(group, "Registrar") {
@@ -1966,7 +1966,7 @@ public class DataSerializableJUnitTest implements
Serializable {
Instantiator.register(inst);
} catch (Exception ex) {
- fail("Interrupted while registering", ex);
+ fail("Interrupted while registering" + ex);
}
}
};
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
deleted file mode 100755
index 19ae77b..0000000
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/CustomerIDPartitionResolver.java
+++ /dev/null
@@ -1,76 +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.internal.cache;
-
-import java.io.Serializable;
-
-import org.apache.geode.cache.EntryOperation;
-import org.apache.geode.cache.PartitionResolver;
-import org.apache.geode.internal.cache.execute.data.CustId;
-import org.apache.geode.internal.cache.execute.data.OrderId;
-import org.apache.geode.internal.cache.execute.data.ShipmentId;
-
-public class CustomerIDPartitionResolver implements PartitionResolver {
-
- private static CustomerIDPartitionResolver customerIDPartitionResolver =
null;
-
- private String id;
-
-
- private String resolverName;
-
- public CustomerIDPartitionResolver() {}
-
- public CustomerIDPartitionResolver(String resolverID) {
- id = resolverID;
- }
-
- public String getName() {
- return this.resolverName;
- }
-
- public Serializable getRoutingObject(EntryOperation opDetails) {
-
- Serializable routingbject = null;
-
- if (opDetails.getKey() instanceof ShipmentId) {
- ShipmentId shipmentId = (ShipmentId) opDetails.getKey();
- routingbject = shipmentId.getOrderId().getCustId();
- }
- if (opDetails.getKey() instanceof OrderId) {
- OrderId orderId = (OrderId) opDetails.getKey();
- routingbject = orderId.getCustId();
- } else if (opDetails.getKey() instanceof CustId) {
- CustId custId = (CustId) opDetails.getKey();
- routingbject = custId.getCustId();
- }
- return routingbject;
- }
-
- public void close() {}
-
- public boolean equals(Object o) {
- if (this == o)
- return true;
-
- if (!(o instanceof CustomerIDPartitionResolver))
- return false;
-
- CustomerIDPartitionResolver otherCustomerIDPartitionResolver =
(CustomerIDPartitionResolver) o;
- return otherCustomerIDPartitionResolver.id.equals(this.id);
-
- }
-
-}
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/CustId.java
rename to
geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/CustId.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/OrderId.java
rename to
geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/OrderId.java
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
similarity index 100%
rename from
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
rename to
geode-core/src/test/java/org/apache/geode/internal/cache/execute/data/ShipmentId.java
diff --git
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
index cd65dbb..7a4c3a2 100644
---
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunctionJUnitTest.java
@@ -60,7 +60,6 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.internal.cli.domain.DiskStoreDetails;
import
org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException;
-import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.junit.categories.UnitTest;
/**
@@ -699,16 +698,6 @@ public class DescribeDiskStoreFunctionJUnitTest {
@Test
public void testExecuteWithDiskDirsAndDiskSizesMismatch() throws Exception {
- IgnoredException ignoredException =
-
IgnoredException.addIgnoredException(IllegalStateException.class.getName());
- try {
- doTestExecuteWithDiskDirsAndDiskSizesMismatch();
- } finally {
- ignoredException.remove();
- }
- }
-
- private void doTestExecuteWithDiskDirsAndDiskSizesMismatch() throws
Exception {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMemberId";
final String memberName = "mockMemberName";
