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

Use JUnit's assert format for assert messages to enable better suppor… #6262

Merged
merged 2 commits into from
Oct 26, 2018
Merged

Use JUnit's assert format for assert messages to enable better suppor… #6262

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b117fd0
Use JUnit's assert format for assert messages to enable better suppor…
bjoernQ Oct 26, 2018
6e1165d
remove unnecessary < and > since it's not matched by IntelliJ's regex
bjoernQ Oct 26, 2018
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
18 changes: 9 additions & 9 deletions src/main/java/io/reactivex/observers/BaseTestConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ public final U assertError(Predicate<Throwable> errorPredicate) {
public final U assertValue(T value) {
int s = values.size();
if (s != 1) {
throw fail("Expected: " + valueAndClass(value) + ", Actual: " + values);
throw fail("expected:<" + valueAndClass(value) + "> but was:<" + values + ">");
}
T v = values.get(0);
if (!ObjectHelper.equals(value, v)) {
throw fail("Expected: " + valueAndClass(value) + ", Actual: " + valueAndClass(v));
throw fail("expected:<" + valueAndClass(value) + "> but was:<" + valueAndClass(v) + ">");
}
return (U)this;
}
Expand Down Expand Up @@ -450,7 +450,7 @@ public final U assertValueAt(int index, T value) {

T v = values.get(index);
if (!ObjectHelper.equals(value, v)) {
throw fail("Expected: " + valueAndClass(value) + ", Actual: " + valueAndClass(v));
throw fail("expected:<" + valueAndClass(value) + "> but was:<" + valueAndClass(v) + ">");
}
return (U)this;
}
Expand Down Expand Up @@ -512,7 +512,7 @@ public static String valueAndClass(Object o) {
public final U assertValueCount(int count) {
int s = values.size();
if (s != count) {
throw fail("Value counts differ; Expected: " + count + ", Actual: " + s);
throw fail("Value counts differ; expected:<" + count + "> but was:<" + s + ">");
}
return (U)this;
}
Expand All @@ -535,14 +535,14 @@ public final U assertNoValues() {
public final U assertValues(T... values) {
int s = this.values.size();
if (s != values.length) {
throw fail("Value count differs; Expected: " + values.length + " " + Arrays.toString(values)
+ ", Actual: " + s + " " + this.values);
throw fail("Value count differs; expected:<" + values.length + " " + Arrays.toString(values)
+ "> but was:<" + s + " " + this.values + ">");
}
for (int i = 0; i < s; i++) {
T v = this.values.get(i);
T u = values[i];
if (!ObjectHelper.equals(u, v)) {
throw fail("Values at position " + i + " differ; Expected: " + valueAndClass(u) + ", Actual: " + valueAndClass(v));
throw fail("Values at position " + i + " differ; expected:<" + valueAndClass(u) + "> but was:<" + valueAndClass(v) + ">");
}
}
return (U)this;
Expand Down Expand Up @@ -628,7 +628,7 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {
T v = actualIterator.next();

if (!ObjectHelper.equals(u, v)) {
throw fail("Values at position " + i + " differ; Expected: " + valueAndClass(u) + ", Actual: " + valueAndClass(v));
throw fail("Values at position " + i + " differ; expected:<" + valueAndClass(u) + "> but was:<" + valueAndClass(v)+">");
}
i++;
}
Expand Down Expand Up @@ -738,7 +738,7 @@ public final U assertErrorMessage(String message) {
Throwable e = errors.get(0);
String errorMessage = e.getMessage();
if (!ObjectHelper.equals(message, errorMessage)) {
throw fail("Error message differs; Expected: " + message + ", Actual: " + errorMessage);
throw fail("Error message differs; exptected:<" + message + "> but was:< " + errorMessage+">");
}
} else {
throw fail("Multiple errors");
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/io/reactivex/observers/TestObserverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,7 +1407,7 @@ public void assertValueAtIndexNoMatch() {
Observable.just("a", "b", "c").subscribe(to);

thrown.expect(AssertionError.class);
thrown.expectMessage("Expected: b (class: String), Actual: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)");
thrown.expectMessage("expected:<b (class: String)> but was:<c (class: String)> (latch = 0, values = 3, errors = 0, completions = 1)");
to.assertValueAt(2, "b");
}

Expand Down