feat: Added getters on Admin

Author: jruaux

core/redis-enterprise-admin/src/main/java/com/redis/enterprise/Admin.java

@@ -86,6 +86,26 @@ public void close() throws IOException {
 		}
 	}
 
+	public String getUserName() {
+		return userName;
+	}
+
+	public int getPort() {
+		return port;
+	}
+
+	public String getProtocol() {
+		return protocol;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public String getHost() {
+		return host;
+	}
+
 	public Admin withHost(String host) {
 		this.host = host;
 		return this;

…ava/com/redis/enterprise/AdminTests.java …m/redis/enterprise/AbstractTestBase.javacore/redis-enterprise-admin/src/test/java/com/redis/enterprise/AdminTests.java renamed to core/redis-enterprise-admin/src/test/java/com/redis/enterprise/AbstractTestBase.java core/redis-enterprise-admin/src/test/java/com/redis/enterprise/AdminTests.java renamed to core/redis-enterprise-admin/src/test/java/com/redis/enterprise/AbstractTestBase.java

@@ -18,40 +18,28 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
-import org.junit.jupiter.api.condition.EnabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 import org.springframework.util.unit.DataSize;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-import com.redis.testcontainers.RedisEnterpriseContainer;
 
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 
-@Testcontainers
 @TestInstance(Lifecycle.PER_CLASS)
-@EnabledOnOs(value = OS.LINUX)
-class AdminTests {
-
-	private static final Logger log = Logger.getLogger(AdminTests.class.getName());
+abstract class AbstractTestBase {
 
-	@Container
-	private static RedisEnterpriseContainer server = new RedisEnterpriseContainer(
-			RedisEnterpriseContainer.DEFAULT_IMAGE_NAME.withTag(RedisEnterpriseContainer.DEFAULT_TAG));
+	private static final Logger log = Logger.getLogger(AbstractTestBase.class.getName());
 
-	private static Admin admin;
+	protected Admin admin;
 
 	@BeforeAll
-	static void setupAdmin() throws ParseException, GeneralSecurityException, IOException {
-		admin = new Admin();
-		admin.withUserName(RedisEnterpriseContainer.ADMIN_USERNAME)
-				.withPassword(RedisEnterpriseContainer.ADMIN_PASSWORD).withHost(server.getHost());
+	void setupAdmin() throws ParseException, GeneralSecurityException, IOException {
+		admin = admin();
 	}
 
+	protected abstract Admin admin();
+
 	@AfterAll
-	static void teardownAdmin() throws Exception {
+	void teardownAdmin() throws Exception {
 		admin.close();
 	}
 
@@ -77,13 +65,12 @@ void createDatabase() throws ParseException, GeneralSecurityException, IOExcepti
 	@Test
 	void createClusterDatabase() throws ParseException, GeneralSecurityException, IOException {
 		String databaseName = "CreateClusterDBTest";
-		admin.createDatabase(Database.builder().name(databaseName).ossCluster(true)
-				.port(RedisEnterpriseContainer.DEFAULT_DATABASE_PORT).build());
+		admin.createDatabase(Database.builder().name(databaseName).ossCluster(true).port(12000).build());
 		List<Database> databases = admin.getDatabases();
 		Assertions.assertEquals(1, databases.size());
 		Assertions.assertEquals(databaseName, databases.get(0).getName());
 		Database database = databases.get(0);
-		RedisClusterClient client = RedisClusterClient.create(RedisURI.create(server.getHost(), database.getPort()));
+		RedisClusterClient client = RedisClusterClient.create(RedisURI.create(admin.getHost(), database.getPort()));
 		try (StatefulRedisClusterConnection<String, String> connection = client.connect()) {
 			Assertions.assertEquals("PONG", connection.sync().ping());
 		}

core/redis-enterprise-admin/src/test/java/com/redis/enterprise/RedisEnterpriseContainerTests.java

@@ -0,0 +1,25 @@
+package com.redis.enterprise;
+
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import com.redis.testcontainers.RedisEnterpriseContainer;
+
+@Testcontainers
+@EnabledOnOs(value = OS.LINUX)
+class RedisEnterpriseContainerTests extends AbstractTestBase {
+
+	@Container
+	private static RedisEnterpriseContainer server = new RedisEnterpriseContainer(
+			RedisEnterpriseContainer.DEFAULT_IMAGE_NAME.withTag(RedisEnterpriseContainer.DEFAULT_TAG));
+
+	@Override
+	protected Admin admin() {
+		Admin admin = new Admin();
+		admin.withHost(server.getHost());
+		return admin;
+	}
+
+}

core/redis-enterprise-admin/src/test/java/com/redis/enterprise/RedisEnterpriseServerTests.java

@@ -0,0 +1,16 @@
+package com.redis.enterprise;
+
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+@EnabledOnOs(value = OS.MAC)
+class RedisEnterpriseServerTests extends AbstractTestBase {
+
+	@Override
+	protected Admin admin() {
+		Admin admin = new Admin();
+		admin.withHost("nuc");
+		return admin;
+	}
+
+}

gradle.properties

@@ -8,7 +8,7 @@ springBootVersion          = 3.2.2
 
 jacocoVersion              = 0.8.11
 lettucemodVersion          = 3.7.3
-testcontainersRedisVersion = 2.0.2
+testcontainersRedisVersion = 2.0.3-SNAPSHOT
 
 org.gradle.daemon          = false
 org.gradle.caching         = false