Parcourir la source

Merge pull request #302 from odzeno/series

Series: use JUnit's @Rule feature [Fix #266]
Stuart Kent il y a 9 ans
Parent
révision
07f6c74052
1 fichiers modifiés avec 10 ajouts et 4 suppressions
  1. 10
    4
      exercises/series/src/test/java/SeriesTest.java

+ 10
- 4
exercises/series/src/test/java/SeriesTest.java Voir le fichier

1
-
2
 import java.util.Arrays;
1
 import java.util.Arrays;
3
 import java.util.List;
2
 import java.util.List;
3
+
4
 import org.junit.Test;
4
 import org.junit.Test;
5
+import org.junit.Ignore;
6
+import org.junit.Rule;
7
+import org.junit.rules.ExpectedException;
5
 
8
 
6
 import static org.junit.Assert.assertEquals;
9
 import static org.junit.Assert.assertEquals;
7
 import static org.junit.Assert.assertFalse;
10
 import static org.junit.Assert.assertFalse;
8
 import static org.junit.Assert.assertNotNull;
11
 import static org.junit.Assert.assertNotNull;
9
-import org.junit.Ignore;
10
 
12
 
11
 public class SeriesTest {
13
 public class SeriesTest {
12
-
14
+    
15
+    @Rule
16
+    public ExpectedException thrown = ExpectedException.none();
17
+    
13
     @Test
18
     @Test
14
     public void hasDigitsShort() {
19
     public void hasDigitsShort() {
15
         Series sut = new Series("01234");
20
         Series sut = new Series("01234");
146
         assertEquals(expected, actual);
151
         assertEquals(expected, actual);
147
     }
152
     }
148
 
153
 
149
-    @Test(expected = IllegalArgumentException.class)
154
+    @Test
150
     @Ignore
155
     @Ignore
151
     public void throwsAnErrorIfNotEnoughDigitsToSlice() {
156
     public void throwsAnErrorIfNotEnoughDigitsToSlice() {
157
+        thrown.expect(IllegalArgumentException.class);
152
         new Series("01032987583").slices(12);
158
         new Series("01032987583").slices(12);
153
     }
159
     }
154
 }
160
 }