Fix its-base tests broken after 56b945d42
Since the introduction of the Change object in the change-related
events, the its-base tests need to change the way the events
are constructed.
Change-Id: I65e0c87cb02dd851eb1feaf02eff42ff86f4c85d
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
index c0ff02b..267c357 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfigTest.java
@@ -23,7 +23,6 @@
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.PluginConfig;
import com.google.gerrit.server.config.PluginConfigFactory;
-import com.google.gerrit.server.data.ChangeAttribute;
import com.google.gerrit.server.data.RefUpdateAttribute;
import com.google.gerrit.server.events.ChangeAbandonedEvent;
import com.google.gerrit.server.events.ChangeMergedEvent;
@@ -292,11 +291,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -309,11 +305,8 @@
String[] branches = {"refs/heads/testBranch"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -326,11 +319,8 @@
String[] branches = {"^refs/heads/test.*"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -343,11 +333,8 @@
String[] branches = {"^refs/heads/foo.*"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -360,11 +347,8 @@
String[] branches = {"refs/heads/foo", "refs/heads/testBranch"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -377,11 +361,8 @@
String[] branches = {"^refs/heads/foo.*", "^refs/heads/test.*"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -394,11 +375,8 @@
String[] branches = {"refs/heads/testBranch", "refs/heads/foo.*"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -411,11 +389,8 @@
String[] branches = {"refs/heads/foo", "^refs/heads/test.*"};
setupIsEnabled("true", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -428,11 +403,8 @@
String[] branches = {"^refs/heads/testBranch"};
setupIsEnabled("false", null, branches);
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -445,11 +417,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- CommentAddedEvent event = new CommentAddedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ CommentAddedEvent event =
+ new CommentAddedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -462,11 +431,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- ChangeMergedEvent event = new ChangeMergedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ ChangeMergedEvent event =
+ new ChangeMergedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -479,11 +445,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- ChangeAbandonedEvent event = new ChangeAbandonedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ ChangeAbandonedEvent event =
+ new ChangeAbandonedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -496,11 +459,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- ChangeRestoredEvent event = new ChangeRestoredEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ ChangeRestoredEvent event =
+ new ChangeRestoredEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
@@ -513,11 +473,8 @@
String[] branches = {};
setupIsEnabled("true", null, branches);
- DraftPublishedEvent event = new DraftPublishedEvent();
- ChangeAttribute changeAttribute = new ChangeAttribute();
- changeAttribute.project = "testProject";
- changeAttribute.branch = "testBranch";
- event.change = Suppliers.ofInstance(changeAttribute);
+ DraftPublishedEvent event =
+ new DraftPublishedEvent(testChange("testProject", "testBranch"));
ItsConfig itsConfig = createItsConfig();
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
index 2be4610..6af549e 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/testutil/LoggingMockingTestCase.java
@@ -15,6 +15,10 @@
package com.googlesource.gerrit.plugins.its.base.testutil;
import com.google.common.collect.Lists;
+import com.google.gerrit.reviewdb.client.Account;
+import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.reviewdb.client.Project;
import com.googlesource.gerrit.plugins.its.base.testutil.log.LogUtil;
@@ -22,10 +26,16 @@
import org.apache.log4j.spi.LoggingEvent;
import org.junit.After;
+import java.sql.Timestamp;
import java.util.Iterator;
public abstract class LoggingMockingTestCase extends MockingTestCase {
+ protected final Change.Key testChangeKey = new Change.Key(
+ "Ic19f7bf6c8b4685c363a8204c32d827ffda52ec0");
+ protected final Change.Id testChangeId = new Change.Id(1);
+ protected final Account.Id testAccountId = new Account.Id(1);
+
private java.util.Collection<LoggingEvent> loggedEvents;
protected final void assertLogMessageContains(String needle, Level level) {
@@ -104,4 +114,10 @@
// subclasses open.
assertNoUnassertedLogEvents();
}
+
+ protected Change testChange(String project, String branch) {
+ return new Change(testChangeKey, testChangeId, testAccountId,
+ new Branch.NameKey(new Project.NameKey(project), branch),
+ new Timestamp(System.currentTimeMillis()));
+ }
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
index 90d379a..e62cd1d 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/its/base/util/PropertyExtractorTest.java
@@ -70,7 +70,8 @@
}
public void testChangeAbandonedEvent() {
- ChangeAbandonedEvent event = new ChangeAbandonedEvent();
+ ChangeAbandonedEvent event =
+ new ChangeAbandonedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -111,7 +112,8 @@
}
public void testChangeMergedEvent() {
- ChangeMergedEvent event = new ChangeMergedEvent();
+ ChangeMergedEvent event =
+ new ChangeMergedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -145,7 +147,8 @@
}
public void testChangeRestoredEvent() {
- ChangeRestoredEvent event = new ChangeRestoredEvent();
+ ChangeRestoredEvent event =
+ new ChangeRestoredEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -185,7 +188,8 @@
}
public void testCommentAddedEventWOApprovals() {
- CommentAddedEvent event = new CommentAddedEvent();
+ CommentAddedEvent event =
+ new CommentAddedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -225,7 +229,8 @@
}
public void testCommentAddedEventWApprovals() {
- CommentAddedEvent event = new CommentAddedEvent();
+ CommentAddedEvent event =
+ new CommentAddedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -279,7 +284,8 @@
}
public void testDraftPublishedEvent() {
- DraftPublishedEvent event = new DraftPublishedEvent();
+ DraftPublishedEvent event =
+ new DraftPublishedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
@@ -314,7 +320,8 @@
}
public void testPatchSetCreatedEvent() {
- PatchSetCreatedEvent event = new PatchSetCreatedEvent();
+ PatchSetCreatedEvent event =
+ new PatchSetCreatedEvent(testChange("testProject", "testBranch"));
ChangeAttribute changeAttribute = createMock(ChangeAttribute.class);
event.change = Suppliers.ofInstance(changeAttribute);
