Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix try-catch block to appropriately handle the intentional AssertJ AsesrtionFailedError and unintentional Java AssertionError.

Browse Source 
Fixes test failures caused by erroneous AssertionError and AssertionFailedError handling.

Apply Spring's @NonNull annotation to the test methods.

Add assertion for the threadLocalConnections property on customized Pool objects.

Format source code.

Rename the usingClientCacheDefaultPoolPropertiesModifiesDefaultPool() test case method to usingClientCacheDefaultPoolPropertiesConfigurationModifiesDefaultPool().
This commit is contained in:
John Blum
2021-03-23 12:35:23 -07:00
parent 52cdf4848c
commit d869ec117a
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java vendored
View File

@@ -43,6 +43,9 @@ import org.springframework.data.gemfire.config.annotation.EnablePool;
import org.springframework.data.gemfire.config.annotation.PoolConfigurer;
import org.springframework.data.gemfire.tests.integration.SpringBootApplicationIntegrationTestsSupport;
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
import org.springframework.lang.NonNull;
import org.opentest4j.AssertionFailedError;
/**
* Integration Tests testing the custom configuration of the {@literal DEFAULT} {@link Pool}
@@ -86,8 +89,8 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
.forEach(System::clearProperty);
}
private void testNamedPoolWasCustomized(ConfigurableApplicationContext applicationContext,
String poolName, boolean poolBeanPresent) {
private void testNamedPoolWasCustomized(@NonNull ConfigurableApplicationContext applicationContext,
@NonNull String poolName, boolean poolBeanPresent) {
ClientCache clientCache = applicationContext.getBean(ClientCache.class);
@@ -104,6 +107,7 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
assertThat(namedPoolBean).isNotNull();
assertThat(namedPoolBean.getName()).isEqualTo(poolName);
assertThat(namedPoolBean.getServerGroup()).isEqualTo("TestServerGroup");
assertThat(namedPoolBean.getThreadLocalConnections()).isTrue();
}
Pool namedPool = PoolManager.find(poolName);
@@ -111,6 +115,7 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
assertThat(namedPool).isNotNull();
assertThat(namedPool.getName()).isEqualTo(poolName);
assertThat(namedPool.getServerGroup()).isEqualTo("TestServerGroup");
assertThat(namedPool.getThreadLocalConnections()).isTrue();
if (DEFAULT_POOL_NAME.equals(poolName)) {
assertThat(namedPool).isSameAs(clientCache.getDefaultPool());
@@ -122,13 +127,14 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
}
}
private void testNamedPoolWasNotCustomized(ConfigurableApplicationContext applicationContext, String poolName, boolean poolBeanPresent) {
private void testNamedPoolWasNotCustomized(@NonNull ConfigurableApplicationContext applicationContext,
@NonNull String poolName, boolean poolBeanPresent) {
try {
testNamedPoolWasCustomized(applicationContext, poolName, poolBeanPresent);
fail("Pool [%s] should not have been modified", poolName);
}
catch (Throwable ignore) { }
catch (AssertionFailedError ignore) { }
}
@Test
@@ -154,7 +160,7 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
}
@Test
public void usingClientCacheDefaultPoolPropertiesModifiesDefaultPool() {
public void usingClientCacheDefaultPoolPropertiesConfigurationModifiesDefaultPool() {
System.setProperty("spring.data.gemfire.pool.default.server-group", "TestServerGroup");
System.setProperty("spring.data.gemfire.pool.default.thread-local-connections", Boolean.TRUE.toString());
@@ -306,7 +312,12 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
@Bean
PoolConfigurer allPoolsConfigurer() {
return (beanName, poolFactoryBean) -> poolFactoryBean.setServerGroup("TestServerGroup");
return (beanName, poolFactoryBean) -> {
poolFactoryBean.setServerGroup("TestServerGroup");
poolFactoryBean.setThreadLocalConnections(true);
};
}
}
@@ -320,7 +331,12 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
@Bean
PoolConfigurer allPoolsConfigurer() {
return (beanName, poolFactoryBean) -> poolFactoryBean.setServerGroup("TestServerGroup");
return (beanName, poolFactoryBean) -> {
poolFactoryBean.setServerGroup("TestServerGroup");
poolFactoryBean.setThreadLocalConnections(true);
};
}
}
}