Преглед изворни кода

Merge pull request #300 from odzeno/nucleotide-count

Nucleotide-count: use JUnit's @Rule feature [Fix #264]
Stuart Kent пре 9 година
родитељ
комит
41d07997c7
1 измењених фајлова са 7 додато и 1 уклоњено
  1. 7
    1
      exercises/nucleotide-count/src/test/java/NucleotideTest.java

+ 7
- 1
exercises/nucleotide-count/src/test/java/NucleotideTest.java Прегледај датотеку

1
 import org.junit.Ignore;
1
 import org.junit.Ignore;
2
 import org.junit.Test;
2
 import org.junit.Test;
3
+import org.junit.Rule;
4
+import org.junit.rules.ExpectedException;
3
 
5
 
4
 import java.util.Map;
6
 import java.util.Map;
5
 
7
 
8
 
10
 
9
 public class NucleotideTest {
11
 public class NucleotideTest {
10
 
12
 
13
+    @Rule
14
+    public ExpectedException thrown = ExpectedException.none();
15
+    
11
     @Test
16
     @Test
12
     public void testEmptyDnaStringHasNoAdenosine() {
17
     public void testEmptyDnaStringHasNoAdenosine() {
13
         DNA dna = new DNA("");
18
         DNA dna = new DNA("");
80
     }
85
     }
81
 
86
 
82
     @Ignore
87
     @Ignore
83
-    @Test(expected = IllegalArgumentException.class)
88
+    @Test
84
     public void testValidatesNucleotides() {
89
     public void testValidatesNucleotides() {
90
+        thrown.expect(IllegalArgumentException.class);
85
         DNA dna = new DNA("GACT");
91
         DNA dna = new DNA("GACT");
86
         dna.count('X');
92
         dna.count('X');
87
     }
93
     }