Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate usages of Truth8.assertThat to equivalent usages of Truth.assertThat. #1700

Merged
1 commit merged into from
Jan 24, 2024
Merged

Migrate usages of Truth8.assertThat to equivalent usages of Truth.assertThat. #1700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions value/src/it/functional/src/test/java/com/google/auto/value/AutoBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.truth.Truth8;
import com.google.common.truth.Truth;
import java.io.IOException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down Expand Up @@ -659,9 +659,9 @@ static <T> PairBuilder<T> pairBuilder() {
@Test
public void genericGetters() {
PairBuilder<Number> builder = pairBuilder();
Truth8.assertThat(builder.getSecond()).isEmpty();
Truth.assertThat(builder.getSecond()).isEmpty();
builder.setSecond(2);
Truth8.assertThat(builder.getSecond()).hasValue(2);
Truth.assertThat(builder.getSecond()).hasValue(2);
try {
builder.getFirst();
fail();
Expand Down
26 changes: 13 additions & 13 deletions value/src/it/functional/src/test/java/com/google/auto/value/AutoValueJava8Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.testing.EqualsTester;
import com.google.common.truth.Truth8;
import com.google.common.truth.Truth;
import com.google.testing.compile.Compilation;
import com.google.testing.compile.Compiler;
import com.google.testing.compile.JavaFileObjects;
Expand Down Expand Up @@ -481,7 +481,7 @@ public void testOmitNullableWithBuilder() {
assertThat(e).hasMessageThat().contains("notNullable");

NullablePropertyWithBuilder.Builder builder = NullablePropertyWithBuilder.builder();
Truth8.assertThat(builder.nullable()).isEmpty();
Truth.assertThat(builder.nullable()).isEmpty();
}

@AutoValue
Expand Down Expand Up @@ -509,12 +509,12 @@ public void testOmitOptionalWithNullableBuilder() {
OptionalPropertyWithNullableBuilder instance1 =
OptionalPropertyWithNullableBuilder.builder().notOptional("hello").build();
assertThat(instance1.notOptional()).isEqualTo("hello");
Truth8.assertThat(instance1.optional()).isEmpty();
Truth.assertThat(instance1.optional()).isEmpty();

OptionalPropertyWithNullableBuilder instance2 =
OptionalPropertyWithNullableBuilder.builder().notOptional("hello").optional(null).build();
assertThat(instance2.notOptional()).isEqualTo("hello");
Truth8.assertThat(instance2.optional()).isEmpty();
Truth.assertThat(instance2.optional()).isEmpty();
assertThat(instance1).isEqualTo(instance2);

OptionalPropertyWithNullableBuilder instance3 =
Expand All @@ -523,7 +523,7 @@ public void testOmitOptionalWithNullableBuilder() {
.optional("world")
.build();
assertThat(instance3.notOptional()).isEqualTo("hello");
Truth8.assertThat(instance3.optional()).hasValue("world");
Truth.assertThat(instance3.optional()).hasValue("world");

assertThrows(
IllegalStateException.class, () -> OptionalPropertyWithNullableBuilder.builder().build());
Expand Down Expand Up @@ -551,19 +551,19 @@ public interface Builder {
public void testNullableOptional() {
NullableOptionalPropertyWithNullableBuilder instance1 =
NullableOptionalPropertyWithNullableBuilder.builder().build();
Truth8.assertThat(instance1.optional()).isNull();
Truth.assertThat(instance1.optional()).isNull();

NullableOptionalPropertyWithNullableBuilder instance2 =
NullableOptionalPropertyWithNullableBuilder.builder().optional(null).build();
Truth8.assertThat(instance2.optional()).isEmpty();
Truth.assertThat(instance2.optional()).isEmpty();

NullableOptionalPropertyWithNullableBuilder instance3 =
NullableOptionalPropertyWithNullableBuilder.builder().optional("haruspex").build();
Truth8.assertThat(instance3.optional()).hasValue("haruspex");
Truth.assertThat(instance3.optional()).hasValue("haruspex");

NullableOptionalPropertyWithNullableBuilder.Builder builder =
NullableOptionalPropertyWithNullableBuilder.builder();
Truth8.assertThat(builder.optional()).isNull();
Truth.assertThat(builder.optional()).isNull();
}

@AutoValue
Expand Down Expand Up @@ -864,20 +864,20 @@ abstract static class Builder {
@Test
public void testOptionalOptional_empty() {
OptionalOptional empty = OptionalOptional.builder().build();
Truth8.assertThat(empty.maybeJustMaybe()).isEmpty();
Truth.assertThat(empty.maybeJustMaybe()).isEmpty();
}

@Test
public void testOptionalOptional_ofEmpty() {
OptionalOptional ofEmpty = OptionalOptional.builder().maybeJustMaybe(Optional.empty()).build();
Truth8.assertThat(ofEmpty.maybeJustMaybe()).hasValue(Optional.empty());
Truth.assertThat(ofEmpty.maybeJustMaybe()).hasValue(Optional.empty());
}

@Test
public void testOptionalOptional_ofSomething() {
OptionalOptional ofSomething =
OptionalOptional.builder().maybeJustMaybe(Optional.of("foo")).build();
Truth8.assertThat(ofSomething.maybeJustMaybe()).hasValue(Optional.of("foo"));
Truth.assertThat(ofSomething.maybeJustMaybe()).hasValue(Optional.of("foo"));
}

@AutoValue
Expand All @@ -900,7 +900,7 @@ abstract static class Builder {
public void testOptionalExtends() {
Predicate<Number> predicate = n -> n.toString().equals("0");
OptionalExtends t = OptionalExtends.builder().setPredicate(predicate).build();
Truth8.assertThat(t.predicate()).hasValue(predicate);
Truth.assertThat(t.predicate()).hasValue(predicate);
}

@AutoValue
Expand Down