Merge "Add test for pushing a series of changes to non-existing master branch"
diff --git a/java/com/google/gerrit/common/data/AccessSection.java b/java/com/google/gerrit/common/data/AccessSection.java
index c8d8d41..b3da199 100644
--- a/java/com/google/gerrit/common/data/AccessSection.java
+++ b/java/com/google/gerrit/common/data/AccessSection.java
@@ -37,7 +37,7 @@
super(refPattern);
}
- public List<Permission> getPermissions() {
+ public ImmutableList<Permission> getPermissions() {
return permissions == null ? ImmutableList.of() : ImmutableList.copyOf(permissions);
}
diff --git a/java/com/google/gerrit/common/data/Permission.java b/java/com/google/gerrit/common/data/Permission.java
index a30d412..2e9c2d6 100644
--- a/java/com/google/gerrit/common/data/Permission.java
+++ b/java/com/google/gerrit/common/data/Permission.java
@@ -158,7 +158,7 @@
exclusiveGroup = newExclusiveGroup;
}
- public List<PermissionRule> getRules() {
+ public ImmutableList<PermissionRule> getRules() {
return rules == null ? ImmutableList.of() : ImmutableList.copyOf(rules);
}
diff --git a/javatests/com/google/gerrit/common/BUILD b/javatests/com/google/gerrit/common/BUILD
index 88ddcd5..29a23c3 100644
--- a/javatests/com/google/gerrit/common/BUILD
+++ b/javatests/com/google/gerrit/common/BUILD
@@ -2,10 +2,7 @@
junit_tests(
name = "server_tests",
- srcs = [
- "AutoValueTest.java",
- "VersionTest.java",
- ],
+ srcs = glob(["*.java"]),
tags = ["no_windows"],
deps = [
"//java/com/google/gerrit/common:server",
diff --git a/javatests/com/google/gerrit/common/data/AccessSectionTest.java b/javatests/com/google/gerrit/common/data/AccessSectionTest.java
index b12a9c2..faf9d6c 100644
--- a/javatests/com/google/gerrit/common/data/AccessSectionTest.java
+++ b/javatests/com/google/gerrit/common/data/AccessSectionTest.java
@@ -152,21 +152,6 @@
}
@Test
- public void cannotAddPermissionByModifyingListThatWasRetrievedFromAccessSection() {
- Permission submitPermission = new Permission(Permission.SUBMIT);
- accessSection.getPermissions().add(submitPermission);
- assertThat(accessSection.getPermission(Permission.SUBMIT)).isNull();
-
- List<Permission> permissions = new ArrayList<>();
- permissions.add(new Permission(Permission.ABANDON));
- permissions.add(new Permission(Permission.REBASE));
- accessSection.setPermissions(permissions);
- assertThat(accessSection.getPermission(Permission.SUBMIT)).isNull();
- accessSection.getPermissions().add(submitPermission);
- assertThat(accessSection.getPermission(Permission.SUBMIT)).isNull();
- }
-
- @Test
public void removePermission() {
Permission abandonPermission = new Permission(Permission.ABANDON);
Permission rebasePermission = new Permission(Permission.REBASE);
diff --git a/javatests/com/google/gerrit/common/data/BUILD b/javatests/com/google/gerrit/common/data/BUILD
new file mode 100644
index 0000000..776a5e0
--- /dev/null
+++ b/javatests/com/google/gerrit/common/data/BUILD
@@ -0,0 +1,13 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+junit_tests(
+ name = "data_tests",
+ srcs = glob(["*.java"]),
+ deps = [
+ "//java/com/google/gerrit/common:server",
+ "//java/com/google/gerrit/reviewdb:server",
+ "//java/com/google/gerrit/testing:gerrit-test-util",
+ "//lib:guava",
+ "//lib/truth",
+ ],
+)
diff --git a/javatests/com/google/gerrit/common/data/PermissionTest.java b/javatests/com/google/gerrit/common/data/PermissionTest.java
index 84fb2f0..23380e7 100644
--- a/javatests/com/google/gerrit/common/data/PermissionTest.java
+++ b/javatests/com/google/gerrit/common/data/PermissionTest.java
@@ -187,22 +187,6 @@
}
@Test
- public void cannotAddPermissionByModifyingListThatWasRetrievedFromAccessSection() {
- GroupReference groupReference1 = new GroupReference(new AccountGroup.UUID("uuid-1"), "group1");
- PermissionRule permissionRule1 = new PermissionRule(groupReference1);
- permission.getRules().add(permissionRule1);
- assertThat(permission.getRule(groupReference1)).isNull();
-
- List<PermissionRule> rules = new ArrayList<>();
- rules.add(new PermissionRule(new GroupReference(new AccountGroup.UUID("uuid-2"), "group2")));
- rules.add(new PermissionRule(new GroupReference(new AccountGroup.UUID("uuid-3"), "group3")));
- permission.setRules(rules);
- assertThat(permission.getRule(groupReference1)).isNull();
- permission.getRules().add(permissionRule1);
- assertThat(permission.getRule(groupReference1)).isNull();
- }
-
- @Test
public void getNonExistingRule() {
GroupReference groupReference = new GroupReference(new AccountGroup.UUID("uuid-1"), "group1");
assertThat(permission.getRule(groupReference)).isNull();
