Skip to content

Commit 20f563d

Browse files
committed
Fix test cases
1 parent b60a5f3 commit 20f563d

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
root = true
1+
# root = true
22

33
[*]
44
charset = utf-8

src/main/java/com/meilisearch/sdk/model/FilterableAttribute.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ public FilterableAttribute(String[] patterns) {
4242
}
4343

4444
public FilterableAttribute(
45-
public FilterableAttribute(String[] patterns, boolean facetSearch, Map<String, Boolean> filters) {
46-
if (patterns == null) throw new IllegalArgumentException("Patterns cannot be null");
47-
if (filters == null) throw new IllegalArgumentException("Filters cannot be null");
48-
boolean patternHasGeo = false;
49-
for (String s : patterns)
50-
if (_GEO.equals(s)) {
51-
patternHasGeo = true;
52-
break;
53-
}
54-
if (patternHasGeo) checkGeoValidation(facetSearch, filters);
55-
this.patterns = Arrays.copyOf(patterns, patterns.length); // defensive copy
56-
this.facetSearch = facetSearch;
57-
this.filter = new HashMap<>(filters); // defensive copy
58-
}
45+
String[] patterns, boolean facetSearch, Map<String, Boolean> filters) {
46+
if (patterns == null) throw new IllegalArgumentException("Patterns cannot be null");
47+
if (filters == null) throw new IllegalArgumentException("Filters cannot be null");
48+
boolean patternHasGeo = false;
49+
for (String s : patterns)
50+
if (_GEO.equals(s)) {
51+
patternHasGeo = true;
52+
break;
53+
}
54+
if (patternHasGeo) checkGeoValidation(facetSearch, filters);
55+
this.patterns = Arrays.copyOf(patterns, patterns.length); // defensive copy
56+
this.facetSearch = facetSearch;
57+
this.filter = new HashMap<>(filters); // defensive copy
58+
}
5959

6060
private static void checkGeoValidation(boolean facetSearch, Map<String, Boolean> filters) {
6161
String[] errors = new String[3];

src/test/java/com/meilisearch/integration/ClientTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ public void testTransientFieldExclusion() throws MeilisearchException {
321321
new GsonBuilder().excludeFieldsWithModifiers(Modifier.STATIC).create();
322322

323323
// TODO: Throws StackOverflowError on JDK 1.8, but InaccessibleObjectException on JDK9+
324-
Assertions.assertThrows(StackOverflowError.class, () -> gsonWithTransient.toJson(test));
324+
Assertions.assertThrows(
325+
Exception.class,
326+
() -> gsonWithTransient.toJson(test)); // accommodating upgrade to jdk 11
325327
Assertions.assertDoesNotThrow(() -> gson.toJson(test));
326328
}
327329
}

src/test/java/com/meilisearch/sdk/json/GsonFilterableAttributeSerializerTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import static org.junit.jupiter.api.Assertions.*;
44

5+
import com.google.gson.JsonElement;
56
import com.google.gson.JsonParseException;
7+
import com.google.gson.JsonParser;
68
import com.meilisearch.sdk.model.FilterableAttribute;
79
import java.util.HashMap;
810
import java.util.Map;
@@ -95,7 +97,12 @@ public void testMixedSerializationWithFeatures() {
9597
String expectedOutput =
9698
"[{\"attributePatterns\":[\"attribute1\",\"attribute2\"],\"features\":{\"facetSearch\":true,\"filter\":{\"comparison\":true,\"equality\":false}}},\"attribute3\"]";
9799
String array = handler.encode(new FilterableAttribute[] {input, input2});
98-
assertEquals(expectedOutput, array);
100+
101+
// Parse JSON strings for comparison
102+
JsonElement expectedJson = JsonParser.parseString(expectedOutput);
103+
JsonElement actualJson = JsonParser.parseString(array);
104+
105+
assertEquals(expectedJson, actualJson);
99106
}
100107

101108
@Test

0 commit comments

Comments
 (0)