opendev/gerrit
Code Issues Proposed changes

FromAddressGeneratorProviderTest: Convert to use Google Truth

Browse Source 
Change-Id: Ib292642365d7849ccf559bebc6edadab0a379cdf
This commit is contained in:
David Pursehouse
2015-06-03 17:42:57 +09:00
parent 593532b13e
commit 56ef7a8902
1 changed files with 50 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
gerrit-server/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
View File

@@ -14,14 +14,12 @@
package com.google.gerrit.server.mail; package com.google.gerrit.server.mail;
import static com.google.common.truth.Truth.assertThat;
import static org.easymock.EasyMock.createStrictMock; import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify; import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
@@ -60,19 +58,19 @@ public class FromAddressGeneratorProviderTest {
@Test @Test
public void testDefaultIsMIXED() { public void testDefaultIsMIXED() {
assertTrue(create() instanceof FromAddressGeneratorProvider.PatternGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
} }
@Test @Test
public void testSelectUSER() { public void testSelectUSER() {
setFrom("USER"); setFrom("USER");
assertTrue(create() instanceof FromAddressGeneratorProvider.UserGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.UserGen.class);
setFrom("user"); setFrom("user");
assertTrue(create() instanceof FromAddressGeneratorProvider.UserGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.UserGen.class);
setFrom("uSeR"); setFrom("uSeR");
assertTrue(create() instanceof FromAddressGeneratorProvider.UserGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.UserGen.class);
} }
@Test @Test
@@ -85,9 +83,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(name, r.name); assertThat(r.name).isEqualTo(name);
assertEquals(email, r.email); assertThat(r.email).isEqualTo(email);
verify(accountCache); verify(accountCache);
} }
@@ -100,9 +98,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(null, r.name); assertThat(r.name).isNull();
assertEquals(email, r.email); assertThat(r.email).isEqualTo(email);
verify(accountCache); verify(accountCache);
} }
@@ -115,9 +113,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(name, r.name); assertThat(r.name).isEqualTo(name);
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -126,22 +124,22 @@ public class FromAddressGeneratorProviderTest {
setFrom("USER"); setFrom("USER");
replay(accountCache); replay(accountCache);
final Address r = create().from(null); final Address r = create().from(null);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(ident.getName(), r.name); assertThat(r.name).isEqualTo(ident.getName());
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@Test @Test
public void testSelectSERVER() { public void testSelectSERVER() {
setFrom("SERVER"); setFrom("SERVER");
assertTrue(create() instanceof FromAddressGeneratorProvider.ServerGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.ServerGen.class);
setFrom("server"); setFrom("server");
assertTrue(create() instanceof FromAddressGeneratorProvider.ServerGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.ServerGen.class);
setFrom("sErVeR"); setFrom("sErVeR");
assertTrue(create() instanceof FromAddressGeneratorProvider.ServerGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.ServerGen.class);
} }
@Test @Test
@@ -154,9 +152,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(ident.getName(), r.name); assertThat(r.name).isEqualTo(ident.getName());
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -165,22 +163,22 @@ public class FromAddressGeneratorProviderTest {
setFrom("SERVER"); setFrom("SERVER");
replay(accountCache); replay(accountCache);
final Address r = create().from(null); final Address r = create().from(null);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(ident.getName(), r.name); assertThat(r.name).isEqualTo(ident.getName());
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@Test @Test
public void testSelectMIXED() { public void testSelectMIXED() {
setFrom("MIXED"); setFrom("MIXED");
assertTrue(create() instanceof FromAddressGeneratorProvider.PatternGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
setFrom("mixed"); setFrom("mixed");
assertTrue(create() instanceof FromAddressGeneratorProvider.PatternGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
setFrom("mIxEd"); setFrom("mIxEd");
assertTrue(create() instanceof FromAddressGeneratorProvider.PatternGen); assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
} }
@Test @Test
@@ -193,9 +191,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(name + " (Code Review)", r.name); assertThat(r.name).isEqualTo(name + " (Code Review)");
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -208,9 +206,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals("Anonymous Coward (Code Review)", r.name); assertThat(r.name).isEqualTo("Anonymous Coward (Code Review)");
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -223,9 +221,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(name + " (Code Review)", r.name); assertThat(r.name).isEqualTo(name + " (Code Review)");
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -234,9 +232,9 @@ public class FromAddressGeneratorProviderTest {
setFrom("MIXED"); setFrom("MIXED");
replay(accountCache); replay(accountCache);
final Address r = create().from(null); final Address r = create().from(null);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(ident.getName(), r.name); assertThat(r.name).isEqualTo(ident.getName());
assertEquals(ident.getEmailAddress(), r.email); assertThat(r.email).isEqualTo(ident.getEmailAddress());
verify(accountCache); verify(accountCache);
} }
@@ -250,9 +248,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals("A " + name + " B", r.name); assertThat(r.name).isEqualTo("A " + name + " B");
assertEquals("my.server@email.address", r.email); assertThat(r.email).isEqualTo("my.server@email.address");
verify(accountCache); verify(accountCache);
} }
@@ -265,9 +263,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(user); final Address r = create().from(user);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals("A Anonymous Coward B", r.name); assertThat(r.name).isEqualTo("A Anonymous Coward B");
assertEquals("my.server@email.address", r.email); assertThat(r.email).isEqualTo("my.server@email.address");
verify(accountCache); verify(accountCache);
} }
@@ -277,9 +275,9 @@ public class FromAddressGeneratorProviderTest {
replay(accountCache); replay(accountCache);
final Address r = create().from(null); final Address r = create().from(null);
assertNotNull(r); assertThat(r).isNotNull();
assertEquals(ident.getName(), r.name); assertThat(r.name).isEqualTo(ident.getName());
assertEquals("my.server@email.address", r.email); assertThat(r.email).isEqualTo("my.server@email.address");
verify(accountCache); verify(accountCache);
} }