Add test cases for complete flows

Change-Id: I1ad0f7dc83add8d6c9dfe22754e935296edecde6
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

2 files changed, 352 insertions, 5 deletions

diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
index 2f6d28b..8aa2e76 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCodeReviewIT.java
@@ -40,7 +40,6 @@ import org.junit.Test;
     sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule"
 )
 
-@UseSsh
 public class QtCodeReviewIT extends LightweightPluginDaemonTest {
 
     protected static final String R_HEADS = "refs/heads/";
@@ -69,11 +68,9 @@ public class QtCodeReviewIT extends LightweightPluginDaemonTest {
     }
 
     @Test
-    public void pingSSHTest() throws Exception {
-        assertThat(adminSshSession.exec("gerrit-plugin-qt-workflow ping")).contains("Pong");
-        assertThat(adminSshSession.getError()).isNull();
-    }
+    public void dummyTest() throws Exception {
 
+    }
 
 // Helper functions
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java
new file mode 100644
index 0000000..8068163
--- /dev/null
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommonFlowsIT.java
@@ -0,0 +1,350 @@
+// Copyright (C) 2019 The Qt Company
+
+package com.googlesource.gerrit.plugins.qtcodereview;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gerrit.common.data.Permission;
+import com.google.gerrit.acceptance.PushOneCommit;
+import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.UseSsh;
+import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.Change;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import org.junit.Before;
+import org.junit.Test;
+
+@TestPlugin(
+    name = "gerrit-plugin-qt-workflow",
+    sysModule = "com.googlesource.gerrit.plugins.qtcodereview.QtModule",
+    sshModule = "com.googlesource.gerrit.plugins.qtcodereview.QtSshModule"
+)
+
+@UseSsh
+public class QtCommonFlowsIT extends QtCodeReviewIT {
+
+    @Before
+    public void SetDefaultPermissions() throws Exception {
+        createBranch(new Branch.NameKey(project, "5.12"));
+
+        grant(project, "refs/heads/master", Permission.QT_STAGE, false, REGISTERED_USERS);
+        grant(project, "refs/heads/5.12", Permission.QT_STAGE, false, REGISTERED_USERS);
+        grant(project, "refs/staging/*", Permission.PUSH, false, adminGroupUuid());
+        grant(project, "refs/builds/*", Permission.CREATE, false, adminGroupUuid());
+    }
+
+    @Test
+    public void pingSSHTest() throws Exception {
+        assertThat(adminSshSession.exec("gerrit-plugin-qt-workflow ping")).contains("Pong");
+        assertThat(adminSshSession.getError()).isNull();
+    }
+
+    @Test
+    public void emptyChange_Stage_Integrating_Merged() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c = pushCommit("master", "1st commit", "afile", "");
+        approve(c.getChangeId());
+        QtStage(c);
+
+        // no changes in this commit
+        c = pushCommit("master", "no content", "afile", "");
+        approve(c.getChangeId());
+        QtStage(c);
+        Change change = c.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+        RevCommit stagingHead = getRemoteHead(project, "refs/staging/master");
+
+        QtNewBuild("master", "master-build-000");
+        change = c.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+
+        QtApproveBuild("master", "master-build-000");
+        change = c.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.MERGED);
+
+        String gitLog = getRemoteLog("refs/staging/master").toString();
+        assertThat(gitLog).contains(stagingHead.getId().name());
+    }
+
+    @Test
+    public void mergeCommit_Stage_Integrating_Merged() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+
+        // make changes on feature branch
+        PushOneCommit.Result f1 = pushCommit("5.12", "commitmsg1", "file1", "content1");
+        approve(f1.getChangeId());
+        gApi.changes().id(f1.getChangeId()).current().submit();
+        PushOneCommit.Result f2 = pushCommit("5.12", "commitmsg2", "file2", "content2");
+        approve(f2.getChangeId());
+        gApi.changes().id(f2.getChangeId()).current().submit();
+
+        // make a change on master branch
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg3", "file3", "content3");
+        approve(c1.getChangeId());
+        gApi.changes().id(c1.getChangeId()).current().submit();
+
+        // merge feature branch into master
+        PushOneCommit mm = pushFactory.create(db, admin.getIdent(), testRepo);
+        mm.setParents(ImmutableList.of(c1.getCommit(), f2.getCommit()));
+        PushOneCommit.Result m = mm.to("refs/for/master");
+        m.assertOkStatus();
+        approve(m.getChangeId());
+        QtStage(m);
+        Change change = m.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-001");
+        change = m.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+
+        QtApproveBuild("master", "master-build-001");
+        change = m.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.MERGED);
+
+        // check that all commits are in staging ref
+        String gitLog = getRemoteLog("refs/heads/master").toString();
+        assertThat(gitLog).contains(initialHead.getId().name());
+        assertThat(gitLog).contains(c1.getCommit().getId().name());
+        assertThat(gitLog).contains(f1.getCommit().getId().name());
+        assertThat(gitLog).contains(f2.getCommit().getId().name());
+        assertThat(gitLog).contains(m.getCommit().getId().name());
+    }
+
+    @Test
+    public void multiBranch_New_Staged_Integrating_Merged() throws Exception {
+        // Push 3 independent commits
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+        approve(c3.getChangeId());
+
+        QtStage(c1);
+        QtStage(c2);
+        QtStage(c3);
+
+        QtNewBuild("master", "master-build-100");
+        Change change = c1.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("5.12", "5.12-build-100");
+        QtApproveBuild("5.12", "5.12-build-100");
+        change = c1.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+        change = c3.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+
+        QtApproveBuild("master", "master-build-100");
+        RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master");
+        RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12");
+        assertThat(branchHeadMaster.getId()).isNotEqualTo(branchHead_5_12.getId());
+    }
+
+    @Test
+    public void multiBranch_New_Staged_Integrating_Failed() throws Exception {
+        // Push 3 independent commits
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("5.12", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c3 = pushCommit("master", "commitmsg3", "file3", "content3");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+        approve(c3.getChangeId());
+
+        QtStage(c1);
+        QtStage(c2);
+        QtStage(c3);
+
+        QtNewBuild("5.12", "5.12-build-101");
+        Change change = c1.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+        change = c3.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-101");
+        QtFailBuild("master", "master-build-101");
+        change = c1.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.INTEGRATING);
+
+        QtFailBuild("5.12", "5.12-build-101");
+        RevCommit branchHeadMaster = getRemoteHead(project, R_HEADS + "master");
+        RevCommit branchHead_5_12 = getRemoteHead(project, R_HEADS + "5.12");
+        assertThat(branchHeadMaster.getId()).isEqualTo(branchHead_5_12.getId());
+    }
+
+    @Test
+    public void multiBranch_UnStage() throws Exception {
+        // Push 2 independent commits
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("5.12", "commitmsg2", "file2", "content2");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+
+        QtStage(c1);
+        QtStage(c2);
+
+        QtUnStage(c1);
+        Change change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtUnStage(c2);
+        RevCommit stagingHeadMaster = getRemoteHead(project, R_STAGING + "master");
+        RevCommit stagingHead_5_12 = getRemoteHead(project, R_STAGING + "5.12");
+        assertThat(stagingHeadMaster.getId()).isEqualTo(stagingHead_5_12.getId());
+    }
+
+    @Test
+    public void newStageWhileBuilding_Pass_Pass() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+
+        QtStage(c1);
+        Change change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtNewBuild("master", "master-build-401");
+        RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtStage(c2);
+        QtApproveBuild("master", "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-402");
+        RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402");
+        QtApproveBuild("master", "master-build-402");
+
+        String gitLog = getRemoteLog("refs/heads/master").toString();
+        assertThat(gitLog).contains(build1Head.getId().name());
+        assertThat(gitLog).contains(build2Head.getId().name());
+
+        RevCommit updatedHead = getRemoteHead();
+        assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage());
+    }
+
+    @Test
+    public void newStageWhileBuilding_Pass_Fail() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+
+        QtStage(c1);
+        Change change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtNewBuild("master", "master-build-401");
+        RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtStage(c2);
+        QtApproveBuild("master", "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-402");
+        RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402");
+        QtFailBuild("master", "master-build-402");
+
+        String gitLog = getRemoteLog("refs/heads/master").toString();
+        assertThat(gitLog).contains(build1Head.getId().name());
+        assertThat(gitLog).doesNotContain(build2Head.getId().name());
+
+        RevCommit updatedHead = getRemoteHead();
+        assertThat(updatedHead.getShortMessage()).isEqualTo(c1.getCommit().getShortMessage());
+    }
+
+    @Test
+    public void newStageWhileBuilding_Fail_Pass() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+
+        QtStage(c1);
+        Change change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtNewBuild("master", "master-build-401");
+        RevCommit build1Head = getRemoteHead(project, R_BUILDS + "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtStage(c2);
+        QtFailBuild("master", "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-402");
+        RevCommit build2Head = getRemoteHead(project, R_BUILDS + "master-build-402");
+        QtApproveBuild("master", "master-build-402");
+        change = c1.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        String gitLog = getRemoteLog("refs/heads/master").toString();
+        assertThat(gitLog).doesNotContain(build1Head.getId().name());
+        assertThat(gitLog).contains(build2Head.getId().name());
+
+        RevCommit updatedHead = getRemoteHead();
+        assertThat(updatedHead.getShortMessage()).isEqualTo(c2.getCommit().getShortMessage());
+    }
+
+    @Test
+    public void newStageWhileBuilding_Fail_Fail() throws Exception {
+        RevCommit initialHead = getRemoteHead();
+        PushOneCommit.Result c1 = pushCommit("master", "commitmsg1", "file1", "content1");
+        testRepo.reset(initialHead);
+        PushOneCommit.Result c2 = pushCommit("master", "commitmsg2", "file2", "content2");
+        approve(c1.getChangeId());
+        approve(c2.getChangeId());
+
+        QtStage(c1);
+        Change change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtNewBuild("master", "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.NEW);
+
+        QtStage(c2);
+        QtFailBuild("master", "master-build-401");
+        change = c2.getChange().change();
+        assertThat(change.getStatus()).isEqualTo(Change.Status.STAGED);
+
+        QtNewBuild("master", "master-build-402");
+        QtFailBuild("master", "master-build-402");
+
+        RevCommit updatedHead = getRemoteHead();
+        assertThat(updatedHead).isEqualTo(initialHead);
+    }
+
+}