Skip to content

Commit 17e71ab

Browse files
keytronickeytronic
authored
Update assert messages format to be compliant with GradleRunner and JUnitRunner (ReactiveX#7345)
1 parent 6cc3a3b commit 17e71ab

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ private U assertError(@NonNull Predicate<Throwable> errorPredicate, boolean exac
307307
public final U assertValue(@NonNull T value) {
308308
int s = values.size();
309309
if (s != 1) {
310-
throw fail("expected: " + valueAndClass(value) + " but was: " + values);
310+
throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + values);
311311
}
312312
T v = values.get(0);
313313
if (!Objects.equals(value, v)) {
314-
throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
314+
throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
315315
}
316316
return (U)this;
317317
}
@@ -359,7 +359,7 @@ public final U assertValueAt(int index, @NonNull T value) {
359359

360360
T v = values.get(index);
361361
if (!Objects.equals(value, v)) {
362-
throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v) + " at position " + index);
362+
throw fail("Values at position " + index + " differ;\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
363363
}
364364
return (U)this;
365365
}
@@ -425,7 +425,7 @@ public static String valueAndClass(@Nullable Object o) {
425425
public final U assertValueCount(int count) {
426426
int s = values.size();
427427
if (s != count) {
428-
throw fail("Value counts differ; expected: " + count + " but was: " + s);
428+
throw fail("Value counts differ;\nexpected: " + count + "\ngot: " + s);
429429
}
430430
return (U)this;
431431
}
@@ -450,14 +450,14 @@ public final U assertNoValues() {
450450
public final U assertValues(@NonNull T... values) {
451451
int s = this.values.size();
452452
if (s != values.length) {
453-
throw fail("Value count differs; expected: " + values.length + " " + Arrays.toString(values)
454-
+ " but was: " + s + " " + this.values);
453+
throw fail("Value count differs;\nexpected: " + values.length + " " + Arrays.toString(values)
454+
+ "\ngot: " + s + " " + this.values);
455455
}
456456
for (int i = 0; i < s; i++) {
457457
T v = this.values.get(i);
458458
T u = values[i];
459459
if (!Objects.equals(u, v)) {
460-
throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
460+
throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
461461
}
462462
}
463463
return (U)this;
@@ -504,7 +504,7 @@ public final U assertValueSequence(@NonNull Iterable<? extends T> sequence) {
504504
T v = actualIterator.next();
505505

506506
if (!Objects.equals(u, v)) {
507-
throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
507+
throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
508508
}
509509
i++;
510510
}

‎src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ public void assertValueAtIndexMatch() {
999999

10001000
@Test
10011001
public void assertValueAtIndexNoMatch() {
1002-
assertThrowsWithMessage("expected: b (class: String) but was: c (class: String) at position 2 (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1002+
assertThrowsWithMessage("Values at position 2 differ;\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
10031003
TestObserver<String> to = new TestObserver<>();
10041004

10051005
Observable.just("a", "b", "c").subscribe(to);

‎src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public final U assertErrorMessage(String message) {
160160
Throwable e = errors.get(0);
161161
String errorMessage = e.getMessage();
162162
if (!Objects.equals(message, errorMessage)) {
163-
throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage);
163+
throw fail("Error message differs;\nexpected: " + message + "\ngot: " + errorMessage);
164164
}
165165
} else {
166166
throw fail("Multiple errors");

‎src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ public final TestObserverEx<T> assertFusionMode(int mode) {
254254
int m = establishedFusionMode;
255255
if (m != mode) {
256256
if (qd != null) {
257-
throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode)
258-
+ ", actual: " + fusionModeToString(m));
257+
throw new AssertionError("Fusion mode different.\nexpected: " + fusionModeToString(mode)
258+
+ "\ngot: " + fusionModeToString(m));
259259
} else {
260260
throw fail("Upstream is not fuseable");
261261
}

‎src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ public void assertValueAtIndexMatch() {
12741274

12751275
@Test
12761276
public void assertValueAtIndexNoMatch() {
1277-
assertThrows("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1277+
assertThrows("\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
12781278
TestObserverEx<String> to = new TestObserverEx<>();
12791279

12801280
Observable.just("a", "b", "c").subscribe(to);

0 commit comments

Comments
 (0)