opendev/gerrit
Code Issues Proposed changes

CommitMsgHookTest: Replace fail with assert with failure message

Browse Source 
Change-Id: Id853b23de1f09fe51570f01054ac4624eea7ad40
This commit is contained in:
David Pursehouse
2015-06-02 18:48:51 +09:00
parent 8ec96cc654
commit f6dc4a2dfa
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
View File

@@ -14,10 +14,10 @@
package com.google.gerrit.server.tools.hooks; package com.google.gerrit.server.tools.hooks;
import static com.google.common.truth.Truth.assert_;
import static com.google.common.truth.TruthJUnit.assume; import static com.google.common.truth.TruthJUnit.assume;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import com.google.gerrit.server.util.HostPlatform; import com.google.gerrit.server.util.HostPlatform;
@@ -30,6 +30,7 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.RefUpdate.Result;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@@ -436,15 +437,11 @@ public class CommitMsgHookTest extends HookTestCase {
final RefUpdate ref = repository.updateRef(Constants.HEAD); final RefUpdate ref = repository.updateRef(Constants.HEAD);
ref.setNewObjectId(commitId); ref.setNewObjectId(commitId);
switch (ref.forceUpdate()) { Result result = ref.forceUpdate();
case NEW: assert_()
case FAST_FORWARD: .withFailureMessage(Constants.HEAD + " did not change: " + ref.getResult())
case FORCED: .that(result)
case NO_CHANGE: .isAnyOf(Result.FAST_FORWARD, Result.FORCED, Result.NEW, Result.NO_CHANGE);
break;
default:
fail(Constants.HEAD + " did not change: " + ref.getResult());
}
} }
} }
} }