commit b2d47514cf75c8cd991545a77ceec93fe1351d0e
author Stephen Li <stephenli@google.com> Tue Aug 15 10:32:59 2017 -0700
committer Stephen Li <stephenli@google.com> Tue Aug 15 10:32:59 2017 -0700
tree 4caa63b5cc05e1d512ecd4bedd310ce6e56c345f
parent 241e43133106a2e8bf0964167d1e2063d8b546aa

Make addProjects add even to setProjects.

addProjects should apply even on top of setProjects. This matches the behavior as documented.

Change-Id: Icd435951d55e23b1e241179625bbec07b9a3e42a

src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
index 703ad75..762e85d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
@@ -316,8 +316,6 @@
     if (!setProjects.isEmpty()) {
       projects.clear();
       projects.addAll(setProjects);
-      // if we set projects we can ignore the rest
-      return projects;
     }
     List<String> addProjects =
         Arrays.asList(

src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
index 75de6b4..c0ef3f1 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
@@ -63,6 +63,7 @@
     Set<String> otherExpectedProjects = new HashSet<String>();
     otherExpectedProjects.add("platform/some/project");
     otherExpectedProjects.add("platform/other/project");
+    otherExpectedProjects.add("platform/added/project");
     assertThat(configLoader.getProjectsInScope("master", "ds_two"))
         .isEqualTo(otherExpectedProjects);
   }