Extend o.s.d.g.tests.integration.IntegrationTestsSupport.

Format source code.

Optimize imports.
This commit is contained in:
John Blum
2019-09-03 13:01:22 -07:00
parent e5859e8ebf
commit d16e36a38f
2 changed files with 11 additions and 5 deletions

View File

@@ -13,17 +13,19 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.geode.config.annotation;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.geode.cache.GemFireCache;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
import org.springframework.data.gemfire.config.annotation.PeerCacheApplication;
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -37,6 +39,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @see org.junit.Test
* @see org.apache.geode.cache.GemFireCache
* @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
* @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport
* @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects
* @see org.springframework.test.context.ContextConfiguration
* @see org.springframework.test.context.junit4.SpringRunner
@@ -45,7 +48,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@ContextConfiguration
@SuppressWarnings("unused")
public class MemberNameOverridesCacheNameIntegrationTests {
public class MemberNameOverridesCacheNameIntegrationTests extends IntegrationTestsSupport {
@Autowired
private GemFireCache gemfireCache;

View File

@@ -20,10 +20,12 @@ import static org.mockito.Mockito.mock;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.data.gemfire.CacheFactoryBean;
import org.springframework.data.gemfire.config.annotation.ClientCacheApplication;
import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport;
import org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects;
import org.springframework.geode.security.support.SecurityManagerProxy;
import org.springframework.test.context.ContextConfiguration;
@@ -38,6 +40,7 @@ import org.springframework.test.context.junit4.SpringRunner;
* @see org.apache.geode.security.SecurityManager
* @see org.springframework.data.gemfire.CacheFactoryBean
* @see org.springframework.data.gemfire.config.annotation.ClientCacheApplication
* @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport
* @see org.springframework.data.gemfire.tests.mock.annotation.EnableGemFireMockObjects
* @see org.springframework.geode.security.support.SecurityManagerProxy
* @see org.springframework.test.context.ContextConfiguration
@@ -46,14 +49,14 @@ import org.springframework.test.context.junit4.SpringRunner;
*/
@RunWith(SpringRunner.class)
@ContextConfiguration
public class SecurityManagerConfigurationIntegrationTests {
public class SecurityManagerConfigurationIntegrationTests extends IntegrationTestsSupport {
private static final String GEMFIRE_LOG_LEVEL = "error";
@Autowired
public CacheFactoryBean cacheFactoryBean;
@Autowired
@Autowired @SuppressWarnings("unused")
private org.apache.geode.security.SecurityManager securityManager;
@Test
@@ -81,7 +84,7 @@ public class SecurityManagerConfigurationIntegrationTests {
@EnableSecurityManager
static class TestConfiguration {
@Bean
@Bean @SuppressWarnings("unused")
org.apache.geode.security.SecurityManager mockSecurityManager() {
return mock(org.apache.geode.security.SecurityManager.class);
}