diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index baa8a70..d34de92 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -1,6 +1,6 @@ -= Contributing to Spring Test for Apache Geode & Pivotal GemFire += Contributing to Spring Test for Apache Geode & VMware GemFire -Spring Test for Apache Geode & Pivotal GemFire (STDG) is released under the Apache 2.0 license. If you would like to +Spring Test for Apache Geode & VMware GemFire (STDG) is released under the Apache 2.0 license. If you would like to contribute something, or simply want to hack on the code this document should help you get started. == Sign the Contributor License Agreement diff --git a/README.adoc b/README.adoc index 0dee084..ad6ce6b 100644 --- a/README.adoc +++ b/README.adoc @@ -1,27 +1,27 @@ image:https://api.travis-ci.org/spring-projects/spring-test-data-geode.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-test-data-geode"] [[about]] -== Spring Test Framework for Apache Geode & Pivotal GemFire +== Spring Test Framework for Apache Geode & VMware GemFire The STDG project is a _Spring Data_ module, building on the core _Spring Framework's_ `TestContext`, used to write _Unit_ and _Integration Tests_ when building _Spring Data_ for https://geode.apache.org/[Apache Geode] -& https://pivotal.io/pivotal-gemfire[Pivotal GemFire] (SDG) applications. +& https://pivotal.io/pivotal-gemfire[VMware GemFire] (SDG) applications. -This project was born from https://spring.io/projects/spring-data-gemfire[_Spring Data for Pivotal GemFire's_] +This project was born from https://spring.io/projects/spring-data-gemfire[_Spring Data for VMware GemFire's_] (https://github.com/spring-projects/spring-data-gemfire[@GitHub]) https://github.com/spring-projects/spring-data-gemfire/tree/2.1.6.RELEASE/src/test/java/org/springframework/data/gemfire/test[test framework]. -This _test framework_ is used in SDG's test suite to test the proper function of Apache Geode & Pivotal GemFire +This _test framework_ is used in SDG's test suite to test the proper function of Apache Geode & VMware GemFire in a _Spring_ context. -For several years now, users have asked for a way to test their Apache Geode & Pivotal GemFire based, +For several years now, users have asked for a way to test their Apache Geode & VMware GemFire based, _Spring_ applications reliably and easily, when writing _Unit_ and _Integrations_ tests. Additionally, STDG was created to consolidate the testing efforts, lessons learned, and knowledge of effectively testing -all Spring for Apache Geode/Pivotal GemFire projects: _Spring Boot for Apache Geode & Pivotal GemFire_ (SBDG) -and _Spring Session for Apache Geode & Pivotal GemFire_ (SSDG). +all Spring for Apache Geode/VMware GemFire projects: _Spring Boot for Apache Geode & VMware GemFire_ (SBDG) +and _Spring Session for Apache Geode & VMware GemFire_ (SSDG). Eventually, STDG will replace the SDG test classes so that tests and testing efforts are consistent across all Spring -projects for Apache Geode/Pivotal GemFire: SDG, SBDG and SSDG. +projects for Apache Geode/VMware GemFire: SDG, SBDG and SSDG. This (relatively) **new** project is still under development and will have documentation, examples and an extensive test suite once complete. @@ -44,7 +44,7 @@ Please see our https://github.com/spring-projects/spring-test-data-geode/securit [[license]] == License -_Spring Test for Apache Geode_ and _Spring Test for Pivotal GemFire_ is Open Source Software +_Spring Test for Apache Geode_ and _Spring Test for VMware GemFire_ is Open Source Software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license]. @@ -70,7 +70,7 @@ the "_Subject Under Test_" (SUT), honors that contract and uses the external dep are asserting that the interactions between our application components and external dependencies is correct and the results lead to the desired outcome. -Well, it is, or should be, no different when you are using Apache Geode or Pivotal GemFire. +Well, it is, or should be, no different when you are using Apache Geode or VMware GemFire. For instance, you might want to mock that your _Data Access Object_ (DAO) performs the proper interactions on a GemFire/Geode Region, performing the right CRUD operations, making sure the right (OQL) Queries are executed @@ -82,7 +82,7 @@ to make sure that our DAO interactions with the Region are correct, that it hand or other Error conditions, that it transforms values to/from the backend data store (i.e. Region), and so on. That is how you properly test the subject. -To support _Unit Testing_ with Apache Geode or Pivotal GemFire in a Spring context, STDG provides the +To support _Unit Testing_ with Apache Geode or VMware GemFire in a Spring context, STDG provides the `@EnableGemFireMockObjects` annotation. If you want to use GemFire/Geode Mock Objects, e.g. a "mock" Region rather than a "live" Region, than you simply only need to annotate your test configuration with `@EnableGemFireMockObjects`. diff --git a/build.gradle b/build.gradle index a4d685e..7d31a9b 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { apply plugin: 'io.spring.convention.root' group = 'org.springframework.data' -description = 'Spring Test Framework for Apache Geode and Pivotal GemFire using Spring Data.' +description = 'Spring Test Framework for Apache Geode and VMware GemFire using Spring Data.' ext['spring.version'] = "$springVersion" ext['spring-framework.version'] = "$springVersion" diff --git a/pom.xml b/pom.xml index 12e6813..a38ec5e 100644 --- a/pom.xml +++ b/pom.xml @@ -21,11 +21,11 @@ spring-data-gemfire-test - Spring Test Framework for Apache Geode and Pivotal GemFire + Spring Test Framework for Apache Geode and VMware GemFire This project introduces a Spring Data module building on the Spring Framework's TestContext, used to write both Unit and Integration Tests for Spring Data for Apache Geode - as well as Spring Data for Pivotal GemFire applications. + as well as Spring Data for VMware GemFire applications. https://github.com/jxblum/spring-data-tests-4-gemfire diff --git a/spring-data-gemfire-test/build.gradle b/spring-data-gemfire-test/build.gradle index db6c7ef..eac5ef0 100644 --- a/spring-data-gemfire-test/build.gradle +++ b/spring-data-gemfire-test/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'io.spring.convention.spring-module' apply from: MAVEN_POM_EDITOR_GRADLE -description = "Spring Test Framework for Pivotal GemFire" +description = "Spring Test Framework for VMware GemFire" dependencies { diff --git a/spring-data-gemfire-test/pom.xml b/spring-data-gemfire-test/pom.xml index 963519d..4323f98 100644 --- a/spring-data-gemfire-test/pom.xml +++ b/spring-data-gemfire-test/pom.xml @@ -14,10 +14,10 @@ spring-data-gemfire-test jar - Spring Test Framework for Pivotal GemFire + Spring Test Framework for VMware GemFire Module using Spring Framework's TestContext to write both Unit and Integration Tests - for Spring Data for Pivotal GemFire applications. + for Spring Data for VMware GemFire applications. https://github.com/jxblum/spring-data-tests-4-gemfire diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java index 91ceb90..2e87739 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/ForkingClientServerIntegrationTestsSupport.java @@ -37,7 +37,7 @@ import org.springframework.data.gemfire.tests.process.ProcessWrapper; /** * The {@link ForkingClientServerIntegrationTestsSupport} class is an abstract base class used to configure - * and bootstrap Apache Geode or Pivotal GemFire Server {@link Cache} and {@link ClientCache} applications. + * and bootstrap Apache Geode or VMware GemFire Server {@link Cache} and {@link ClientCache} applications. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java index 79c4ef1..93498a5 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java @@ -52,7 +52,7 @@ import org.springframework.util.ReflectionUtils; /** * The {@link IntegrationTestsSupport} class is an abstract base class supporting integration tests - * with either Apache Geode or Pivotal GemFire in a Spring context. + * with either Apache Geode or VMware GemFire in a Spring context. * * @author John Blum * @see java.io.File @@ -114,7 +114,7 @@ public abstract class IntegrationTestsSupport { } // TODO: Remove once GEODE-7157 (https://issues.apache.org/jira/browse/GEODE-7157) is fixed! - // Do the job of Apache Geode & Pivotal GemFire since it cannot do its own damn job! + // Do the job of Apache Geode & VMware GemFire since it cannot do its own damn job! @BeforeClass public static void closeAnySslConfigurationBeforeTestExecution() { diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java index 8a64bca..125f708 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/SpringBootApplicationIntegrationTestsSupport.java @@ -22,7 +22,7 @@ import org.springframework.context.ConfigurableApplicationContext; /** * The {@link SpringBootApplicationIntegrationTestsSupport} class is an extension of Spring Test - * for Apache Geode/Pivotal GemFire's {@link SpringApplicationContextIntegrationTestsSupport} class + * for Apache Geode/VMware GemFire's {@link SpringApplicationContextIntegrationTestsSupport} class * used to construct a new Spring {@link ConfigurableApplicationContext} using Spring Boot's * {@link SpringApplicationBuilder} class. * diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java index 36fbc41..6f128b7 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/ClientServerIntegrationTestsConfiguration.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; /** * The {@link ClientServerIntegrationTestsConfiguration} class is a Spring {@link Configuration} class that registers * a {@link ClientCacheConfigurer} used to configure the {@link ClientCache} {@literal DEFAULT} {@link Pool} port - * to connect to the launched Apache Geode/Pivotal GemFire Server during integration testing. + * to connect to the launched Apache Geode/VMware GemFire Server during integration testing. * * Additionally, this class registers a {@link CacheServerConfigurer} to configure the {@link CacheServer} port. * diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java index 354ddfa..74f68b3 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/config/SubscriptionEnabledClientServerIntegrationTestsConfiguration.java @@ -61,7 +61,7 @@ import org.springframework.util.StringUtils; /** * The {@link SubscriptionEnabledClientServerIntegrationTestsConfiguration} class is a base Spring {@link Configuration} - * class supporting Apache Geode or Pivotal GemFire client/server integration tests when subscriptions are enabled. + * class supporting Apache Geode or VMware GemFire client/server integration tests when subscriptions are enabled. * * Subscriptions must be enabled when {@literal Registering Interests} or {@literal Continuous Queries (CQ)}. * diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/AsyncEventQueueMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/AsyncEventQueueMockObjects.java index c54ea56..4c5e008 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/AsyncEventQueueMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/AsyncEventQueueMockObjects.java @@ -25,7 +25,7 @@ import org.apache.geode.cache.wan.GatewaySender; /** * The {@link AsyncEventQueueMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire {@link AsyncEventQueue} objects and related objects in the + * or VMware GemFire {@link AsyncEventQueue} objects and related objects in the * {@literal org.apache.geode.cache.asyncqueue} package. * * @author John Blum diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java index 9337baa..2cc56b7 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheMockObjects.java @@ -37,7 +37,7 @@ import org.apache.geode.distributed.DistributedSystem; import org.springframework.data.gemfire.util.RegionUtils; /** - * The {@link CacheMockObjects} class is a mock objects class allowing users to mock Apache Geode or Pivotal GemFire + * The {@link CacheMockObjects} class is a mock objects class allowing users to mock Apache Geode or VMware GemFire * {@link GemFireCache} objects and related objects (e.g. {@link DistributedSystem}, {@link ResourceManager}, * {@link Region}, etc). * diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheServerMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheServerMockObjects.java index bf63f97..4feb4f2 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheServerMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/CacheServerMockObjects.java @@ -32,7 +32,7 @@ import org.apache.geode.cache.server.ServerMetrics; /** * The {@link CacheServerMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire {@link CacheServer} objects and related objects in the {@literal org.apache.geode.cache.server} + * or VMware GemFire {@link CacheServer} objects and related objects in the {@literal org.apache.geode.cache.server} * package. * * @author John Blum diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/DiskStoreMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/DiskStoreMockObjects.java index 0c9cee9..9311c4e 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/DiskStoreMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/DiskStoreMockObjects.java @@ -27,7 +27,7 @@ import org.apache.geode.cache.DiskStore; /** * The {@link DiskStoreMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire {@link DiskStore} objects and related objects in the {@literal org.apache.geode.cache} package. + * or VMware GemFire {@link DiskStore} objects and related objects in the {@literal org.apache.geode.cache} package. * * @author John Blum * @see org.apache.geode.cache.DiskStore diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GatewayMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GatewayMockObjects.java index e525f62..a1858f7 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GatewayMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GatewayMockObjects.java @@ -30,7 +30,7 @@ import org.apache.geode.cache.wan.GatewaySender; /** * The {@link GatewayMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire {@link GatewayReceiver} and {@link GatewaySender} objects and related objects in + * or VMware GemFire {@link GatewayReceiver} and {@link GatewaySender} objects and related objects in * the {@literal org.apache.geode.cache.wan} package. * * @author John Blum diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java index 39e1e99..535e65b 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java @@ -160,7 +160,7 @@ import org.springframework.util.StringUtils; /** * The {@link GemFireMockObjectsSupport} class is an abstract base class encapsulating factory methods for creating - * Apache Geode or Pivotal GemFire Mock Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc). + * Apache Geode or VMware GemFire Mock Objects (e.g. {@link Cache}, {@link ClientCache}, {@link Region}, etc). * * @author John Blum * @see java.io.File @@ -341,7 +341,7 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { } /** - * Instantiates all Apache Geode/Pivotal GemFire objects which have been declared + * Instantiates all Apache Geode/VMware GemFire objects which have been declared * via {@link System#getProperties() System properties}. * * @param {@link Class type} of the {@link GemFireCache}. @@ -470,11 +470,11 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport { } /** - * Normalizes the {@link String name} of the Apache Geode/Pivotal GemFire System property by stripping off + * Normalizes the {@link String name} of the Apache Geode/VMware GemFire System property by stripping off * the {@literal gemfire.} prefix. * * @param propertyName {@link String name} of the property to normalize. - * @return the {@link String normalized form} of the Apache Geode/Pivotal GemFire System property. + * @return the {@link String normalized form} of the Apache Geode/VMware GemFire System property. * @see GemFire Properties */ private static String normalizeGemFirePropertyName(String propertyName) { diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/IndexMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/IndexMockObjects.java index d2ddfdb..eb669b7 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/IndexMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/IndexMockObjects.java @@ -27,7 +27,7 @@ import org.apache.geode.cache.query.IndexType; /** * The {@link IndexMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire {@link Index} objects and related objects in the {@literal org.apache.geode.cache.query} package. + * or VMware GemFire {@link Index} objects and related objects in the {@literal org.apache.geode.cache.query} package. * * @author John Blum * @see org.apache.geode.cache.query.Index diff --git a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/PoolMockObjects.java b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/PoolMockObjects.java index d0b28f5..b273597 100644 --- a/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/PoolMockObjects.java +++ b/spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/mock/PoolMockObjects.java @@ -31,7 +31,7 @@ import org.apache.geode.cache.query.QueryService; /** * The {@link PoolMockObjects} class is a mock objects class allowing users to manually mock Apache Geode - * or Pivotal GemFire client {@link Pool} objects and related objects in the {@literal org.apache.geode.cache.client} + * or VMware GemFire client {@link Pool} objects and related objects in the {@literal org.apache.geode.cache.client} * package. * * @author John Blum diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java index 10c78bb..c51f613 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/GemFireObjectCreationTriggeredByGemFirePropertyConfigurationIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests for Apache Geode & Pivotal GemFire {@link Object} creation when the {@link Object} configuration + * Integration Tests for Apache Geode & VMware GemFire {@link Object} creation when the {@link Object} configuration * and {@link Class} type is expressed in {@link Properties}. * * @author John Blum diff --git a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java index dc4b1e1..af64a99 100644 --- a/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java +++ b/spring-data-geode-test/src/test/java/org/springframework/data/gemfire/tests/MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests.java @@ -96,7 +96,7 @@ public class MockClientCacheDefaultPoolRegisteredWithPoolManagerUnitTests { @Test @DirtiesContext - //@Ignore("Apache Geode/Pivotal GemFire does not support Mock Pools") + //@Ignore("Apache Geode/VMware GemFire does not support Mock Pools") public void defaultPoolRegisteredWithPoolManager() { Pool defaultPool = PoolManager.find("DEFAULT");