1 files changed, 8 insertions, 4 deletions
diff --git a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java
index 233aa5b..637b9fa 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandRebuildStagingIT.java
@@ -51,8 +51,9 @@ public class QtCommandRebuildStagingIT extends QtCodeReviewIT {
         QtStage(c1);
         QtStage(c2);
         QtStage(c3);
+        RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master");
 
-        RevCommit stagingHead = qtRebuildStaging("master", c3, null);
+        RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected);
     }
 
     @Test
@@ -71,8 +72,9 @@ public class QtCommandRebuildStagingIT extends QtCodeReviewIT {
         QtStage(c2);
         QtNewBuild("master", "test-build-250");
         QtStage(c3);
+        RevCommit stagingExpected = getRemoteHead(project, R_STAGING + "master");
 
-        RevCommit stagingHead = qtRebuildStaging("master", c3, null);
+        RevCommit stagingHead = qtRebuildStaging("master", null, stagingExpected);
     }
 
     @Test
@@ -135,9 +137,11 @@ public class QtCommandRebuildStagingIT extends QtCodeReviewIT {
         assertThat(updatedHead.getId()).isEqualTo(initialHead.getId()); // master is not updated
 
         RevCommit stagingHead = getRemoteRefHead(project, stagingRef);
+        assertReviewedByFooter(stagingHead, true);
 
-        if (expectedStagingHead==null && expectedContent != null) {
-            assertCherryPick(stagingHead, expectedContent.getCommit(), getCurrentPatchSHA(expectedContent));
+
+        if (expectedStagingHead == null && expectedContent != null) {
+            assertCherryPick(stagingHead, expectedContent.getCommit(), null);
             expectedStagingHead = stagingHead;
         } else {
             assertThat(stagingHead).isEqualTo(expectedStagingHead); // staging is updated