Skip to content

Commit c2bf514

Browse files
keytronickeytronic
authored
Fix assert message format (ReactiveX#7351)
* Fix assert message format * Test error messages against regex
1 parent 1f87a43 commit c2bf514

File tree

5 files changed

+121
-12
lines changed

5 files changed

+121
-12
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,8 @@ 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("Values at position " + index + " differ;\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
362+
throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v)
363+
+ "; Value at position " + index + " differ");
363364
}
364365
return (U)this;
365366
}
@@ -425,7 +426,7 @@ public static String valueAndClass(@Nullable Object o) {
425426
public final U assertValueCount(int count) {
426427
int s = values.size();
427428
if (s != count) {
428-
throw fail("Value counts differ;\nexpected: " + count + "\ngot: " + s);
429+
throw fail("\nexpected: " + count + "\ngot: " + s + "; Value counts differ");
429430
}
430431
return (U)this;
431432
}
@@ -450,14 +451,15 @@ public final U assertNoValues() {
450451
public final U assertValues(@NonNull T... values) {
451452
int s = this.values.size();
452453
if (s != values.length) {
453-
throw fail("Value count differs;\nexpected: " + values.length + " " + Arrays.toString(values)
454-
+ "\ngot: " + s + " " + this.values);
454+
throw fail("\nexpected: " + values.length + " " + Arrays.toString(values)
455+
+ "\ngot: " + s + " " + this.values + "; Value count differs");
455456
}
456457
for (int i = 0; i < s; i++) {
457458
T v = this.values.get(i);
458459
T u = values[i];
459460
if (!Objects.equals(u, v)) {
460-
throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
461+
throw fail("\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v)
462+
+ "; Value at position " + i + " differ");
461463
}
462464
}
463465
return (U)this;
@@ -504,7 +506,8 @@ public final U assertValueSequence(@NonNull Iterable<? extends T> sequence) {
504506
T v = actualIterator.next();
505507

506508
if (!Objects.equals(u, v)) {
507-
throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
509+
throw fail("\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v)
510+
+ "; Value at position " + i + " differ");
508511
}
509512
i++;
510513
}

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

Lines changed: 106 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ static void assertThrowsWithMessage(String message, Class<? extends Throwable> c
4444
assertEquals(message, assertThrows(clazz, run).getMessage());
4545
}
4646

47+
static void assertThrowsWithMessageMatchRegex(String regex, Class<? extends Throwable> clazz, ThrowingRunnable run) {
48+
assertTrue(assertThrows(clazz, run).getMessage().matches(regex));
49+
}
50+
51+
private static final String ASSERT_MESSAGE_REGEX = "\nexpected: (.*)\n\\s*got: (.*)";
52+
4753
@Test
4854
public void assertTestObserver() {
4955
Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -999,7 +1005,7 @@ public void assertValueAtIndexMatch() {
9991005

10001006
@Test
10011007
public void assertValueAtIndexNoMatch() {
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, () -> {
1008+
assertThrowsWithMessage("\nexpected: b (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
10031009
TestObserver<String> to = new TestObserver<>();
10041010

10051011
Observable.just("a", "b", "c").subscribe(to);
@@ -1008,6 +1014,105 @@ public void assertValueAtIndexNoMatch() {
10081014
});
10091015
}
10101016

1017+
@Test
1018+
public void assertValueAtIndexThrowsMessageMatchRegex() {
1019+
assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
1020+
TestObserver<String> to = new TestObserver<>();
1021+
1022+
Observable.just("a", "b", "c").subscribe(to);
1023+
1024+
to.assertValueAt(2, "b");
1025+
});
1026+
}
1027+
1028+
@Test
1029+
public void assertValuesCountNoMatch() {
1030+
assertThrowsWithMessage("\nexpected: 2 [a, b]\ngot: 3 [a, b, c]; Value count differs (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1031+
TestObserver<String> to = new TestObserver<>();
1032+
1033+
Observable.just("a", "b", "c").subscribe(to);
1034+
1035+
to.assertValues("a", "b");
1036+
});
1037+
}
1038+
1039+
@Test
1040+
public void assertValuesCountThrowsMessageMatchRegex() {
1041+
assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
1042+
TestObserver<String> to = new TestObserver<>();
1043+
1044+
Observable.just("a", "b", "c").subscribe(to);
1045+
1046+
to.assertValues("a", "b");
1047+
});
1048+
}
1049+
1050+
@Test
1051+
public void assertValuesNoMatch() {
1052+
assertThrowsWithMessage("\nexpected: d (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1053+
TestObserver<String> to = new TestObserver<>();
1054+
1055+
Observable.just("a", "b", "c").subscribe(to);
1056+
1057+
to.assertValues("a", "b", "d");
1058+
});
1059+
}
1060+
1061+
@Test
1062+
public void assertValuesThrowsMessageMatchRegex() {
1063+
assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
1064+
TestObserver<String> to = new TestObserver<>();
1065+
1066+
Observable.just("a", "b", "c").subscribe(to);
1067+
1068+
to.assertValues("a", "b", "d");
1069+
});
1070+
}
1071+
1072+
@Test
1073+
public void assertValueCountNoMatch() {
1074+
assertThrowsWithMessage("\nexpected: 2\ngot: 3; Value counts differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1075+
TestObserver<String> to = new TestObserver<>();
1076+
1077+
Observable.just("a", "b", "c").subscribe(to);
1078+
1079+
to.assertValueCount(2);
1080+
});
1081+
}
1082+
1083+
@Test
1084+
public void assertValueCountThrowsMessageMatchRegex() {
1085+
assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
1086+
TestObserver<String> to = new TestObserver<>();
1087+
1088+
Observable.just("a", "b", "c").subscribe(to);
1089+
1090+
to.assertValueCount(2);
1091+
});
1092+
}
1093+
1094+
@Test
1095+
public void assertValueSequenceNoMatch() {
1096+
assertThrowsWithMessage("\nexpected: d (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
1097+
TestObserver<String> to = new TestObserver<>();
1098+
1099+
Observable.just("a", "b", "c").subscribe(to);
1100+
1101+
to.assertValueSequence(Arrays.asList("a", "b", "d"));
1102+
});
1103+
}
1104+
1105+
@Test
1106+
public void assertValueSequenceThrowsMessageMatchRegex() {
1107+
assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
1108+
TestObserver<String> to = new TestObserver<>();
1109+
1110+
Observable.just("a", "b", "c").subscribe(to);
1111+
1112+
to.assertValueSequence(Arrays.asList("a", "b", "d"));
1113+
});
1114+
}
1115+
10111116
@Test
10121117
public void assertValueAtIndexInvalidIndex() {
10131118
assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ 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;\nexpected: " + message + "\ngot: " + errorMessage);
163+
throw fail("\nexpected: " + message + "\ngot: " + errorMessage
164+
+ "; Error message differs");
164165
}
165166
} else {
166167
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.\nexpected: " + fusionModeToString(mode)
258-
+ "\ngot: " + fusionModeToString(m));
257+
throw new AssertionError("\nexpected: " + fusionModeToString(mode)
258+
+ "\ngot: " + fusionModeToString(m) + "; Fusion mode different");
259259
} else {
260260
throw fail("Upstream is not fuseable");
261261
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,8 +317,8 @@ public final TestSubscriberEx<T> assertFusionMode(int mode) {
317317
int m = establishedFusionMode;
318318
if (m != mode) {
319319
if (qs != null) {
320-
throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode)
321-
+ ", actual: " + fusionModeToString(m));
320+
throw new AssertionError("\nexpected: " + fusionModeToString(mode)
321+
+ "\ngot: " + fusionModeToString(m) + "; Fusion mode different");
322322
} else {
323323
throw fail("Upstream is not fuseable");
324324
}

0 commit comments

Comments
 (0)