ISPN-141766 Move OverviewReportIT to RESTAuthorizationTest

We lost the check for the Memcached client... I wasn't able to use it from RESTAuthorizationTest.
infinispan · Sep 11, 2023 · 5803f7a · 5803f7a
1 parent 9f427e5
commit 5803f7a
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 68 deletions.
diff --git a/server/tests/src/test/java/org/infinispan/server/functional/overview/OverviewReportIT.java b/server/tests/src/test/java/org/infinispan/server/functional/overview/OverviewReportIT.java
diff --git a/...sts/src/test/java/org/infinispan/server/security/authorization/RESTAuthorizationTest.java b/...sts/src/test/java/org/infinispan/server/security/authorization/RESTAuthorizationTest.java
@@ -1,5 +1,6 @@
 package org.infinispan.server.security.authorization;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.infinispan.client.rest.RestResponse.ACCEPTED;
 import static org.infinispan.client.rest.RestResponse.CREATED;
 import static org.infinispan.client.rest.RestResponse.FORBIDDEN;
@@ -12,6 +13,8 @@
 import static org.infinispan.server.test.core.Common.assertStatusAndBodyEquals;
 import static org.infinispan.server.test.core.Common.awaitStatus;
 import static org.infinispan.server.test.core.Common.sync;
+import static org.infinispan.server.test.core.TestSystemPropertyNames.HOTROD_CLIENT_SASL_MECHANISM;
+import static org.infinispan.util.concurrent.CompletionStages.join;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -35,6 +38,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.infinispan.client.hotrod.RemoteCacheManager;
+import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
 import org.infinispan.client.rest.RestCacheClient;
 import org.infinispan.client.rest.RestCacheManagerClient;
 import org.infinispan.client.rest.RestClient;
@@ -54,7 +59,9 @@
 import org.infinispan.configuration.cache.CacheMode;
 import org.infinispan.configuration.cache.XSiteStateTransferMode;
 import org.infinispan.query.remote.client.ProtobufMetadataManagerConstants;
+import org.infinispan.rest.assertion.ResponseAssertion;
 import org.infinispan.rest.resources.WeakSSEListener;
+import org.infinispan.server.test.api.RestTestClientDriver;
 import org.infinispan.server.test.api.TestUser;
 import org.infinispan.server.test.junit5.InfinispanServerExtension;
 import org.infinispan.util.concurrent.CompletionStages;
@@ -587,6 +594,40 @@ public void testRoleManipulation() {
       }
    }
 
+   @Test
+   public void overviewReport() {
+      // use REST
+      String cacheName = ext.getMethodName();
+      RestTestClientDriver driver = ext.rest().withClientConfiguration(restBuilders.get(TestUser.ADMIN));
+      RestCacheClient adminCache = driver
+              .withCacheMode(CacheMode.DIST_SYNC).create().cache(cacheName);
+      join(adminCache.put("ok", "ok"));
+
+      ConfigurationBuilder hotRodBuilder = new ConfigurationBuilder();
+      hotRodBuilder.security().authentication()
+              .saslMechanism(System.getProperty(HOTROD_CLIENT_SASL_MECHANISM, "SCRAM-SHA-1"))
+              .serverName("infinispan")
+              .realm("default")
+              .username(TestUser.DEPLOYER.getUser())
+              .password(TestUser.DEPLOYER.getPassword());
+
+      // use HotRod
+      RemoteCacheManager cacheManager = ext.hotrod().withClientConfiguration(hotRodBuilder).createRemoteCacheManager();
+      cacheManager.getCache(cacheName).put("ciao", "ciao");
+
+      CompletionStage<RestResponse> response = driver.get().server().overviewReport();
+      ResponseAssertion.assertThat(response).isOk();
+      Json report = Json.read(join(response).getBody());
+      assertThat(report).isNotNull();
+
+      Map<String, Json> clients = report.at("clients").asJsonMap();
+      assertThat(clients).containsKeys("SinglePort");
+
+      Map<String, Json> singlePort = clients.get("SinglePort").asJsonMap();
+      assertThat(singlePort.get("protocol-versions").asList()).isNotEmpty();
+      assertThat(singlePort.get("client-library-names").asList()).isNotEmpty();
+   }
+
    private void createIndexedCache() {
       String schema = Exceptions.unchecked(() -> Util.getResourceAsString("/sample_bank_account/bank.proto", this.getClass().getClassLoader()));
       RestClient adminClient = ext.rest().withClientConfiguration(restBuilders.get(TestUser.ADMIN)).get();