Merge "Fix warnings about unclosed TestRepository"
diff --git a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImpl.java b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImpl.java
index 7600dcb..984cd31 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImpl.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImpl.java
@@ -277,8 +277,9 @@
}
if (testCheckerInvalidation.nonParseableConfig()) {
- try (Repository repo = repoManager.openRepository(allProjectsName)) {
- new TestRepository<>(repo)
+ try (Repository repo = repoManager.openRepository(allProjectsName);
+ TestRepository<Repository> testRepo = new TestRepository<>(repo)) {
+ testRepo
.branch(checkerUuid.toRefName())
.commit()
.add(CheckerConfig.CHECKER_CONFIG_FILE, "non-parseable-config")
@@ -287,9 +288,9 @@
}
if (testCheckerInvalidation.deleteRef()) {
- try (Repository repo = repoManager.openRepository(allProjectsName)) {
- RefUpdate ru =
- new TestRepository<>(repo).getRepository().updateRef(checkerUuid.toRefName(), true);
+ try (Repository repo = repoManager.openRepository(allProjectsName);
+ TestRepository<Repository> testRepo = new TestRepository<>(repo)) {
+ RefUpdate ru = testRepo.getRepository().updateRef(checkerUuid.toRefName(), true);
ru.setForceUpdate(true);
ru.delete();
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
index e87dd42..ee4b51f 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
@@ -354,10 +354,11 @@
try (Repository git = repoManager.openRepository(project);
ObjectInserter oi = git.newObjectInserter();
ObjectReader reader = oi.newReader();
- RevWalk rw = new RevWalk(reader)) {
+ RevWalk rw = new RevWalk(reader);
+ TestRepository<Repository> testRepo = new TestRepository<>(git)) {
RevCommit head = rw.parseCommit(git.exactRef(targetRef).getObjectId());
RevCommit commit =
- new TestRepository<>(git)
+ testRepo
.commit()
.author(admin.newIdent())
.message("A change.")
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
index 403a3a7..f78fee2 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -682,8 +682,9 @@
CheckerUuid checkerUuid1 = CheckerUuid.parse("test:my-checker1");
CheckerUuid checkerUuid2 = CheckerUuid.parse("test:my-checker2");
- try (Repository repo = repoManager.openRepository(allProjects)) {
- new TestRepository<>(repo)
+ try (Repository repo = repoManager.openRepository(allProjects);
+ TestRepository<Repository> testRepo = new TestRepository<>(repo)) {
+ testRepo
.branch(CheckerRef.REFS_META_CHECKERS)
.commit()
.add(
@@ -710,8 +711,9 @@
CheckerUuid checkerUuid1 = CheckerUuid.parse("test:my-checker1");
CheckerUuid checkerUuid2 = CheckerUuid.parse("test:my-checker2");
- try (Repository repo = repoManager.openRepository(allProjects)) {
- new TestRepository<>(repo)
+ try (Repository repo = repoManager.openRepository(allProjects);
+ TestRepository<Repository> testRepo = new TestRepository<>(repo)) {
+ testRepo
.branch(CheckerRef.REFS_META_CHECKERS)
.commit()
.add(
