fix QueryRequestConverterTest

Author: ikhoon

server/src/test/java/com/linecorp/centraldogma/server/internal/api/converter/QueryRequestConverterTest.java

@@ -17,13 +17,16 @@
 package com.linecorp.centraldogma.server.internal.api.converter;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import javax.annotation.Nullable;
 
 import org.junit.jupiter.api.Test;
 
+import com.google.common.collect.ImmutableList;
+
 import com.linecorp.armeria.common.AggregatedHttpRequest;
 import com.linecorp.armeria.server.ServiceRequestContext;
 import com.linecorp.centraldogma.common.Query;
@@ -61,8 +64,7 @@ void convertJsonPathQuery() throws Exception {
         final String jsonFilePath = "/a.json";
         when(ctx.pathParam("path")).thenReturn(jsonFilePath);
 
-        final String httpQuery = "?jsonpath=%22%24.a%22";  // "$.a"
-        when(ctx.query()).thenReturn(httpQuery);
+        when(ctx.queryParams(eq("jsonpath"))).thenReturn(ImmutableList.of("\"$.a\""));
 
         final Query<?> query = convert(ctx);
         assertThat(query).isNotNull();
@@ -80,7 +82,7 @@ void withoutExpression() throws Exception {
         final String jsonFilePath = "/a.json";
         when(ctx.pathParam("path")).thenReturn(jsonFilePath);
 
-        when(ctx.query()).thenReturn("");
+        when(ctx.queryParams(eq("jsonpath"))).thenReturn(ImmutableList.of());
 
         final Query<?> query = convert(ctx);
         assertThat(query).isNotNull();

server/src/test/java/com/linecorp/centraldogma/server/internal/api/sysadmin/RawFileViewTest.java

@@ -67,7 +67,7 @@ void getFileWithViewRaw() {
                              .viewRaw(true)
                              .get().join();
         // The raw content should be equal to the original JSON text.
-        assertThat(entry.rawContent()).isEqualTo(jsonText);
+        assertThat(entry.rawContent()).isEqualTo(jsonText + '\n');
         assertThat(entry.content()).isNotNull();
         assertThatJson(entry.content()).isEqualTo("{\"b\": 2,\"a\": 1}");
 
@@ -101,12 +101,12 @@ void getFilesWithViewRaw() {
 
         assertThat(entriesWithRaw).hasSize(2);
         final Entry<?> entry1WithRaw = entriesWithRaw.get("/file1.json");
-        assertThat(entry1WithRaw.rawContent()).isEqualTo(jsonText1);
+        assertThat(entry1WithRaw.rawContent()).isEqualTo(jsonText1 + '\n');
         assertThat(entry1WithRaw.content()).isNotNull();
         assertThatJson(entry1WithRaw.content()).isEqualTo("{\"key1\":\"value1\",\"key2\":\"value2\"}");
 
         final Entry<?> entry2WithRaw = entriesWithRaw.get("/file2.json");
-        assertThat(entry2WithRaw.rawContent()).isEqualTo(jsonText2);
+        assertThat(entry2WithRaw.rawContent()).isEqualTo(jsonText2 + '\n');
         assertThat(entry2WithRaw.content()).isNotNull();
         assertThatJson(entry2WithRaw.content()).isEqualTo("{\"foo\":\"bar\"}");
 
@@ -146,7 +146,7 @@ void watchWithViewRaw() {
                                                  .start(initialResult.revision())
                                                  .join();
 
-        assertThat(entryWithRaw.rawContent()).isEqualTo(updatedJsonText);
+        assertThat(entryWithRaw.rawContent()).isEqualTo(updatedJsonText + '\n');
         assertThat(entryWithRaw.content()).isNotNull();
         assertThatJson(entryWithRaw.content()).isEqualTo("{\"version\":2}");
 
@@ -237,14 +237,14 @@ void otherQueryTypesCanBeUsedWithViewRawForFile() {
                                               .get()
                                               .join();
         assertThat(jsonEntry).isNotNull();
-        assertThat(jsonEntry.rawContent()).isEqualTo(jsonText);
+        assertThat(jsonEntry.rawContent()).isEqualTo(jsonText + '\n');
 
         // TEXT query should work with viewRaw
         final Entry<String> textEntry = repo.file(Query.ofText("/test.json"))
                                             .viewRaw(true)
                                             .get()
                                             .join();
         assertThat(textEntry).isNotNull();
-        assertThat(textEntry.rawContent()).isEqualTo(jsonText);
+        assertThat(textEntry.rawContent()).isEqualTo(jsonText + '\n');
     }
 }