opendev/gerrit
Code Issues Proposed changes

Add more asserts to CommitInfoSubject and GitPersonSubject

Browse Source 
Change-Id: I35bad3c6e6d47c016e67c1b74cd0b00f1e0535a4
This commit is contained in:
Dave Borowitz
2017-11-13 09:51:31 -05:00
parent 373bd666e9
commit 06d2ba6b8d
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/com/google/gerrit/extensions/common/testing/CommitInfoSubject.java
View File

@@ -51,4 +51,16 @@ public class CommitInfoSubject extends Subject<CommitInfoSubject, CommitInfo> {
CommitInfo commitInfo = actual();
return GitPersonSubject.assertThat(commitInfo.committer).named("committer");
}
public GitPersonSubject author() {
isNotNull();
CommitInfo commitInfo = actual();
return GitPersonSubject.assertThat(commitInfo.author).named("author");
}
public StringSubject message() {
isNotNull();
CommitInfo commitInfo = actual();
return Truth.assertThat(commitInfo.message).named("message");
}
}

29
java/com/google/gerrit/extensions/common/testing/GitPersonSubject.java
View File

@@ -18,6 +18,8 @@ import static com.google.common.truth.Truth.assertAbout;
import com.google.common.truth.ComparableSubject;
import com.google.common.truth.FailureMetadata;
import com.google.common.truth.IntegerSubject;
import com.google.common.truth.StringSubject;
import com.google.common.truth.Subject;
import com.google.common.truth.Truth;
import com.google.gerrit.extensions.common.GitPerson;
@@ -33,9 +35,34 @@ public class GitPersonSubject extends Subject<GitPersonSubject, GitPerson> {
super(failureMetadata, gitPerson);
}
public StringSubject name() {
isNotNull();
GitPerson gitPerson = actual();
return Truth.assertThat(gitPerson.name).named("name");
}
public StringSubject email() {
isNotNull();
GitPerson gitPerson = actual();
return Truth.assertThat(gitPerson.email).named("email");
}
public ComparableSubject<?, Timestamp> date() {
isNotNull();
GitPerson gitPerson = actual();
return Truth.assertThat(gitPerson.date).named("creationDate");
return Truth.assertThat(gitPerson.date).named("date");
}
public IntegerSubject tz() {
isNotNull();
GitPerson gitPerson = actual();
return Truth.assertThat(gitPerson.tz).named("tz");
}
public void hasSameDateAs(GitPerson other) {
isNotNull();
assertThat(other).named("other").isNotNull();
date().isEqualTo(other.date);
tz().isEqualTo(other.tz);
}
}