opendev/gerrit
Code Issues Proposed changes

Add acceptance test for project watches

Browse Source 
This currently only contains a single test, for a particular bug
experienced by the Go team. More tests should definitely be added
later.

Change-Id: I820b597ae5efff6cd9d9ad5b2eef9fc5f274e9a2
This commit is contained in:
Dave Borowitz 2015-04-16 14:52:24 -07:00
parent 0d398d79c9
commit 65148d18de
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/ProjectWatchIT.java Normal file
View File

@ -0,0 +1,78 @@
// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.acceptance.server.project;
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType;
import com.google.gerrit.server.git.NotifyConfig;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.mail.Address;
import com.google.gerrit.testutil.FakeEmailSender;
import com.google.gerrit.testutil.FakeEmailSender.Message;
import com.google.inject.Inject;
import org.junit.Test;
import java.util.EnumSet;
import java.util.List;
@NoHttpd
public class ProjectWatchIT extends AbstractDaemonTest {
@Inject
private FakeEmailSender sender;
@Test
public void newPatchSetsNotifyConfig() throws Exception {
Address addr = new Address("Watcher", "watcher@example.com");
NotifyConfig nc = new NotifyConfig();
nc.addEmail(addr);
nc.setName("new-patch-set");
nc.setHeader(NotifyConfig.Header.CC);
nc.setTypes(EnumSet.of(NotifyType.NEW_PATCHSETS));
nc.setFilter("message:sekret");
ProjectConfig cfg = projectCache.checkedGet(project).getConfig();
cfg.putNotifyConfig("watch", nc);
saveProjectConfig(project, cfg);
PushOneCommit.Result r = pushFactory.create(db, admin.getIdent(), testRepo,
"original subject", "a", "a1")
.to("refs/for/master");
r.assertOkStatus();
r = pushFactory.create(db, admin.getIdent(), testRepo,
"super sekret subject", "a", "a2", r.getChangeId())
.to("refs/for/master");
r.assertOkStatus();
r = pushFactory.create(db, admin.getIdent(), testRepo,
"back to original subject", "a", "a3")
.to("refs/for/master");
r.assertOkStatus();
List<Message> messages = sender.getMessages();
assertThat(messages).hasSize(1);
Message m = messages.get(0);
assertThat(m.rcpt()).containsExactly(addr);
assertThat(m.body()).contains("Change subject: super sekret subject\n");
assertThat(m.body()).contains("Gerrit-PatchSet: 2\n");
}
// TODO(anybody reading this): More tests.
}

4
gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
View File

@ -305,6 +305,10 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
return notifySections.values();
}
public void putNotifyConfig(String name, NotifyConfig nc) {
notifySections.put(name, nc);
}
public Map<String, LabelType> getLabelSections() {
return labelSections;
}