Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test: Address DEFAULT_DIALECT search config change #3184

Merged
merged 1 commit into from
Oct 30, 2022
Merged

Test: Address DEFAULT_DIALECT search config change #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions src/test/java/redis/clients/jedis/modules/search/SearchConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package redis.clients.jedis.modules.search;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;

import java.util.Collections;
import java.util.Map;
import org.junit.BeforeClass;
import org.junit.Test;
import redis.clients.jedis.exceptions.JedisDataException;
import redis.clients.jedis.modules.RedisModuleCommandsTestBase;

public class SearchConfigTest extends RedisModuleCommandsTestBase {

@BeforeClass
public static void prepare() {
RedisModuleCommandsTestBase.prepare();
}
//
// @AfterClass
// public static void tearDown() {
//// RedisModuleCommandsTestBase.tearDown();
// }

@Test
public void config() {
Map<String, String> map = client.ftConfigGet("TIMEOUT");
assertEquals(1, map.size());
String value = map.get("TIMEOUT");
assertNotNull(value);

assertEquals("OK", client.ftConfigSet("timeout", value));
}

@Test
public void configOnTimeout() {
// confirm default
assertEquals(Collections.singletonMap("ON_TIMEOUT", "return"), client.ftConfigGet("ON_TIMEOUT"));

assertEquals("OK", client.ftConfigSet("ON_TIMEOUT", "fail"));
assertEquals(Collections.singletonMap("ON_TIMEOUT", "fail"), client.ftConfigGet("ON_TIMEOUT"));

// restore to default
assertEquals("OK", client.ftConfigSet("ON_TIMEOUT", "return"));
}

@Test
public void dialectConfig() {
// confirm default
assertEquals(Collections.singletonMap("DEFAULT_DIALECT", "1"), client.ftConfigGet("DEFAULT_DIALECT"));

assertEquals("OK", client.ftConfigSet("DEFAULT_DIALECT", "2"));
assertEquals(Collections.singletonMap("DEFAULT_DIALECT", "2"), client.ftConfigGet("DEFAULT_DIALECT"));

// restore to default
assertEquals("OK", client.ftConfigSet("DEFAULT_DIALECT", "1"));
}
}
44 changes: 0 additions & 44 deletions src/test/java/redis/clients/jedis/modules/search/SearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,26 +913,6 @@ public void blobField() throws Exception {
assertArrayEquals(blob, (byte[]) res.getDocuments().get(0).get("field2"));
}

@Test
public void config() throws Exception {
assertEquals("OK", client.ftConfigSet("timeout", "100"));
Map<String, String> configMap = client.ftConfigGet("*");
assertEquals("100", configMap.get("TIMEOUT"));
}

@Test
public void configOnTimeout() throws Exception {
assertEquals("OK", client.ftConfigSet("ON_TIMEOUT", "fail"));
assertEquals(Collections.singletonMap("ON_TIMEOUT", "fail"), client.ftConfigGet("ON_TIMEOUT"));

try {
client.ftConfigSet("ON_TIMEOUT", "null");
fail("null is not valid value for ON_TIMEOUT");
} catch (JedisDataException e) {
// Should throw an exception after RediSearch 2.2
}
}

@Test
public void alias() throws Exception {
Schema sc = new Schema().addTextField("field1", 1.0);
Expand Down Expand Up @@ -1043,30 +1023,6 @@ public void inOrder() {
assertEquals("not", res.getDocuments().get(0).get("field2"));
}

@Test
public void testDialectConfig() {
// confirm default
assertEquals(Collections.singletonMap("DEFAULT_DIALECT", "1"), client.ftConfigGet("DEFAULT_DIALECT"));

assertEquals("OK", client.ftConfigSet("DEFAULT_DIALECT", "2"));
assertEquals(Collections.singletonMap("DEFAULT_DIALECT", "2"), client.ftConfigGet("DEFAULT_DIALECT"));

try {
client.ftConfigSet("DEFAULT_DIALECT", "0");
fail();
} catch (JedisDataException ex) {
}

try {
client.ftConfigSet("DEFAULT_DIALECT", "3");
fail();
} catch (JedisDataException ex) {
}

// Restore to default
assertEquals("OK", client.ftConfigSet("DEFAULT_DIALECT", "1"));
}

@Test
public void testDialectsWithFTExplain() throws Exception {
Map<String, Object> attr = new HashMap<>();
Expand Down