commit 65c6a38b64b0597f456f2f60a9e79c036c63df69
author Edwin Kempin <ekempin@google.com> Fri Aug 07 09:50:19 2020 +0200
committer Edwin Kempin <ekempin@google.com> Fri Aug 07 09:51:36 2020 +0200
tree 52474d864d77d71cf6ccd21060d19d2d4f45e677
parent 881f42c5b4a7563a91896dada607caa8cb02fc39

Fix formatting of imports in FindOwnersBackend

The line representing an import missed the trailing newline.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I8818e2ddf9587d24860c9afe314831abeb9fa67c

java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParser.java

diff --git a/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParser.java b/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParser.java
index eacd196..f700fe8 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParser.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParser.java
@@ -359,6 +359,7 @@
       // write the file path
       b.append(codeOwnerConfigReference.filePath());
 
+      b.append('\n');
       return b.toString();
     }
   }

javatests/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParserTest.java

diff --git a/javatests/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParserTest.java b/javatests/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParserTest.java
index f2078f2..f79bb8f 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParserTest.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/backend/findowners/FindOwnersCodeOwnerConfigParserTest.java
@@ -58,7 +58,7 @@
               }
               b.append(
                   String.format(
-                      "%s %s%s",
+                      "%s %s%s\n",
                       keyword,
                       codeOwnerConfigReference
                           .project()
@@ -307,4 +307,31 @@
               .isEqualTo(CodeOwnerConfigImportMode.GLOBAL_CODE_OWNER_SETS_ONLY);
         });
   }
+
+  @Test
+  public void importMultipleCodeOwnerConfigs() throws Exception {
+    Path path1 = Paths.get("/foo/bar/OWNERS");
+    CodeOwnerConfigReference codeOwnerConfigReference1 =
+        CodeOwnerConfigReference.builder(CodeOwnerConfigImportMode.ALL, path1).build();
+    Path path2 = Paths.get("/foo/baz/OWNERS");
+    CodeOwnerConfigReference codeOwnerConfigReference2 =
+        CodeOwnerConfigReference.builder(
+                CodeOwnerConfigImportMode.GLOBAL_CODE_OWNER_SETS_ONLY, path2)
+            .build();
+    assertParseAndFormat(
+        getCodeOwnerConfig(codeOwnerConfigReference1, codeOwnerConfigReference2),
+        codeOwnerConfig -> {
+          assertThat(codeOwnerConfig).hasImportsThat().hasSize(2);
+          assertThat(codeOwnerConfig)
+              .hasImportsThat()
+              .element(0)
+              .hasFilePathThat()
+              .isEqualTo(path1);
+          assertThat(codeOwnerConfig)
+              .hasImportsThat()
+              .element(1)
+              .hasFilePathThat()
+              .isEqualTo(path2);
+        });
+  }
 }