exercism#1310 rust rna-transcription now matches README

etrepum · Jan 18, 2014 · bd19d87 · bd19d87
1 parent 21c59bd
commit bd19d87
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/assignments/rust/rna-transcription/example.rs b/assignments/rust/rna-transcription/example.rs
@@ -19,14 +19,23 @@ pub struct DeoxyribonucleicAcid {
     nucleotides: ~str
 }
 
+fn transcribe_dna_rna(c: char) -> char {
+    match c {
+        'C' => 'G',
+        'G' => 'C',
+        'A' => 'U',
+        'T' => 'A',
+        _   => c
+    }
+}
+
 impl DeoxyribonucleicAcid {
     pub fn new(nucleotides: ~str) -> DeoxyribonucleicAcid {
         DeoxyribonucleicAcid { nucleotides: nucleotides }
     }
 
     pub fn to_rna(&self) -> RibonucleicAcid {
-        let rna_nucleotides = self.nucleotides.replace("T", "U");
-
+        let rna_nucleotides = self.nucleotides.chars().map(transcribe_dna_rna).collect();
         RibonucleicAcid { nucleotides: rna_nucleotides }
     }
 }

diff --git a/assignments/rust/rna-transcription/rna-transcription_test.rs b/assignments/rust/rna-transcription/rna-transcription_test.rs
@@ -14,32 +14,32 @@ fn test_acid_equals_acid() {
 
 #[test]
 #[ignore]
-fn test_transcribes_cytidine_unchanged() {
-    assert_eq!(dna::RibonucleicAcid::new(~"C"), dna::DeoxyribonucleicAcid::new(~"C").to_rna());
+fn test_transcribes_cytidine_guanosine() {
+    assert_eq!(dna::RibonucleicAcid::new(~"G"), dna::DeoxyribonucleicAcid::new(~"C").to_rna());
 }
 
 #[test]
 #[ignore]
-fn test_transcribes_guanosine_unchanged() {
-    assert_eq!(dna::RibonucleicAcid::new(~"G"), dna::DeoxyribonucleicAcid::new(~"G").to_rna());
+fn test_transcribes_guanosine_cytidine() {
+    assert_eq!(dna::RibonucleicAcid::new(~"C"), dna::DeoxyribonucleicAcid::new(~"G").to_rna());
 }
 
 #[test]
 #[ignore]
-fn test_transcribes_adenosine_unchanged() {
-    assert_eq!(dna::RibonucleicAcid::new(~"A"), dna::DeoxyribonucleicAcid::new(~"A").to_rna());
+fn test_transcribes_adenosine_uracil() {
+    assert_eq!(dna::RibonucleicAcid::new(~"U"), dna::DeoxyribonucleicAcid::new(~"A").to_rna());
 }
 
 #[test]
 #[ignore]
-fn test_transcribes_thymidine_to_uracil() {
-    assert_eq!(dna::RibonucleicAcid::new(~"U"), dna::DeoxyribonucleicAcid::new(~"T").to_rna());
+fn test_transcribes_thymidine_to_adenosine() {
+    assert_eq!(dna::RibonucleicAcid::new(~"A"), dna::DeoxyribonucleicAcid::new(~"T").to_rna());
 }
 
 #[test]
 #[ignore]
-fn test_transcribes_all_occurrences_of_thymidine_to_uracil() {
-    assert_eq!(dna::RibonucleicAcid::new(~"ACGUGGUCUUAA"), dna::DeoxyribonucleicAcid::new(~"ACGTGGTCTTAA").to_rna())
+fn test_transcribes_all_dna_to_rna() {
+    assert_eq!(dna::RibonucleicAcid::new(~"UGCACCAGAAUU"), dna::DeoxyribonucleicAcid::new(~"ACGTGGTCTTAA").to_rna())
 }
 
 #[test]