Skip to content

Commit eb6da0b

Browse files
authored
Convert exception assertions to AssertJ in SeriestTest (exercism#2172)
1 parent 386fe52 commit eb6da0b

1 file changed

Lines changed: 13 additions & 30 deletions

File tree

exercises/practice/series/src/test/java/SeriesTest.java

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import static org.assertj.core.api.Assertions.assertThat;
21
import static org.junit.Assert.assertEquals;
3-
import static org.junit.Assert.assertThrows;
2+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
43

54
import java.util.Arrays;
65
import java.util.Collections;
@@ -83,55 +82,39 @@ public void slicesOfLongSeries() {
8382
public void sliceLengthIsToolarge() {
8483
Series series = new Series("12345");
8584

86-
IllegalArgumentException expected =
87-
assertThrows(
88-
IllegalArgumentException.class,
89-
() -> series.slices(6));
90-
91-
assertThat(expected)
92-
.hasMessage("Slice size is too big.");
85+
assertThatExceptionOfType(IllegalArgumentException.class)
86+
.isThrownBy(() -> series.slices(6))
87+
.withMessage("Slice size is too big.");
9388
}
9489

9590
@Ignore("Remove to run test")
9691
@Test
9792
public void sliceLengthZero() {
9893
Series series = new Series("12345");
9994

100-
IllegalArgumentException expected =
101-
assertThrows(
102-
IllegalArgumentException.class,
103-
() -> series.slices(0));
104-
105-
assertThat(expected)
106-
.hasMessage("Slice size is too small.");
95+
assertThatExceptionOfType(IllegalArgumentException.class)
96+
.isThrownBy(() -> series.slices(0))
97+
.withMessage("Slice size is too small.");
10798
}
10899

109100
@Ignore("Remove to run test")
110101
@Test
111102
public void sliceLengthNegative() {
112103
Series series = new Series("123");
113104

114-
IllegalArgumentException expected =
115-
assertThrows(
116-
IllegalArgumentException.class,
117-
() -> series.slices(-1));
118-
119-
assertThat(expected)
120-
.hasMessage("Slice size is too small.");
105+
assertThatExceptionOfType(IllegalArgumentException.class)
106+
.isThrownBy(() -> series.slices(-1))
107+
.withMessage("Slice size is too small.");
121108
}
122109

123110
@Ignore("Remove to run test")
124111
@Test
125112
public void emptySeries() {
126113
Series series = new Series("");
127114

128-
IllegalArgumentException expected =
129-
assertThrows(
130-
IllegalArgumentException.class,
131-
() -> series.slices(1));
132-
133-
assertThat(expected)
134-
.hasMessage("Slice size is too big.");
115+
assertThatExceptionOfType(IllegalArgumentException.class)
116+
.isThrownBy(() -> series.slices(1))
117+
.withMessage("Slice size is too big.");
135118
}
136119

137120
}

0 commit comments

Comments
 (0)