Merge branch 'stable-2.16'
* stable-2.16:
Bump kafka-clients version to 2.1.0
Bump testcontainers kafka version to 1.10.6
EventConsumerIT: Support ReviewDb and NoteDb backends
Change-Id: I7d2dbd95a18bc93a4c542075c1a9f1b5c7f3e87e
diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
index 30d7a11..12a448c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
@@ -104,22 +104,15 @@
}
}
- // TODO(davido): Remove special ReviewDb case when it is killed
- // In ReviewDb case 3 events are received in the following order:
- // 1. refUpdate: ref: refs/changes/01/1/1
- // 2. patchset-created: ref: refs/changes/01/1/1
- // 3. comment-added: ref: refs/heads/master
- int numberOfEvents = 3;
- if (notesMigration.commitChangeWrites()) {
- // In NoteDb case the 4 events are received in the following order:
- // 1. refUpdate: ref: refs/sequences/changes
- // 2. refUpdate: ref: refs/changes/01/1/1
- // 3. patchset-created: ref: refs/changes/01/1/1
- // 4. comment-added: ref: refs/heads/master
- numberOfEvents = 4;
- }
+ // There are 6 events are received in the following order:
+ // 1. refUpdate: ref: refs/sequences/changes
+ // 2. refUpdate: ref: refs/changes/01/1/1
+ // 3. refUpdate: ref: refs/changes/01/1/meta
+ // 4. patchset-created: ref: refs/changes/01/1/1
+ // 5. refUpdate: ref: refs/changes/01/1/meta
+ // 6. comment-added: ref: refs/heads/master
- assertThat(events).hasSize(numberOfEvents);
+ assertThat(events).hasSize(6);
String commentAddedEventJson = Iterables.getLast(events);
Gson gson =
