Reset the ClusterAwareConfiguration.ClusterAwareCondition before & after test class (suite) execution.

Refactor the test case method names in the ClusterConfigurationWhenNonSecureClusterAvailableIntegrationTests class to be apparent that HTTPS is *not* required.
This commit is contained in:
John Blum
2021-03-24 21:28:24 -07:00
parent 430c2097a9
commit 8f6a38ae81
2 changed files with 16 additions and 7 deletions

View File

@@ -18,6 +18,7 @@ package org.springframework.geode.boot.autoconfigure.cluster.config;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -61,7 +62,7 @@ import org.springframework.test.context.junit4.SpringRunner;
public class ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIntegrationTests
extends IntegrationTestsSupport {
@AfterClass
@BeforeClass @AfterClass
public static void resetClusterAwareCondition() {
ClusterAwareConfiguration.ClusterAwareCondition.reset();
}
@@ -73,7 +74,7 @@ public class ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIn
private ClusterConfigurationConfiguration configuration;
@Test
public void configurationStatesManagementRestApiRequiresHttps() {
public void configurationStatesManagementRestApiDoesNotRequireHttps() {
boolean configurationRequiresHttps =
ObjectUtils.invoke(this.configuration, "resolveManagementRequireHttps");
@@ -82,8 +83,12 @@ public class ClusterConfigurationWithClusterAwareWhenNonSecureClusterAvailableIn
}
@Test
public void environmentStatesManagementRestApiRequiresHttps() {
assertThat(this.environment.containsProperty("spring.data.gemfire.management.require-https")).isFalse();
public void environmentStatesManagementRestApiDoesNotRequireHttps() {
boolean environmentRequiresHttps =
this.environment.containsProperty("spring.data.gemfire.management.require-https");
assertThat(environmentRequiresHttps).isFalse();
}
@SpringBootApplication

View File

@@ -18,6 +18,7 @@ package org.springframework.geode.boot.autoconfigure.cluster.config;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -65,7 +66,7 @@ import org.springframework.test.context.junit4.SpringRunner;
public class ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableIntegrationTests
extends IntegrationTestsSupport {
@AfterClass
@BeforeClass @AfterClass
public static void resetClusterAwareCondition() {
ClusterAwareConfiguration.ClusterAwareCondition.reset();
}
@@ -87,8 +88,11 @@ public class ClusterConfigurationWithClusterAwareWhenSecureClusterAvailableInteg
@Test
public void environmentStatesManagementRestApiRequiresHttps() {
assertThat(this.environment.getProperty("spring.data.gemfire.management.require-https", Boolean.class))
.isTrue();
boolean environmentRequiresHttps =
this.environment.getProperty("spring.data.gemfire.management.require-https", Boolean.class);
assertThat(environmentRequiresHttps).isTrue();
}
@SpringBootApplication