opendev/gerrit
Code Issues Proposed changes

Upgrade Truth to 0.42

Browse Source 
The 'fail' method is deprecated. Replace it as necessary.

The new version includes a dependency on diffutils; add it.

Change-Id: I80527c9ea41eb752710bed64cdb1621d4216ee46
This commit is contained in:
David Pursehouse
2018-07-04 15:44:28 +09:00
parent b9287e0a0f
commit d0da502645
6 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/com/google/gerrit/truth/ListSubject.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.truth;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.truth.Fact.fact;
import static com.google.common.truth.Truth.assertAbout;
import com.google.common.truth.FailureMetadata;
@@ -46,7 +47,7 @@ public class ListSubject<S extends Subject<S, E>, E> extends IterableSubject {
isNotNull();
List<E> list = getActualList();
if (index >= list.size()) {
fail("has an element at index " + index);
failWithoutActual(fact("expected to have element at index", index));
}
return elementAssertThatFunction.apply(list.get(index));
}

5
java/com/google/gerrit/truth/OptionalSubject.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.truth;
import static com.google.common.truth.Fact.fact;
import static com.google.common.truth.Truth.assertAbout;
import com.google.common.truth.DefaultSubject;
@@ -57,7 +58,7 @@ public class OptionalSubject<S extends Subject<S, ? super T>, T>
isNotNull();
Optional<T> optional = actual();
if (!optional.isPresent()) {
fail("has a value");
failWithoutActual(fact("expected to have", "value"));
}
}
@@ -65,7 +66,7 @@ public class OptionalSubject<S extends Subject<S, ? super T>, T>
isNotNull();
Optional<T> optional = actual();
if (optional.isPresent()) {
fail("does not have a value");
failWithoutActual(fact("expected not to have", "value"));
}
}