test: Fixed redis enterprise tests

Author: jruaux

core/redis-enterprise-admin/redis-enterprise-admin.gradle

@@ -3,6 +3,7 @@ dependencies {
     implementation 'org.apache.httpcomponents.client5:httpclient5'
     implementation 'org.springframework:spring-core'
     implementation 'org.awaitility:awaitility'
+    testImplementation 'org.slf4j:slf4j-simple'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'

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

@@ -40,8 +40,6 @@
 import org.apache.hc.core5.http.io.entity.StringEntity;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.awaitility.Awaitility;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JavaType;
@@ -54,8 +52,6 @@
 
 public class Admin implements AutoCloseable {
 
-	private static final Logger log = LoggerFactory.getLogger(Admin.class);
-
 	public static final String DEFAULT_USER_NAME = "admin@redis.com";
 	public static final String DEFAULT_PASSWORD = "redis123";
 	public static final String DEFAULT_PROTOCOL = "https";
@@ -177,7 +173,6 @@ private <T> T post(String path, Object request, JavaType responseType)
 			throws IOException, GeneralSecurityException {
 		HttpPost post = new HttpPost(uri(path));
 		String json = objectMapper.writeValueAsString(request);
-		log.debug("POST {}", json);
 		post.setEntity(new StringEntity(json));
 		return read(header(post), responseType, HttpStatus.SC_OK);
 	}
@@ -259,7 +254,6 @@ public void deleteDatabase(long uid) {
 				return true;
 			} catch (HttpResponseException e) {
 				if (e.getStatusCode() == HttpStatus.SC_CONFLICT) {
-					log.info("Could not delete database {}, retrying...", uid);
 					return false;
 				}
 				throw e;

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

@@ -3,9 +3,6 @@
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.hc.client5.http.HttpResponseException;
@@ -27,8 +24,6 @@
 @TestInstance(Lifecycle.PER_CLASS)
 abstract class AbstractTestBase {
 
-	private static final Logger log = Logger.getLogger(AbstractTestBase.class.getName());
-
 	protected Admin admin;
 
 	@BeforeAll
@@ -46,8 +41,6 @@ void teardownAdmin() throws Exception {
 	@BeforeEach
 	void deleteAllDatabases() throws GeneralSecurityException, IOException, ParseException {
 		List<Database> databases = admin.getDatabases();
-		log.log(Level.INFO, "Deleting databases {0}",
-				databases.stream().map(Database::getUid).collect(Collectors.toList()));
 		for (Database database : databases) {
 			admin.deleteDatabase(database.getUid());
 		}
@@ -98,7 +91,7 @@ void deleteDatabase() throws ParseException, GeneralSecurityException, IOExcepti
 	@Test
 	void createDatabaseException() throws ParseException, IOException {
 		Assertions.assertThrows(HttpResponseException.class, () -> admin.createDatabase(
-				Database.builder().name("DatabaseCreateExceptionTestDB").memory(DataSize.ofGigabytes(10)).build()));
+				Database.builder().name("DatabaseCreateExceptionTestDB").memory(DataSize.ofGigabytes(999)).build()));
 	}
 
 }

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

@@ -3,14 +3,11 @@
 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;
+		return new Admin();
 	}
 
 }

core/redis-enterprise-admin/src/test/resources/redisgears.linux-bionic-x64.1.0.6.zip

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