Fix failing ModuleTest & test against 8.0-RC1-pre

src/test/java/redis/clients/jedis/commands/jedis/ModuleTest.java

@@ -1,9 +1,13 @@
 package redis.clients.jedis.commands.jedis;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collections;
 import java.util.List;
 
 import org.junit.Assume;
@@ -53,15 +57,16 @@ public void testModules() {
 
       List<Module> modules = jedis.moduleList();
 
-      assertEquals("testmodule", modules.get(0).getName());
+      assertThat(modules, hasItem(hasProperty("name", equalTo("testmodule"))));
 
       Object output = jedis.sendCommand(ModuleCommand.SIMPLE);
       assertTrue((Long) output > 0);
 
     } finally {
 
       assertEquals("OK", jedis.moduleUnload("testmodule"));
-      assertEquals(Collections.emptyList(), jedis.moduleList());
+      List<Module> modules = jedis.moduleList();
+      assertThat(modules, not(hasItem(hasProperty("name", equalTo("testmodule")))));
     }
   }
 }

src/test/java/redis/clients/jedis/modules/search/SearchTest.java

@@ -573,7 +573,8 @@ public void dropIndex() throws Exception {
       client.ftSearch(index, new Query("hello world"));
       fail("Index should not exist.");
     } catch (JedisDataException de) {
-      assertTrue(de.getMessage().contains("no such index"));
+      // error message updated to "No such index" with Redis 8.0.0
+      assertTrue(de.getMessage().toLowerCase().contains("no such index"));
     }
     assertEquals(100, client.dbSize());
   }

src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java

@@ -735,7 +735,8 @@ public void dropIndex() {
       client.ftSearch(index, "hello world");
       fail("Index should not exist.");
     } catch (JedisDataException de) {
-      assertTrue(de.getMessage().contains("no such index"));
+      // toLowerCase - Error message updated to "No such index" with Redis 8.0.0
+      assertTrue(de.getMessage().toLowerCase().contains("no such index"));
     }
     assertEquals(100, client.dbSize());
   }

src/test/resources/env/.env

@@ -1,5 +1,5 @@
-REDIS_VERSION=8.0-M05-pre
-REDIS_STACK_VERSION=8.0-M05-pre
+REDIS_VERSION=8.0-RC1-pre
+REDIS_STACK_VERSION=8.0-RC1-pre
 CLIENT_LIBS_TEST_IMAGE=redislabs/client-libs-test
 REDIS_ENV_CONF_DIR=./
 REDIS_MODULES_DIR=/tmp