added date format, fixed junit

meilisearch · Feb 22, 2025 · 0b72a1c · 0b72a1c
1 parent 6b83259
commit 0b72a1c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/com/meilisearch/sdk/http/URLBuilder.java b/src/main/java/com/meilisearch/sdk/http/URLBuilder.java
@@ -67,7 +67,8 @@ public URLBuilder addParameter(String parameter, int[] value) {
 
     public URLBuilder addParameter(String parameter, Date value) {
         if (value != null) {
-            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            // Changed to utilise RFC 3339 format
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
             addSeparator();
             params.append(parameter);
             params.append("=");

diff --git a/src/test/java/com/meilisearch/integration/TasksTest.java b/src/test/java/com/meilisearch/integration/TasksTest.java
@@ -9,8 +9,7 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.meilisearch.integration.classes.AbstractIT;
 import com.meilisearch.integration.classes.TestData;
@@ -229,7 +228,8 @@ public void testGetTasksInReverse() {
                 Arrays.stream(defaultTaskList).map(Task::getUid).collect(Collectors.toList());
         List<Integer> reversedTaskOrder =
                 Arrays.stream(reversedTaskList).map(Task::getUid).collect(Collectors.toList());
-
+        assertFalse(originalTaskOrder.isEmpty());
+        assertFalse(reversedTaskOrder.isEmpty());
         assertIterableEquals(
                 originalTaskOrder,
                 reversedTaskOrder.stream()

diff --git a/src/test/java/com/meilisearch/sdk/http/URLBuilderTest.java b/src/test/java/com/meilisearch/sdk/http/URLBuilderTest.java
@@ -8,12 +8,19 @@
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.TimeZone;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class URLBuilderTest {
 
     private final URLBuilder classToTest = new URLBuilder();
 
+    @BeforeEach
+    void beforeEach() {
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    }
+
     @Test
     void addSubroute() {
         classToTest.addSubroute("route");
@@ -92,17 +99,18 @@ void addParameterStringIntArray() {
 
     @Test
     void addParameterStringDate() throws Exception {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = format.parse("2042-01-30");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        Date date = format.parse("2042-01-30T10:30:00-05:00");
 
         classToTest.addParameter("parameter1", date);
         String parameterDate1 =
                 classToTest
                         .getParams()
                         .toString()
                         .substring(12, classToTest.getParams().toString().length());
-        assertDoesNotThrow(() -> DateTimeFormatter.ISO_DATE.parse(parameterDate1));
-        assertThat(classToTest.getParams().toString(), is(equalTo("?parameter1=2042-01-30")));
+
+        assertDoesNotThrow(() -> format.parse(parameterDate1));
+        assertEquals(classToTest.getParams().toString(), "?parameter1=" + format.format(date));
 
         classToTest.addParameter("parameter2", date);
         String parameterDate2 =