Merge "Test API: Switch to unchecked exceptions"
diff --git a/java/com/google/gerrit/acceptance/testsuite/ThrowingConsumer.java b/java/com/google/gerrit/acceptance/testsuite/ThrowingConsumer.java
index 5efdc81..8efb6ae 100644
--- a/java/com/google/gerrit/acceptance/testsuite/ThrowingConsumer.java
+++ b/java/com/google/gerrit/acceptance/testsuite/ThrowingConsumer.java
@@ -17,4 +17,12 @@
@FunctionalInterface
public interface ThrowingConsumer<T> {
void accept(T t) throws Exception;
+
+ default void acceptAndThrowSilently(T t) {
+ try {
+ accept(t);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/ThrowingFunction.java b/java/com/google/gerrit/acceptance/testsuite/ThrowingFunction.java
index d41672a..2337331 100644
--- a/java/com/google/gerrit/acceptance/testsuite/ThrowingFunction.java
+++ b/java/com/google/gerrit/acceptance/testsuite/ThrowingFunction.java
@@ -18,4 +18,12 @@
public interface ThrowingFunction<T, R> {
R apply(T value) throws Exception;
+
+ default R applyAndThrowSilently(T t) {
+ try {
+ return apply(t);
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
index 61b7599..1791c73 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperations.java
@@ -65,7 +65,7 @@
*
* @return {@code true} if the account exists
*/
- boolean exists() throws Exception;
+ boolean exists();
/**
* Retrieves the account.
@@ -76,7 +76,7 @@
*
* @return the corresponding {@code TestAccount}
*/
- TestAccount get() throws Exception;
+ TestAccount get();
/**
* Starts the fluent chain to update an account. The returned builder can be used to specify how
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
index ebbcfe4..f35404f 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/AccountOperationsImpl.java
@@ -108,20 +108,27 @@
}
@Override
- public boolean exists() throws Exception {
- return accounts.get(accountId).isPresent();
+ public boolean exists() {
+ return getAccountState(accountId).isPresent();
}
@Override
- public TestAccount get() throws Exception {
+ public TestAccount get() {
AccountState account =
- accounts
- .get(accountId)
+ getAccountState(accountId)
.orElseThrow(
() -> new IllegalStateException("Tried to get non-existing test account"));
return toTestAccount(account);
}
+ private Optional<AccountState> getAccountState(Account.Id accountId) {
+ try {
+ return accounts.get(accountId);
+ } catch (IOException | ConfigInvalidException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
private TestAccount toTestAccount(AccountState accountState) {
Account account = accountState.getAccount();
return TestAccount.builder()
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/TestAccountCreation.java b/java/com/google/gerrit/acceptance/testsuite/account/TestAccountCreation.java
index ab32409..f2414e0 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/TestAccountCreation.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/TestAccountCreation.java
@@ -88,9 +88,9 @@
abstract TestAccountCreation autoBuild();
- public Account.Id create() throws Exception {
+ public Account.Id create() {
TestAccountCreation accountUpdate = autoBuild();
- return accountUpdate.accountCreator().apply(accountUpdate);
+ return accountUpdate.accountCreator().applyAndThrowSilently(accountUpdate);
}
}
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/account/TestAccountUpdate.java b/java/com/google/gerrit/acceptance/testsuite/account/TestAccountUpdate.java
index 251f452..da599e7 100644
--- a/java/com/google/gerrit/acceptance/testsuite/account/TestAccountUpdate.java
+++ b/java/com/google/gerrit/acceptance/testsuite/account/TestAccountUpdate.java
@@ -86,9 +86,9 @@
abstract TestAccountUpdate autoBuild();
- public void update() throws Exception {
+ public void update() {
TestAccountUpdate accountUpdate = autoBuild();
- accountUpdate.accountUpdater().accept(accountUpdate);
+ accountUpdate.accountUpdater().acceptAndThrowSilently(accountUpdate);
}
}
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
index f75ca2e..bf305ff 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperations.java
@@ -63,7 +63,7 @@
*
* @return {@code true} if the group exists
*/
- boolean exists() throws Exception;
+ boolean exists();
/**
* Retrieves the group.
@@ -74,7 +74,7 @@
*
* @return the corresponding {@code TestGroup}
*/
- TestGroup get() throws Exception;
+ TestGroup get();
/**
* Starts the fluent chain to update a group. The returned builder can be used to specify how
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
index f9769c5..9d87895 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/GroupOperationsImpl.java
@@ -109,17 +109,25 @@
}
@Override
- public boolean exists() throws Exception {
- return groups.getGroup(groupUuid).isPresent();
+ public boolean exists() {
+ return getGroup(groupUuid).isPresent();
}
@Override
- public TestGroup get() throws Exception {
- Optional<InternalGroup> group = groups.getGroup(groupUuid);
+ public TestGroup get() {
+ Optional<InternalGroup> group = getGroup(groupUuid);
checkState(group.isPresent(), "Tried to get non-existing test group");
return toTestGroup(group.get());
}
+ private Optional<InternalGroup> getGroup(AccountGroup.UUID groupUuid) {
+ try {
+ return groups.getGroup(groupUuid);
+ } catch (IOException | ConfigInvalidException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
private TestGroup toTestGroup(InternalGroup internalGroup) {
return TestGroup.builder()
.groupUuid(internalGroup.getGroupUUID())
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/TestGroupCreation.java b/java/com/google/gerrit/acceptance/testsuite/group/TestGroupCreation.java
index efed720..612ce2a 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/TestGroupCreation.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/TestGroupCreation.java
@@ -104,9 +104,9 @@
*
* @return the UUID of the created group
*/
- public AccountGroup.UUID create() throws Exception {
+ public AccountGroup.UUID create() {
TestGroupCreation groupCreation = autoBuild();
- return groupCreation.groupCreator().apply(groupCreation);
+ return groupCreation.groupCreator().applyAndThrowSilently(groupCreation);
}
}
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/group/TestGroupUpdate.java b/java/com/google/gerrit/acceptance/testsuite/group/TestGroupUpdate.java
index 095a270..bc9d569 100644
--- a/java/com/google/gerrit/acceptance/testsuite/group/TestGroupUpdate.java
+++ b/java/com/google/gerrit/acceptance/testsuite/group/TestGroupUpdate.java
@@ -126,9 +126,9 @@
abstract TestGroupUpdate autoBuild();
/** Executes the group update as specified. */
- public void update() throws Exception {
+ public void update() {
TestGroupUpdate groupUpdater = autoBuild();
- groupUpdater.groupUpdater().accept(groupUpdater);
+ groupUpdater.groupUpdater().acceptAndThrowSilently(groupUpdater);
}
}
}
diff --git a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java
index a0b130e..31af1d2 100644
--- a/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java
+++ b/java/com/google/gerrit/acceptance/testsuite/project/TestProjectCreation.java
@@ -63,9 +63,9 @@
*
* @return the name of the created project
*/
- public Project.NameKey create() throws Exception {
+ public Project.NameKey create() {
TestProjectCreation creation = autoBuild();
- return creation.projectCreator().apply(creation);
+ return creation.projectCreator().applyAndThrowSilently(creation);
}
}
}
