You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2018/11/08 19:09:28 UTC
[geode] branch feature/GEODE-6010 updated (1ca8e5c -> ade6e6a)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 1ca8e5c GEODE-6010: Add unit test for CreateMappingCommand
add 0c96c7f GEODE-6008: ignore root exception as well. (#2804)
add e9ea18e Revert "GEODE-5729: when DistributedCacheOperation needs 2 messages, should let (#2458)" (#2801)
add b754086 GEODE-5742: increase timeout for statusCommandWithIncorrectPidShouldFail test (#2805)
add 083abbc GEODE-5987: Correct issue with powermock leaking JDK11-incompatible d… (#2797)
add ae8abe2 [GEODE-5971] Refactor offline disk store commands to extend SingleGfshCommand base type (#2794)
add 23af84c GEODE-5995: Initial import of gradle docker plugin (#2790)
add a5b04cc GEODE-5986 Inconsistent equals/hashCode
add 5410f93 GEODE-5982: Synchronized access to CacheLoader and CacheWriter (#2776)
add 728eceb GEODE-6000: make pdx-name required (#2799)
add ff55509 GEODE-5931: Make dependencies explicit in geode-pulse, geode-pulse-test. (#2714)
add 379ee68 GEODE-6018 Remove reflections from LICENSE
new 9b244d2 Merge branch 'develop' into feature/GEODE-6010
new ade6e6a CreateMappingCommandTest now passes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build.gradle | 1 -
buildSrc/build.gradle | 15 +
.../dockerizedtest/DefaultWorkerSemaphore.groovy | 71 +++
.../DockerizedJavaExecHandleBuilder.groovy | 100 +++
.../dockerizedtest/DockerizedTestExtension.groovy | 58 ++
.../dockerizedtest/DockerizedTestPlugin.groovy | 184 ++++++
.../ExitCodeTolerantExecHandle.groovy | 92 +++
.../plugins/dockerizedtest/WorkerSemaphore.groovy | 28 +
.../dockerizedtest/DockerizedExecHandle.java | 673 +++++++++++++++++++++
.../dockerizedtest/DockerizedExecHandleRunner.java | 101 ++++
.../ForciblyStoppableTestWorker.java | 45 ++
.../dockerizedtest/ForkingTestClassProcessor.java | 153 +++++
.../plugins/dockerizedtest/NoMemoryManager.java | 59 ++
.../plugins/dockerizedtest/TestExecuter.java | 116 ++++
.../com.github.pedjak.dockerized-test.properties | 1 +
.../GatewayDeltaForwarderCacheListener.java | 6 +
.../callback/SessionExpirationCacheListener.java | 9 +
.../geode/modules/util/DebugCacheListener.java | 7 +
.../geode/modules/util/SessionCustomExpiry.java | 7 +
.../shell/StatusServerExitCodeAcceptanceTest.java | 2 +-
geode-assembly/src/main/dist/LICENSE | 20 -
.../geode/connectors/jdbc/JdbcDistributedTest.java | 83 ++-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 43 +-
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 5 +-
.../{TestDataSourceFactory.java => TestDate.java} | 42 +-
.../jdbc/internal/TestConfigService.java | 9 +-
.../cli/CreateMappingCommandDUnitTest.java | 14 +-
.../cli/CreateMappingCommandIntegrationTest.java | 4 +-
.../jdbc/internal/SqlToPdxInstanceCreator.java | 9 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 8 +-
.../jdbc/internal/configuration/RegionMapping.java | 25 +-
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 2 +-
.../jdbc/internal/RegionMappingTest.java | 46 +-
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 66 +-
.../internal/cli/CreateMappingCommandTest.java | 29 +-
...tServerHostNameVerificationDistributedTest.java | 1 +
.../cache/MonthBasedPartitionResolver.java | 5 +
.../cache/PartitionedRegionSingleHopDUnitTest.java | 25 +
.../geode/internal/cache/SerializableMonth.java | 12 +
....java => CompactOfflineDiskStoreJUnitTest.java} | 2 +-
.../geode/internal/cache/OplogJUnitTest.java | 12 +-
.../cache/query/internal/LinkedResultSet.java | 8 +
.../geode/cache/query/internal/NullToken.java | 5 +
.../geode/cache/query/internal/ResultsSet.java | 7 +
.../query/internal/SelectResultsComparator.java | 6 +
.../cache/query/internal/SortedResultSet.java | 8 +
.../cache/query/internal/SortedStructSet.java | 5 +
.../geode/cache/query/internal/Undefined.java | 7 +
.../internal/types/ExtendedNumericComparator.java | 5 +
.../query/internal/types/NumericComparator.java | 6 +
.../query/internal/types/TemporalComparator.java | 6 +
.../gms/locator/FindCoordinatorResponse.java | 6 +
.../gms/messages/InstallViewMessage.java | 6 +
.../gms/messages/JoinRequestMessage.java | 6 +
.../gms/messages/JoinResponseMessage.java | 6 +
.../internal/admin/remote/RemoteApplicationVM.java | 6 +
.../internal/admin/remote/RemoteGemFireVM.java | 11 +
.../admin/statalerts/MultiAttrDefinitionImpl.java | 12 +
.../admin/statalerts/SingleAttrDefinitionImpl.java | 13 +
.../geode/internal/cache/AbstractRegion.java | 95 ++-
.../internal/cache/DistributedCacheOperation.java | 28 +-
.../geode/internal/cache/PoolFactoryImpl.java | 17 +
.../internal/cache/xmlcache/CacheXmlGenerator.java | 6 +
.../geode/internal/jta/TransactionManagerImpl.java | 10 +-
.../cli/commands/AlterOfflineDiskStoreCommand.java | 3 +-
.../commands/CompactOfflineDiskStoreCommand.java | 3 +-
.../commands/DescribeOfflineDiskStoreCommand.java | 16 +-
.../commands/ExportOfflineDiskStoreCommand.java | 3 +-
.../internal/cli/commands/RebalanceCommand.java | 5 +
.../commands/UpgradeOfflineDiskStoreCommand.java | 3 +-
.../management/internal/cli/domain/ClassName.java | 6 +
.../internal/cli/functions/RegionFunctionArgs.java | 6 +
.../internal/cache/CacheOperationMessageTest.java | 50 --
.../src/main/java/hydra/MethExecutorResult.java | 8 +
.../cache/CustomerIDPartitionResolver.java | 6 +
.../geode/internal/cache/execute/data/Order.java | 4 +-
.../internal/cache/execute/data/Shipment.java | 3 +-
.../apache/geode/internal/cache/wan/Filter70.java | 6 +
.../cache/wan/MyGatewaySenderEventListener.java | 7 +
.../cache/wan/MyGatewaySenderEventListener2.java | 6 +
.../cache/wan/MyGatewayTransportFilter1.java | 7 +
.../cache/wan/MyGatewayTransportFilter2.java | 7 +
.../cache/wan/MyGatewayTransportFilter3.java | 7 +
.../cache/wan/MyGatewayTransportFilter4.java | 7 +
.../geode/test/junit/rules/gfsh/GfshExecution.java | 3 +-
geode-pulse/build.gradle | 18 +
geode-pulse/geode-pulse-test/build.gradle | 14 +-
geode-pulse/src/test/resources/expected-pom.xml | 26 +
geode-rebalancer/build.gradle | 7 +-
gradle/dependency-versions.properties | 1 -
90 files changed, 2355 insertions(+), 352 deletions(-)
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/DefaultWorkerSemaphore.groovy
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/DockerizedJavaExecHandleBuilder.groovy
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/DockerizedTestExtension.groovy
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/DockerizedTestPlugin.groovy
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/ExitCodeTolerantExecHandle.groovy
create mode 100644 buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/WorkerSemaphore.groovy
create mode 100755 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/DockerizedExecHandle.java
create mode 100644 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/DockerizedExecHandleRunner.java
create mode 100644 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/ForciblyStoppableTestWorker.java
create mode 100644 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/ForkingTestClassProcessor.java
create mode 100644 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/NoMemoryManager.java
create mode 100644 buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/TestExecuter.java
create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/com.github.pedjak.dockerized-test.properties
copy geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/{TestDataSourceFactory.java => TestDate.java} (55%)
rename geode-core/src/integrationTest/java/org/apache/geode/internal/cache/{DiskOfflineCompactionJUnitTest.java => CompactOfflineDiskStoreJUnitTest.java} (99%)
mode change 100755 => 100644 geode-pulse/build.gradle
mode change 100755 => 100644 geode-pulse/geode-pulse-test/build.gradle
[geode] 01/02: Merge branch 'develop' into feature/GEODE-6010
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 9b244d222c5141dbdfadf14ca936def33ca20aeb
Merge: 1ca8e5c 379ee68
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Nov 8 10:49:13 2018 -0800
Merge branch 'develop' into feature/GEODE-6010
build.gradle | 1 -
buildSrc/build.gradle | 15 +
.../dockerizedtest/DefaultWorkerSemaphore.groovy | 71 +++
.../DockerizedJavaExecHandleBuilder.groovy | 100 +++
.../dockerizedtest/DockerizedTestExtension.groovy | 58 ++
.../dockerizedtest/DockerizedTestPlugin.groovy | 184 ++++++
.../ExitCodeTolerantExecHandle.groovy | 92 +++
.../plugins/dockerizedtest/WorkerSemaphore.groovy | 28 +
.../dockerizedtest/DockerizedExecHandle.java | 673 +++++++++++++++++++++
.../dockerizedtest/DockerizedExecHandleRunner.java | 101 ++++
.../ForciblyStoppableTestWorker.java | 45 ++
.../dockerizedtest/ForkingTestClassProcessor.java | 153 +++++
.../plugins/dockerizedtest/NoMemoryManager.java | 59 ++
.../plugins/dockerizedtest/TestExecuter.java | 116 ++++
.../com.github.pedjak.dockerized-test.properties | 1 +
.../GatewayDeltaForwarderCacheListener.java | 6 +
.../callback/SessionExpirationCacheListener.java | 9 +
.../geode/modules/util/DebugCacheListener.java | 7 +
.../geode/modules/util/SessionCustomExpiry.java | 7 +
.../shell/StatusServerExitCodeAcceptanceTest.java | 2 +-
geode-assembly/src/main/dist/LICENSE | 20 -
.../geode/connectors/jdbc/JdbcDistributedTest.java | 83 ++-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 43 +-
.../connectors/jdbc/MySqlJdbcDistributedTest.java | 5 +-
.../org/apache/geode/connectors/jdbc/TestDate.java | 53 ++
.../jdbc/internal/TestConfigService.java | 9 +-
.../cli/CreateMappingCommandDUnitTest.java | 14 +-
.../cli/CreateMappingCommandIntegrationTest.java | 4 +-
.../jdbc/internal/SqlToPdxInstanceCreator.java | 9 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 2 +-
.../jdbc/internal/configuration/RegionMapping.java | 25 +-
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 2 +-
.../jdbc/internal/RegionMappingTest.java | 46 +-
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 66 +-
...tServerHostNameVerificationDistributedTest.java | 1 +
.../cache/MonthBasedPartitionResolver.java | 5 +
.../cache/PartitionedRegionSingleHopDUnitTest.java | 25 +
.../geode/internal/cache/SerializableMonth.java | 12 +
....java => CompactOfflineDiskStoreJUnitTest.java} | 2 +-
.../geode/internal/cache/OplogJUnitTest.java | 12 +-
.../cache/query/internal/LinkedResultSet.java | 8 +
.../geode/cache/query/internal/NullToken.java | 5 +
.../geode/cache/query/internal/ResultsSet.java | 7 +
.../query/internal/SelectResultsComparator.java | 6 +
.../cache/query/internal/SortedResultSet.java | 8 +
.../cache/query/internal/SortedStructSet.java | 5 +
.../geode/cache/query/internal/Undefined.java | 7 +
.../internal/types/ExtendedNumericComparator.java | 5 +
.../query/internal/types/NumericComparator.java | 6 +
.../query/internal/types/TemporalComparator.java | 6 +
.../gms/locator/FindCoordinatorResponse.java | 6 +
.../gms/messages/InstallViewMessage.java | 6 +
.../gms/messages/JoinRequestMessage.java | 6 +
.../gms/messages/JoinResponseMessage.java | 6 +
.../internal/admin/remote/RemoteApplicationVM.java | 6 +
.../internal/admin/remote/RemoteGemFireVM.java | 11 +
.../admin/statalerts/MultiAttrDefinitionImpl.java | 12 +
.../admin/statalerts/SingleAttrDefinitionImpl.java | 13 +
.../geode/internal/cache/AbstractRegion.java | 95 ++-
.../internal/cache/DistributedCacheOperation.java | 28 +-
.../geode/internal/cache/PoolFactoryImpl.java | 17 +
.../internal/cache/xmlcache/CacheXmlGenerator.java | 6 +
.../geode/internal/jta/TransactionManagerImpl.java | 10 +-
.../cli/commands/AlterOfflineDiskStoreCommand.java | 3 +-
.../commands/CompactOfflineDiskStoreCommand.java | 3 +-
.../commands/DescribeOfflineDiskStoreCommand.java | 16 +-
.../commands/ExportOfflineDiskStoreCommand.java | 3 +-
.../internal/cli/commands/RebalanceCommand.java | 5 +
.../commands/UpgradeOfflineDiskStoreCommand.java | 3 +-
.../management/internal/cli/domain/ClassName.java | 6 +
.../internal/cli/functions/RegionFunctionArgs.java | 6 +
.../internal/cache/CacheOperationMessageTest.java | 50 --
.../src/main/java/hydra/MethExecutorResult.java | 8 +
.../cache/CustomerIDPartitionResolver.java | 6 +
.../geode/internal/cache/execute/data/Order.java | 4 +-
.../internal/cache/execute/data/Shipment.java | 3 +-
.../apache/geode/internal/cache/wan/Filter70.java | 6 +
.../cache/wan/MyGatewaySenderEventListener.java | 7 +
.../cache/wan/MyGatewaySenderEventListener2.java | 6 +
.../cache/wan/MyGatewayTransportFilter1.java | 7 +
.../cache/wan/MyGatewayTransportFilter2.java | 7 +
.../cache/wan/MyGatewayTransportFilter3.java | 7 +
.../cache/wan/MyGatewayTransportFilter4.java | 7 +
.../geode/test/junit/rules/gfsh/GfshExecution.java | 3 +-
geode-pulse/build.gradle | 18 +
geode-pulse/geode-pulse-test/build.gradle | 14 +-
geode-pulse/src/test/resources/expected-pom.xml | 26 +
geode-rebalancer/build.gradle | 7 +-
gradle/dependency-versions.properties | 1 -
89 files changed, 2356 insertions(+), 327 deletions(-)
[geode] 02/02: CreateMappingCommandTest now passes
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6010
in repository https://gitbox.apache.org/repos/asf/geode.git
commit ade6e6a36c5bd59153f77e029fc1d3ece7379bc3
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Nov 8 11:08:56 2018 -0800
CreateMappingCommandTest now passes
---
.../jdbc/internal/cli/CreateMappingCommand.java | 6 +++--
.../internal/cli/CreateMappingCommandTest.java | 29 ++++++++++++++++++----
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index d8449ac..f00c015 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -69,7 +69,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
pdxName, table, dataSourceName);
// action
- ConfigurationPersistenceService configurationPersistenceService = getConfigurationPersistenceService();
+ ConfigurationPersistenceService configurationPersistenceService =
+ getConfigurationPersistenceService();
if (configurationPersistenceService == null) {
return ResultModel.createError("Cluster Configuration must be enabled.");
}
@@ -79,7 +80,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
.getRegions()
.stream()
.anyMatch(regionConfig -> regionConfig.getName().equals(mapping.getRegionName()))) {
- return ResultModel.createError("Cluster Configuration must contain a region named " + regionName);
+ return ResultModel
+ .createError("Cluster Configuration must contain a region named " + regionName);
}
List<CliFunctionResult> results =
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
index 9cdbe72..0b84043 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java
@@ -57,6 +57,7 @@ public class CreateMappingCommandTest {
private CliFunctionResult successFunctionResult;
private RegionMapping mapping;
private CacheConfig cacheConfig;
+ RegionConfig matchingRegion;
@Before
public void setup() {
@@ -83,10 +84,26 @@ public class CreateMappingCommandTest {
when(mapping.getRegionName()).thenReturn(regionName);
cacheConfig = mock(CacheConfig.class);
+
+ matchingRegion = mock(RegionConfig.class);
+ when(matchingRegion.getName()).thenReturn(regionName);
+
+ }
+
+ private void setupRequiredPreconditions() {
+ ConfigurationPersistenceService configurationPersistenceService =
+ mock(ConfigurationPersistenceService.class);
+ doReturn(configurationPersistenceService).when(createRegionMappingCommand)
+ .getConfigurationPersistenceService();
+ when(configurationPersistenceService.getCacheConfig(null)).thenReturn(cacheConfig);
+ List<RegionConfig> list = new ArrayList<>();
+ list.add(matchingRegion);
+ when(cacheConfig.getRegions()).thenReturn(list);
}
@Test
public void createsMappingReturnsStatusOKWhenFunctionResultSuccess() {
+ setupRequiredPreconditions();
results.add(successFunctionResult);
ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
@@ -103,6 +120,7 @@ public class CreateMappingCommandTest {
@Test
public void createsMappingReturnsStatusERRORWhenFunctionResultIsEmpty() {
+ setupRequiredPreconditions();
results.clear();
ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
@@ -126,8 +144,10 @@ public class CreateMappingCommandTest {
@Test
public void createsMappingReturnsStatusERRORWhenClusterConfigDoesNotContainRegion() {
results.add(successFunctionResult);
- ConfigurationPersistenceService configurationPersistenceService = mock(ConfigurationPersistenceService.class);
- doReturn(configurationPersistenceService).when(createRegionMappingCommand).getConfigurationPersistenceService();
+ ConfigurationPersistenceService configurationPersistenceService =
+ mock(ConfigurationPersistenceService.class);
+ doReturn(configurationPersistenceService).when(createRegionMappingCommand)
+ .getConfigurationPersistenceService();
when(configurationPersistenceService.getCacheConfig(null)).thenReturn(cacheConfig);
when(cacheConfig.getRegions()).thenReturn(Collections.emptyList());
@@ -135,7 +155,8 @@ public class CreateMappingCommandTest {
tableName, pdxClass);
assertThat(result.getStatus()).isSameAs(Result.Status.ERROR);
- assertThat(result.toString()).contains("Cluster Configuration must contain a region named " + regionName);
+ assertThat(result.toString())
+ .contains("Cluster Configuration must contain a region named " + regionName);
}
@Test
@@ -149,8 +170,6 @@ public class CreateMappingCommandTest {
public void testUpdateClusterConfigWithOneMatchingRegionAndNoExistingElement() {
doReturn(null).when(cacheConfig).findCustomRegionElement(any(), any(), any());
List<RegionConfig> list = new ArrayList<>();
- RegionConfig matchingRegion = mock(RegionConfig.class);
- when(matchingRegion.getName()).thenReturn(regionName);
List<CacheElement> listCacheElements = new ArrayList<>();
when(matchingRegion.getCustomRegionElements()).thenReturn(listCacheElements);
list.add(matchingRegion);