Merge pull request exercism#768 from exercism/rna-transcription-update

FridaTveit · web-flow · commit 1ba5522e7926 · 2017-09-04T17:03:11.000+01:00
rna-transcription: update to v1.0.1 tests
diff --git a/exercises/rna-transcription/src/example/java/RnaTranscription.java b/exercises/rna-transcription/src/example/java/RnaTranscription.java
@@ -1,6 +1,6 @@
-public class RnaTranscription {
+class RnaTranscription {
 
-    public String transcribe(String dnaStrand) {
+    String transcribe(String dnaStrand) {
         StringBuilder sb = new StringBuilder();
         for (char c : dnaStrand.toCharArray()) {
             switch (c) {
@@ -21,6 +21,8 @@ public String transcribe(String dnaStrand) {
 
             }
         }
+
         return sb.toString();
     }
+
 }
diff --git a/exercises/rna-transcription/src/main/java/RnaTranscription.java b/exercises/rna-transcription/src/main/java/RnaTranscription.java
@@ -1,5 +1,7 @@
-public class RnaTranscription {
-    public String transcribe(String dnaStrand) {
+class RnaTranscription {
+
+    String transcribe(String dnaStrand) {
         throw new UnsupportedOperationException("Delete this statement and write your own implementation.");
     }
-}
+
+}
diff --git a/exercises/rna-transcription/src/test/java/RnaTranscriptionTest.java b/exercises/rna-transcription/src/test/java/RnaTranscriptionTest.java
@@ -1,18 +1,18 @@
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.Rule;
 
-public class RnaTranscriptionTest {
+import static org.junit.Assert.assertEquals;
 
-    /*
-    version: 2.0.0
-     */
+/*
+ * version: 1.0.1
+ */
+public class RnaTranscriptionTest {
 
     @Rule
-    public ExpectedException thrown = ExpectedException.none();
+    public ExpectedException expectedException = ExpectedException.none();
 
     private RnaTranscription rnaTranscription;
 
@@ -21,62 +21,57 @@ public void setUp() {
         rnaTranscription = new RnaTranscription();
     }
 
-    @Test
-    public void testRnaTranscriptionOfEmptyDnaIsEmptyRna() {
-        Assert.assertEquals("", rnaTranscription.transcribe(""));
-    }
-
-    @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfCytosineIsGuanine() {
-        Assert.assertEquals("G", rnaTranscription.transcribe("C"));
+        assertEquals("G", rnaTranscription.transcribe("C"));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfGuanineIsCytosine() {
-        Assert.assertEquals("C", rnaTranscription.transcribe("G"));
+        assertEquals("C", rnaTranscription.transcribe("G"));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfThymineIsAdenine() {
-        Assert.assertEquals("A", rnaTranscription.transcribe("T"));
+        assertEquals("A", rnaTranscription.transcribe("T"));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfAdenineIsUracil() {
-        Assert.assertEquals("U", rnaTranscription.transcribe("A"));
+        assertEquals("U", rnaTranscription.transcribe("A"));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscription() {
-        Assert.assertEquals("UGCACCAGAAUU", rnaTranscription.transcribe("ACGTGGTCTTAA"));
+        assertEquals("UGCACCAGAAUU", rnaTranscription.transcribe("ACGTGGTCTTAA"));
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfRnaThrowsAnError() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid input");
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("Invalid input");
         rnaTranscription.transcribe("U");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfInvalidInputThrowsAnError() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid input");
-        rnaTranscription.transcribe("BFV");
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("Invalid input");
+        rnaTranscription.transcribe("XXX");
     }
 
     @Ignore("Remove to run test")
     @Test
     public void testRnaTranscriptionOfPartiallyInvalidInput() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid input");
-        rnaTranscription.transcribe("GCVV");
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("Invalid input");
+        rnaTranscription.transcribe("ACGTXXXCTTAA");
     }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-public class RnaTranscription {`
	`1`	`+class RnaTranscription {`
`2`	`2`
`3`		`- public String transcribe(String dnaStrand) {`
	`3`	`+ String transcribe(String dnaStrand) {`
`4`	`4`	`StringBuilder sb = new StringBuilder();`
`5`	`5`	`for (char c : dnaStrand.toCharArray()) {`
`6`	`6`	`switch (c) {`
`@@ -21,6 +21,8 @@ public String transcribe(String dnaStrand) {`
`21`	`21`
`22`	`22`	`}`
`23`	`23`	`}`
	`24`	`+`
`24`	`25`	`return sb.toString();`
`25`	`26`	`}`
	`27`	`+`
`26`	`28`	`}`