Fix typo and add a new test

unicode-rs · Jun 24, 2020 · c2f0cf6 · c2f0cf6
1 parent da19f75
commit c2f0cf6
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/src/mixed_script.rs b/src/mixed_script.rs
@@ -113,9 +113,13 @@ impl fmt::Display for AugmentedScriptSet {
             write!(f, "All")?;
         } else {
             let mut first_entry = true;
-            let hanb = if self.hanb { Some("Han with Bopomofo") } else { None };
+            let hanb = if self.hanb {
+                Some("Han with Bopomofo")
+            } else {
+                None
+            };
             let jpan = if self.jpan { Some("Japanese") } else { None };
-            let kore = if self.kore { Some("Krorean") } else { None };
+            let kore = if self.kore { Some("Korean") } else { None };
             for writing_system in None
                 .into_iter()
                 .chain(hanb)

diff --git a/src/tests.rs b/src/tests.rs
@@ -79,7 +79,7 @@ fn test_potential_mixed_script_detection() {
 }
 
 #[test]
-fn test_augmented_script_set() {
+fn test_augmented_script_set_fmt_debug() {
     use crate::mixed_script::AugmentedScriptSet;
     let augmented_script_sets = vec![
         AugmentedScriptSet::default(),
@@ -114,3 +114,40 @@ fn test_augmented_script_set() {
         assert_eq!(format!("{:?}", ss), output);
     }
 }
+
+#[test]
+fn test_augmented_script_set_fmt_display() {
+    use crate::mixed_script::AugmentedScriptSet;
+    let augmented_script_sets = vec![
+        AugmentedScriptSet::default(),
+        AugmentedScriptSet::from('0'),
+        AugmentedScriptSet::from('a'),
+        AugmentedScriptSet::from('μ'),
+        AugmentedScriptSet::from('汉'),
+        AugmentedScriptSet::from('ひ'),
+        AugmentedScriptSet::from('カ'),
+        AugmentedScriptSet::from('한'),
+        AugmentedScriptSet::from("汉ひ"),
+        AugmentedScriptSet::from("汉a"),
+        AugmentedScriptSet::from("汉μ"),
+        AugmentedScriptSet::from("〆切"),
+    ];
+    let debug_output = vec![
+        "All",
+        "All",
+        "Latin",
+        "Greek",
+        "Han with Bopomofo, Japanese, Korean, Han",
+        "Japanese, Hiragana",
+        "Japanese, Katakana",
+        "Korean, Hangul",
+        "Japanese",
+        "Empty",
+        "Empty",
+        "Han with Bopomofo, Japanese, Korean, Han",
+    ];
+
+    for (ss, output) in augmented_script_sets.into_iter().zip(debug_output) {
+        assert_eq!(format!("{}", ss), output);
+    }
+}