Merge "Upgrade Truth to 1.0"
diff --git a/WORKSPACE b/WORKSPACE
index 0c8ab33..fa72a35 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -882,30 +882,30 @@
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
)
-TRUTH_VERS = "0.46"
+TRUTH_VERS = "1.0"
maven_jar(
name = "truth",
artifact = "com.google.truth:truth:" + TRUTH_VERS,
- sha1 = "5907b14d1af802644e7f4fb7230419b709e06c6b",
+ sha1 = "998e5fb3fa31df716574b4c9e8d374855e800451",
)
maven_jar(
name = "truth-java8-extension",
artifact = "com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERS,
- sha1 = "e5ef57a6d1ab57695d373754df1efdddffc8484c",
+ sha1 = "d85fbc1daf0510821f552f2aa71d9605e97aa438",
)
maven_jar(
name = "truth-liteproto-extension",
artifact = "com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERS,
- sha1 = "c624d921293426bac9e5c9780b01eaef914c1a22",
+ sha1 = "7a279c50a0f93da15533cef4993b45606cf67d72",
)
maven_jar(
name = "truth-proto-extension",
artifact = "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERS,
- sha1 = "585a0cedb3dac53ad3349826f163b28e59000d39",
+ sha1 = "8c0c2ea61750f02d0d5ce9c653106b6a5dc82d12",
)
maven_jar(
diff --git a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
index b65f64b..8ac0de1 100644
--- a/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
+++ b/java/com/google/gerrit/common/data/testing/GroupReferenceSubject.java
@@ -21,6 +21,7 @@
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
import com.google.gerrit.common.data.GroupReference;
+import com.google.gerrit.reviewdb.client.AccountGroup;
public class GroupReferenceSubject extends Subject {
@@ -39,7 +40,7 @@
this.group = group;
}
- public ComparableSubject groupUuid() {
+ public ComparableSubject<AccountGroup.UUID> groupUuid() {
isNotNull();
return check("getUUID()").that(group.getUUID());
}
diff --git a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
index c94dc27..8853a30 100644
--- a/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/DiffInfoSubject.java
@@ -21,6 +21,7 @@
import com.google.common.truth.ComparableSubject;
import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject;
+import com.google.gerrit.extensions.common.ChangeType;
import com.google.gerrit.extensions.common.DiffInfo;
import com.google.gerrit.extensions.common.DiffInfo.ContentEntry;
import com.google.gerrit.truth.ListSubject;
@@ -45,7 +46,7 @@
.thatCustom(diffInfo.content, ContentEntrySubject.contentEntries());
}
- public ComparableSubject changeType() {
+ public ComparableSubject<ChangeType> changeType() {
isNotNull();
return check("changeType").that(diffInfo.changeType);
}
diff --git a/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java
index 35e67a6..d011d5d 100644
--- a/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/FileInfoSubject.java
@@ -45,7 +45,7 @@
return check("linesDeleted").that(fileInfo.linesDeleted);
}
- public ComparableSubject status() {
+ public ComparableSubject<Character> status() {
isNotNull();
return check("status").that(fileInfo.status);
}
diff --git a/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
index 5564642..d827d5d 100644
--- a/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
@@ -23,6 +23,7 @@
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
import com.google.gerrit.extensions.common.GitPerson;
+import java.sql.Timestamp;
import java.util.Date;
import org.eclipse.jgit.lib.PersonIdent;
@@ -53,7 +54,7 @@
return check("email").that(gitPerson.email);
}
- public ComparableSubject date() {
+ public ComparableSubject<Timestamp> date() {
isNotNull();
return check("date").that(gitPerson.date);
}
diff --git a/java/com/google/gerrit/server/group/testing/InternalGroupSubject.java b/java/com/google/gerrit/server/group/testing/InternalGroupSubject.java
index 79bd005..a2f6002 100644
--- a/java/com/google/gerrit/server/group/testing/InternalGroupSubject.java
+++ b/java/com/google/gerrit/server/group/testing/InternalGroupSubject.java
@@ -22,7 +22,10 @@
import com.google.common.truth.IterableSubject;
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
+import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.server.group.InternalGroup;
+import java.sql.Timestamp;
+import org.eclipse.jgit.lib.ObjectId;
public class InternalGroupSubject extends Subject {
@@ -41,12 +44,12 @@
this.group = group;
}
- public ComparableSubject groupUuid() {
+ public ComparableSubject<AccountGroup.UUID> groupUuid() {
isNotNull();
return check("getGroupUUID()").that(group.getGroupUUID());
}
- public ComparableSubject nameKey() {
+ public ComparableSubject<AccountGroup.NameKey> nameKey() {
isNotNull();
return check("getNameKey()").that(group.getNameKey());
}
@@ -66,7 +69,7 @@
return check("getDescription()").that(group.getDescription());
}
- public ComparableSubject ownerGroupUuid() {
+ public ComparableSubject<AccountGroup.UUID> ownerGroupUuid() {
isNotNull();
return check("getOwnerGroupUUID()").that(group.getOwnerGroupUUID());
}
@@ -76,7 +79,7 @@
return check("isVisibleToAll()").that(group.isVisibleToAll());
}
- public ComparableSubject createdOn() {
+ public ComparableSubject<Timestamp> createdOn() {
isNotNull();
return check("getCreatedOn()").that(group.getCreatedOn());
}
@@ -91,7 +94,7 @@
return check("getSubgroups()").that(group.getSubgroups());
}
- public ComparableSubject refState() {
+ public ComparableSubject<ObjectId> refState() {
isNotNull();
return check("getRefState()").that(group.getRefState());
}
