Skip to content

Commit 3bdcf48

Browse files
committed
Fix tests
1 parent 09bae6d commit 3bdcf48

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

server-runner/src/test/java/org/infininspan/quarkus/server/ServerResourceTest.java

+13-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
import static io.restassured.RestAssured.given;
44
import static org.hamcrest.CoreMatchers.is;
55
import static org.junit.jupiter.api.Assertions.assertNotNull;
6+
import static org.junit.jupiter.api.Assertions.assertTrue;
7+
8+
import java.util.Set;
69

710
import org.infinispan.client.hotrod.RemoteCache;
811
import org.infinispan.client.hotrod.RemoteCacheManager;
@@ -16,6 +19,8 @@
1619
@QuarkusTestResource(ServerResourceTestResource.class)
1720
@QuarkusTest
1821
public class ServerResourceTest {
22+
public static final int PORT = 8081;
23+
1924
@Test
2025
public void testSimpleWriteAndRetrieve() {
2126
given()
@@ -47,16 +52,18 @@ public void testGetProtobuf() {
4752
@Test
4853
public void testHotRodGetCacheNames() {
4954
ConfigurationBuilder builder = new ConfigurationBuilder();
50-
builder.addServer().host("127.0.0.1").port(11222);
55+
builder.addServer().host("127.0.0.1").port(PORT);
5156

5257
RemoteCacheManager remoteCacheManager = new RemoteCacheManager(builder.build());
53-
remoteCacheManager.getCacheNames();
58+
Set<String> cacheNames = remoteCacheManager.getCacheNames();
59+
assertNotNull(cacheNames);
60+
assertTrue(cacheNames.contains("quarkus-infinispan-server"));
5461
}
5562

5663
@Test
5764
public void testHotRodGetCache() {
5865
ConfigurationBuilder builder = new ConfigurationBuilder();
59-
builder.addServer().host("127.0.0.1").port(11222);
66+
builder.addServer().host("127.0.0.1").port(PORT);
6067

6168
RemoteCacheManager remoteCacheManager = new RemoteCacheManager(builder.build());
6269
assertNotNull(remoteCacheManager.getCache("quarkus-infinispan-server"));
@@ -65,7 +72,7 @@ public void testHotRodGetCache() {
6572
@Test
6673
public void testHotRodInternalCacheOperations() {
6774
ConfigurationBuilder builder = new ConfigurationBuilder();
68-
builder.addServer().host("127.0.0.1").port(11222);
75+
builder.addServer().host("127.0.0.1").port(PORT);
6976

7077
RemoteCacheManager remoteCacheManager = new RemoteCacheManager(builder.build());
7178
RemoteCache<Object, Object> cache = remoteCacheManager.getCache("___protobuf_metadata");
@@ -76,10 +83,10 @@ public void testHotRodInternalCacheOperations() {
7683
@Test
7784
public void testHotRodCreateCache() {
7885
ConfigurationBuilder builder = new ConfigurationBuilder();
79-
builder.addServer().host("127.0.0.1").port(11222);
86+
builder.addServer().host("127.0.0.1").port(PORT);
8087

8188
RemoteCacheManager remoteCacheManager = new RemoteCacheManager(builder.build());
82-
XMLStringConfiguration config = new XMLStringConfiguration("<infinispan><cache-container><distributed-cache name=\"default\"/></cache-container></infinispan>");
89+
XMLStringConfiguration config = new XMLStringConfiguration("<infinispan><cache-container><distributed-cache name=\"created-cache\"/></cache-container></infinispan>");
8390
RemoteCache<Object, Object> cache = remoteCacheManager
8491
.administration()
8592
.getOrCreateCache("created-cache", config);

server-runner/src/test/java/org/infininspan/quarkus/server/ServerResourceTestResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public Map<String, String> start() {
1414
settings.put("quarkus.infinispan-server.data-path", "target/data");
1515
// Make server path the same as root directory
1616
settings.put("quarkus.infinispan-server.server-path", ".");
17-
settings.put("quarkus.infinispan-server.config-file", "infinispan-local.xml");
17+
settings.put("quarkus.infinispan-server.config-file", "infinispan.xml");
1818
settings.put("quarkus.infinispan-server.config-path", Paths.get("src", "test", "resources", "conf").toString());
19-
settings.put("quarkus.infinispan-server.bind-port", "8081");
19+
settings.put("quarkus.infinispan-server.bind-port", String.valueOf(ServerResourceTest.PORT));
2020

2121
// Enable the following for tracing
2222
settings.put("quarkus.log.console.level", "INFO");

server-runner/src/test/resources/conf/infinispan.xml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<cache-container>
99
<transport cluster="${infinispan.cluster.name}" stack="${infinispan.cluster.stack:tcp}"/>
10+
<local-cache name="quarkus-infinispan-server"/>
1011
</cache-container>
1112

1213
<server xmlns="urn:infinispan:server:10.0">

0 commit comments

Comments
 (0)