From e30f028b5b2616acee0c45f1007ff3c1611f118b Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 3 Jun 2015 14:22:36 +0900 Subject: [PATCH] ProjectConfigParamParserTest: Convert to use Google Truth Change-Id: I9964477709fb11c9eb1016a8ceab3c35e50b7dd9 --- gerrit-sshd/BUCK | 3 +-- .../sshd/commands/ProjectConfigParamParserTest.java | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gerrit-sshd/BUCK b/gerrit-sshd/BUCK index 7bee47e286..2bef63345f 100644 --- a/gerrit-sshd/BUCK +++ b/gerrit-sshd/BUCK @@ -51,8 +51,7 @@ java_test( ':sshd', '//gerrit-extension-api:api', '//gerrit-server:server', - '//lib:guava', - '//lib:junit', + '//lib:truth', '//lib/mina:sshd', ], source_under_test = [':sshd'], diff --git a/gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java index 4f48eea994..70ea632bcc 100644 --- a/gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java +++ b/gerrit-sshd/src/test/java/com/google/gerrit/sshd/commands/ProjectConfigParamParserTest.java @@ -14,9 +14,7 @@ package com.google.gerrit.sshd.commands; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +import static com.google.common.truth.Truth.assertThat; import com.google.gerrit.extensions.api.projects.ProjectInput.ConfigValue; @@ -40,8 +38,8 @@ public class ProjectConfigParamParserTest { Map> r = cmd.parsePluginConfigValues(Collections.singletonList(in)); ConfigValue configValue = r.get("a").get("b"); - assertEquals("c", configValue.value); - assertNull(configValue.values); + assertThat(configValue.value).isEqualTo("c"); + assertThat(configValue.values).isNull(); } @Test @@ -50,7 +48,7 @@ public class ProjectConfigParamParserTest { Map> r = cmd.parsePluginConfigValues(Collections.singletonList(in)); ConfigValue configValue = r.get("a").get("b"); - assertArrayEquals(new String[] {"c", "d", "e"}, configValue.values.toArray()); - assertNull(configValue.value); + assertThat(configValue.values).containsExactly("c", "d", "e").inOrder(); + assertThat(configValue.value).isNull(); } }