commit e7b20f916f527827c382a16c93ea217467754d0d
author David Pursehouse <dpursehouse@collab.net> Tue Jul 17 16:20:33 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Jul 18 10:42:12 2018 +0900
tree 868256423586b19095f2a079b373498befe21563
parent 1c92bd23982903b1cb7c2534c9a5f299aa84cf95

CreateBranchIT#assertCreateFails: Restructure to avoid ErrorProne internal error

The current structure of the code causes an IllegalStateException
in ErrorProne [1]. Restructure the code to avoid it.

[1] https://github.com/google/error-prone/issues/1072

Change-Id: I17c96eca6c8dc8b0e234d504e32dda49d9f4720a

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java

diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
index 766089b..1b9a34a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java
@@ -98,10 +98,10 @@
 
   private void assertCreateFails(Class<? extends RestApiException> errType, String errMsg)
       throws Exception {
-    exception.expect(errType);
     if (errMsg != null) {
       exception.expectMessage(errMsg);
     }
+    exception.expect(errType);
     branch().create(new BranchInput());
   }