opendev/gerrit
Code Issues Proposed changes

Convert remaining acceptance tests to use Google Truth

Browse Source 
Change-Id: Idb136f532fb78ae4bedfeadd4ff7aabd8414f9a2
This commit is contained in:
David Pursehouse
2014-12-25 15:40:04 +09:00
parent cf40bc411f
commit 4e8e81aaf6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -14,12 +14,12 @@
package com.google.gerrit.acceptance; package com.google.gerrit.acceptance;
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.cloneProject; import static com.google.gerrit.acceptance.GitUtil.cloneProject;
import static com.google.gerrit.acceptance.GitUtil.createProject; import static com.google.gerrit.acceptance.GitUtil.createProject;
import static com.google.gerrit.acceptance.GitUtil.initSsh; import static com.google.gerrit.acceptance.GitUtil.initSsh;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static com.google.gerrit.server.project.Util.block; import static com.google.gerrit.server.project.Util.block;
import static org.junit.Assert.assertEquals;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.primitives.Chars; import com.google.common.primitives.Chars;
@@ -205,7 +205,7 @@ public abstract class AbstractDaemonTest {
ListChangesOption... options) throws IOException { ListChangesOption... options) throws IOException {
String q = options.length > 0 ? "?o=" + Joiner.on("&o=").join(options) : ""; String q = options.length > 0 ? "?o=" + Joiner.on("&o=").join(options) : "";
RestResponse r = session.get("/changes/" + changeId + q); RestResponse r = session.get("/changes/" + changeId + q);
assertEquals(HttpStatus.SC_OK, r.getStatusCode()); assertThat(r.getStatusCode()).isEqualTo(HttpStatus.SC_OK);
return newGson().fromJson(r.getReader(), ChangeInfo.class); return newGson().fromJson(r.getReader(), ChangeInfo.class);
} }

8
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.acceptance; package com.google.gerrit.acceptance;
import static org.junit.Assert.assertEquals; import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.Inject; import com.google.inject.Inject;
@@ -31,7 +31,7 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest {
@Test @Test
@GerritConfig(name="x.y", value="z") @GerritConfig(name="x.y", value="z")
public void testOne() { public void testOne() {
assertEquals("z", serverConfig.getString("x", null, "y")); assertThat(serverConfig.getString("x", null, "y")).isEqualTo("z");
} }
@Test @Test
@@ -40,7 +40,7 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest {
@GerritConfig(name="a.b", value="c") @GerritConfig(name="a.b", value="c")
}) })
public void testMultiple() { public void testMultiple() {
assertEquals("z", serverConfig.getString("x", null, "y")); assertThat(serverConfig.getString("x", null, "y")).isEqualTo("z");
assertEquals("c", serverConfig.getString("a", null, "b")); assertThat(serverConfig.getString("a", null, "b")).isEqualTo("c");
} }
} }