Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ISPN-15248 Use @DirtiesContext on Spring tests to force cache manager… #11400

Merged
merged 1 commit into from
Oct 18, 2023
Merged

ISPN-15248 Use @DirtiesContext on Spring tests to force cache manager… #11400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...ng/spring-boot-3/tests/src/test/java/test/infinispan/autoconfigure/CacheDisabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package test.infinispan.autoconfigure;

//import org.infinispan.client.hotrod.RemoteCacheManager;

import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.spring.starter.embedded.InfinispanEmbeddedAutoConfiguration;
import org.infinispan.spring.starter.embedded.InfinispanEmbeddedCacheManagerAutoConfiguration;
//import org.infinispan.spring.starter.remote.InfinispanRemoteAutoConfiguration;
//import org.infinispan.spring.starter.remote.InfinispanRemoteCacheManagerAutoConfiguration;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext;

@SpringBootTest(
classes = {
Expand All @@ -27,6 +27,7 @@
"spring.cache.type=NONE",
"infinispan.remote.server-list=127.0.0.1:6667"
})
@DirtiesContext
public class CacheDisabledTest {
@Autowired
private ApplicationContext context;
Expand Down
7 changes: 3 additions & 4 deletions spring/spring-boot-3/tests/src/test/java/test/infinispan/autoconfigure/CacheManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package test.infinispan.autoconfigure;

import static org.junit.jupiter.api.Assertions.assertNotNull;
//
//import org.infinispan.client.hotrod.RemoteCacheManager;

import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.spring.starter.embedded.InfinispanEmbeddedAutoConfiguration;
import org.infinispan.spring.starter.embedded.InfinispanEmbeddedCacheManagerAutoConfiguration;
//import org.infinispan.spring.starter.remote.InfinispanRemoteAutoConfiguration;
//import org.infinispan.spring.starter.remote.InfinispanRemoteCacheManagerAutoConfiguration;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext;

@SpringBootTest(
classes = {
Expand All @@ -24,6 +22,7 @@
"spring.main.banner-mode=off",
"infinispan.remote.server-list=127.0.0.1:6667"
})
@DirtiesContext
public class CacheManagerTest {
@Autowired
private ApplicationContext context;
Expand Down
9 changes: 5 additions & 4 deletions ...3/tests/src/test/java/test/infinispan/integration/embedded/EmbeddedSpringSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package test.infinispan.integration.embedded;

import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.spring.embedded.provider.SpringEmbeddedCacheManager;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cache.CacheManager;
import org.springframework.test.annotation.DirtiesContext;
import test.infinispan.integration.AbstractSpringSessionTCK;

import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import test.infinispan.integration.AbstractSpringSessionTCK;

@SpringBootTest(classes = EmbeddedSessionApp.class,
webEnvironment= SpringBootTest.WebEnvironment.RANDOM_PORT,
Expand All @@ -24,7 +25,7 @@ public class EmbeddedSpringSessionTest extends AbstractSpringSessionTCK {
@Test
public void testCacheManagerBean() {
assertNotNull(cacheManager);
assertTrue(cacheManager instanceof SpringEmbeddedCacheManager);
assertInstanceOf(SpringEmbeddedCacheManager.class, cacheManager);
EmbeddedCacheManager nativeCacheManager = ((SpringEmbeddedCacheManager) cacheManager).getNativeCacheManager();
assertNotNull(nativeCacheManager);
}
Expand Down
11 changes: 6 additions & 5 deletions ...oot-3/tests/src/test/java/test/infinispan/integration/remote/RemoteSpringSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package test.infinispan.integration.remote;

import static org.infinispan.commons.dataconversion.MediaType.APPLICATION_SERIALIZED_OBJECT_TYPE;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
Expand All @@ -16,11 +20,8 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cache.CacheManager;
import org.springframework.test.annotation.DirtiesContext;
import test.infinispan.integration.AbstractSpringSessionTCK;

import static org.infinispan.commons.dataconversion.MediaType.APPLICATION_SERIALIZED_OBJECT_TYPE;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import test.infinispan.integration.AbstractSpringSessionTCK;

@SpringBootTest(classes = RemoteSessionApp.class,
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
Expand Down Expand Up @@ -65,7 +66,7 @@ public static void afterClass() {
@Test
public void testCacheManagerBean() {
assertNotNull(cacheManager);
assertTrue(cacheManager instanceof SpringRemoteCacheManager);
assertInstanceOf(SpringRemoteCacheManager.class, cacheManager);
RemoteCacheManager nativeCacheManager = ((SpringRemoteCacheManager) cacheManager).getNativeCacheManager();
assertNotNull(nativeCacheManager);
}
Expand Down