opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'change-messages'

Browse Source 
* changes:
  Store change messages in notedb when notedb is rebuilt
  Add change message when hashtags are added/removed
This commit is contained in:
David Pursehouse
2016-01-27 01:05:23 +00:00
committed by Gerrit Code Review
parent c3f258ef58 0c0a203fcb
commit 41217fe7b0
5 changed files with 126 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
View File

@@ -17,16 +17,22 @@ package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
import com.google.common.truth.IterableSubject;
import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.extensions.api.changes.HashtagsInput;
import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gwtorm.server.OrmException;
import org.junit.Before;
import org.junit.Test;
import java.sql.Timestamp;
@NoHttpd
public class HashtagsIT extends AbstractDaemonTest {
@Before
@@ -48,11 +54,13 @@ public class HashtagsIT extends AbstractDaemonTest {
// Adding a single hashtag returns a single hashtag.
addHashtags(r, "tag2");
assertThatGet(r).containsExactly("tag2");
assertMessage(r, "Hashtag added: tag2");
// Adding another single hashtag to change that already has one hashtag
// returns a sorted list of hashtags with existing and new.
addHashtags(r, "tag1");
assertThatGet(r).containsExactly("tag1", "tag2").inOrder();
assertMessage(r, "Hashtag added: tag1");
}
@Test
@@ -62,11 +70,13 @@ public class HashtagsIT extends AbstractDaemonTest {
// Adding multiple hashtags returns a sorted list of hashtags.
addHashtags(r, "tag3", "tag1");
assertThatGet(r).containsExactly("tag1", "tag3").inOrder();
assertMessage(r, "Hashtags added: tag1, tag3");
// Adding multiple hashtags to change that already has hashtags returns a
// sorted list of hashtags with existing and new.
addHashtags(r, "tag2", "tag4");
assertThatGet(r).containsExactly("tag1", "tag2", "tag3", "tag4").inOrder();
assertMessage(r, "Hashtags added: tag2, tag4");
}
@Test
@@ -76,10 +86,16 @@ public class HashtagsIT extends AbstractDaemonTest {
PushOneCommit.Result r = createChange();
addHashtags(r, "tag2");
assertThatGet(r).containsExactly("tag2");
assertMessage(r, "Hashtag added: tag2");
Timestamp lastMsgDate = getLastMessage(r).date;
addHashtags(r, "tag2");
assertThatGet(r).containsExactly("tag2");
assertNoNewMessageSince(r, lastMsgDate);
addHashtags(r, "tag1", "tag2");
assertThatGet(r).containsExactly("tag1", "tag2").inOrder();
assertMessage(r, "Hashtag added: tag1");
}
@Test
@@ -89,30 +105,37 @@ public class HashtagsIT extends AbstractDaemonTest {
// Leading # is stripped from added tag.
addHashtags(r, "#tag1");
assertThatGet(r).containsExactly("tag1");
assertMessage(r, "Hashtag added: tag1");
// Leading # is stripped from multiple added tags.
addHashtags(r, "#tag2", "#tag3");
assertThatGet(r).containsExactly("tag1", "tag2", "tag3").inOrder();
assertMessage(r, "Hashtags added: tag2, tag3");
// Leading # is stripped from removed tag.
removeHashtags(r, "#tag2");
assertThatGet(r).containsExactly("tag1", "tag3").inOrder();
assertMessage(r, "Hashtag removed: tag2");
// Leading # is stripped from multiple removed tags.
removeHashtags(r, "#tag1", "#tag3");
assertThatGet(r).isEmpty();
assertMessage(r, "Hashtags removed: tag1, tag3");
// Leading # and space are stripped from added tag.
addHashtags(r, "# tag1");
assertThatGet(r).containsExactly("tag1");
assertMessage(r, "Hashtag added: tag1");
// Multiple leading # are stripped from added tag.
addHashtags(r, "##tag2");
assertThatGet(r).containsExactly("tag1", "tag2").inOrder();
assertMessage(r, "Hashtag added: tag2");
// Multiple leading spaces and # are stripped from added tag.
addHashtags(r, "# # tag3");
assertThatGet(r).containsExactly("tag1", "tag2", "tag3").inOrder();
assertMessage(r, "Hashtag added: tag3");
}
@Test
@@ -124,12 +147,14 @@ public class HashtagsIT extends AbstractDaemonTest {
assertThatGet(r).containsExactly("tag1");
removeHashtags(r, "tag1");
assertThatGet(r).isEmpty();
assertMessage(r, "Hashtag removed: tag1");
// Removing a single tag from a change that has multiple tags returns a
// sorted list of remaining tags.
addHashtags(r, "tag1", "tag2", "tag3");
removeHashtags(r, "tag2");
assertThatGet(r).containsExactly("tag1", "tag3").inOrder();
assertMessage(r, "Hashtag removed: tag2");
}
@Test
@@ -141,6 +166,7 @@ public class HashtagsIT extends AbstractDaemonTest {
assertThatGet(r).containsExactly("tag1", "tag2").inOrder();
removeHashtags(r, "tag1", "tag2");
assertThatGet(r).isEmpty();
assertMessage(r, "Hashtags removed: tag1, tag2");
// Removing multiple tags from a change that has multiple tags returns a
// sorted list of remaining tags.
@@ -148,6 +174,7 @@ public class HashtagsIT extends AbstractDaemonTest {
assertThatGet(r).containsExactly("tag1", "tag2", "tag3", "tag4").inOrder();
removeHashtags(r, "tag2", "tag4");
assertThatGet(r).containsExactly("tag1", "tag3").inOrder();
assertMessage(r, "Hashtags removed: tag2, tag4");
}
@Test
@@ -155,20 +182,26 @@ public class HashtagsIT extends AbstractDaemonTest {
// Removing a single hashtag from change that has no hashtags returns an
// empty list.
PushOneCommit.Result r = createChange();
Timestamp lastMsgDate = getLastMessage(r).date;
removeHashtags(r, "tag1");
assertThatGet(r).isEmpty();
assertNoNewMessageSince(r, lastMsgDate);
// Removing a single non-existing tag from a change that only has one other
// tag returns a list of only one tag.
addHashtags(r, "tag1");
lastMsgDate = getLastMessage(r).date;
removeHashtags(r, "tag4");
assertThatGet(r).containsExactly("tag1");
assertNoNewMessageSince(r, lastMsgDate);
// Removing a single non-existing tag from a change that has multiple tags
// returns a sorted list of tags without any deleted.
addHashtags(r, "tag1", "tag2", "tag3");
lastMsgDate = getLastMessage(r).date;
removeHashtags(r, "tag4");
assertThatGet(r).containsExactly("tag1", "tag2", "tag3").inOrder();
assertNoNewMessageSince(r, lastMsgDate);
}
@Test
@@ -181,6 +214,7 @@ public class HashtagsIT extends AbstractDaemonTest {
input.remove = Sets.newHashSet("tag1");
gApi.changes().id(r.getChange().getId().get()).setHashtags(input);
assertThatGet(r).containsExactly("tag2", "tag3", "tag4");
assertMessage(r, "Hashtags added: tag3, tag4\nHashtag removed: tag1");
// Adding and removing the same hashtag actually removes it.
addHashtags(r, "tag1", "tag2");
@@ -189,6 +223,7 @@ public class HashtagsIT extends AbstractDaemonTest {
input.remove = Sets.newHashSet("tag3");
gApi.changes().id(r.getChange().getId().get()).setHashtags(input);
assertThatGet(r).containsExactly("tag1", "tag2", "tag4");
assertMessage(r, "Hashtag removed: tag3");
}
private IterableSubject<
@@ -217,4 +252,22 @@ public class HashtagsIT extends AbstractDaemonTest {
.id(r.getChange().getId().get())
.setHashtags(input);
}
private void assertMessage(PushOneCommit.Result r, String expectedMessage)
throws RestApiException, OrmException {
assertThat(getLastMessage(r).message).isEqualTo(expectedMessage);
}
private void assertNoNewMessageSince(PushOneCommit.Result r, Timestamp date)
throws RestApiException, OrmException {
assertThat(getLastMessage(r).date).isEqualTo(date);
}
private ChangeMessageInfo getLastMessage(PushOneCommit.Result r)
throws RestApiException, OrmException {
ChangeMessageInfo lastMessage = Iterables.getLast(
gApi.changes().id(r.getChange().getId().get()).get().messages, null);
assertThat(lastMessage).isNotNull();
return lastMessage;
}
}