Rename BranchAssert to RefAssert and make it generic
This allows us to make the same assertions about tag refs as we
currently do with branch refs. This will be useful when implementing
tests for deletion of multiple tags.
Change-Id: I26376db0fbfd4663e65a035dbb1b4679b6bbd6c5
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUCK b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUCK
index d53e69a..2d3e2da 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUCK
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUCK
@@ -4,16 +4,16 @@
group = 'rest_project',
srcs = glob(['*IT.java']),
deps = [
- ':branch',
':project',
+ ':refassert',
],
labels = ['rest'],
)
java_library(
- name = 'branch',
+ name = 'refassert',
srcs = [
- 'BranchAssert.java',
+ 'RefAssert.java',
],
deps = [
'//lib:truth',
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
index 579171f..fbb6bde 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
@@ -4,16 +4,16 @@
group = 'rest_project',
srcs = glob(['*IT.java']),
deps = [
- ':branch',
':project',
+ ':refassert',
],
labels = ['rest'],
)
java_library(
- name = 'branch',
+ name = 'refassert',
srcs = [
- 'BranchAssert.java',
+ 'RefAssert.java',
],
deps = [
'//lib:truth',
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
index af1383b..f60801a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchesIT.java
@@ -15,7 +15,7 @@
package com.google.gerrit.acceptance.rest.project;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.gerrit.acceptance.rest.project.BranchAssert.assertRefNames;
+import static com.google.gerrit.acceptance.rest.project.RefAssert.assertRefNames;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
index 7c98188..1305d2c 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
@@ -14,8 +14,8 @@
package com.google.gerrit.acceptance.rest.project;
-import static com.google.gerrit.acceptance.rest.project.BranchAssert.assertBranches;
-import static com.google.gerrit.acceptance.rest.project.BranchAssert.assertRefNames;
+import static com.google.gerrit.acceptance.rest.project.RefAssert.assertRefs;
+import static com.google.gerrit.acceptance.rest.project.RefAssert.assertRefNames;
import com.google.common.collect.ImmutableList;
import com.google.gerrit.acceptance.AbstractDaemonTest;
@@ -47,7 +47,7 @@
@Test
@TestProjectInput(createEmptyCommit = false)
public void listBranchesOfEmptyProject() throws Exception {
- assertBranches(ImmutableList.of(
+ assertRefs(ImmutableList.of(
branch("HEAD", null, false),
branch(RefNames.REFS_CONFIG, null, false)),
list().get());
@@ -57,7 +57,7 @@
public void listBranches() throws Exception {
String master = pushTo("refs/heads/master").getCommit().name();
String dev = pushTo("refs/heads/dev").getCommit().name();
- assertBranches(ImmutableList.of(
+ assertRefs(ImmutableList.of(
branch("HEAD", "master", false),
branch(RefNames.REFS_CONFIG, null, false),
branch("refs/heads/dev", dev, true),
@@ -72,7 +72,7 @@
pushTo("refs/heads/dev");
setApiUser(user);
// refs/meta/config is hidden since user is no project owner
- assertBranches(ImmutableList.of(
+ assertRefs(ImmutableList.of(
branch("HEAD", "master", false),
branch("refs/heads/master", master, false)),
list().get());
@@ -85,7 +85,7 @@
String dev = pushTo("refs/heads/dev").getCommit().name();
setApiUser(user);
// refs/meta/config is hidden since user is no project owner
- assertBranches(ImmutableList.of(branch("refs/heads/dev", dev, false)),
+ assertRefs(ImmutableList.of(branch("refs/heads/dev", dev, false)),
list().get());
}
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BranchAssert.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/RefAssert.java
similarity index 69%
rename from gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BranchAssert.java
rename to gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/RefAssert.java
index 522836d..0cbf79a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BranchAssert.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/RefAssert.java
@@ -17,26 +17,26 @@
import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Iterables;
-import com.google.gerrit.extensions.api.projects.BranchInfo;
+import com.google.gerrit.extensions.api.projects.RefInfo;
import java.util.List;
-public class BranchAssert {
- public static void assertBranches(List<BranchInfo> expectedBranches,
- List<BranchInfo> actualBranches) {
- assertRefNames(refs(expectedBranches), actualBranches);
- for (int i = 0; i < expectedBranches.size(); i++) {
- assertBranchInfo(expectedBranches.get(i), actualBranches.get(i));
+public class RefAssert {
+ public static void assertRefs(List<? extends RefInfo> expectedRefs,
+ List<? extends RefInfo> actualRefs) {
+ assertRefNames(refs(expectedRefs), actualRefs);
+ for (int i = 0; i < expectedRefs.size(); i++) {
+ assertRefInfo(expectedRefs.get(i), actualRefs.get(i));
}
}
public static void assertRefNames(Iterable<String> expectedRefs,
- Iterable<BranchInfo> actualBranches) {
- Iterable<String> actualNames = refs(actualBranches);
+ Iterable<? extends RefInfo> actualRefs) {
+ Iterable<String> actualNames = refs(actualRefs);
assertThat(actualNames).containsExactlyElementsIn(expectedRefs).inOrder();
}
- public static void assertBranchInfo(BranchInfo expected, BranchInfo actual) {
+ public static void assertRefInfo(RefInfo expected, RefInfo actual) {
assertThat(actual.ref).isEqualTo(expected.ref);
if (expected.revision != null) {
assertThat(actual.revision).named("revision of " + actual.ref)
@@ -46,7 +46,7 @@
.isEqualTo(toBoolean(expected.canDelete));
}
- private static Iterable<String> refs(Iterable<BranchInfo> infos) {
+ private static Iterable<String> refs(Iterable<? extends RefInfo> infos) {
return Iterables.transform(infos, b -> b.ref);
}
