opendev/gerrit
Code Issues Proposed changes

ChangeData: Clear currentPatchSet in setPatchSets

Browse Source 
currentPatchSet is lazily loaded from the list of all patch sets. If
that list changes, currentPatchSet should change as well. Add a small
regression test.

Change-Id: I63eb44bcf92b9b7d3993941519c0ac80db60d5fb
This commit is contained in:
Dave Borowitz
2015-05-18 14:40:04 -07:00
parent 1ea3e62075
commit 5d1333ca0a
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -450,6 +450,10 @@ public class ChangeData {
return change; return change;
} }
public void setChange(Change c) {
change = c;
}
public Change reloadChange() throws OrmException { public Change reloadChange() throws OrmException {
change = db.changes().get(legacyId); change = db.changes().get(legacyId);
return change; return change;
@@ -545,6 +549,7 @@ public class ChangeData {
} }
public void setPatchSets(Collection<PatchSet> patchSets) { public void setPatchSets(Collection<PatchSet> patchSets) {
this.currentPatchSet = null;
this.patchSets = patchSets; this.patchSets = patchSets;
} }

42
gerrit-server/src/test/java/com/google/gerrit/server/query/change/ChangeDataTest.java Normal file
View File

@@ -0,0 +1,42 @@
// Copyright (C) 2015 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.query.change;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.testutil.TestChanges;
import org.junit.Test;
public class ChangeDataTest {
@Test
public void setPatchSetsClearsCurrentPatchSet() throws Exception {
ChangeData cd = ChangeData.createForTest(new Change.Id(1), 1);
cd.setChange(TestChanges.newChange(
new Project.NameKey("project"), new Account.Id(1000)));
PatchSet curr1 = cd.currentPatchSet();
int currId = curr1.getId().get();
PatchSet ps1 = new PatchSet(new PatchSet.Id(cd.getId(), currId + 1));
PatchSet ps2 = new PatchSet(new PatchSet.Id(cd.getId(), currId + 2));
cd.setPatchSets(ImmutableList.of(ps1, ps2));
PatchSet curr2 = cd.currentPatchSet();
assertThat(curr2).isNotSameAs(curr1);
}
}