[idna] Move unit tests to tests/unit.rs

idna/Cargo.toml

@@ -14,6 +14,9 @@ test = false
 name = "tests"
 harness = false
 
+[[test]]
+name = "unit"
+
 [dev-dependencies]
 rustc-test = "0.1"
 rustc-serialize = "0.3"

idna/src/uts46.rs

@@ -413,42 +413,3 @@ pub fn to_unicode(domain: &str, mut flags: Flags) -> (String, Result<(), Errors>
     };
     (domain, errors)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn _to_ascii(domain: &str) -> Result<String, Errors> {
-        to_ascii(domain, Flags {
-            transitional_processing: false,
-            use_std3_ascii_rules: true,
-            verify_dns_length: true,
-        })
-    }
-
-    #[test]
-    fn test_v5() {
-        // IdnaTest:784 蔏｡𑰺
-        assert!(is_combining_mark('\u{11C3A}'));
-        assert!(_to_ascii("\u{11C3A}").is_err());
-        assert!(_to_ascii("\u{850f}.\u{11C3A}").is_err());
-        assert!(_to_ascii("\u{850f}\u{ff61}\u{11C3A}").is_err());
-    }
-
-    #[test]
-    fn test_v8_bidi_rules() {
-        assert_eq!(_to_ascii("abc").unwrap(), "abc");
-        assert_eq!(_to_ascii("123").unwrap(), "123");
-        assert_eq!(_to_ascii("אבּג").unwrap(), "xn--kdb3bdf");
-        assert_eq!(_to_ascii("ابج").unwrap(), "xn--mgbcm");
-        assert_eq!(_to_ascii("abc.ابج").unwrap(), "abc.xn--mgbcm");
-        assert_eq!(_to_ascii("אבּג.ابج").unwrap(), "xn--kdb3bdf.xn--mgbcm");
-
-        // Bidi domain names cannot start with digits
-        assert!(_to_ascii("0a.\u{05D0}").is_err());
-        assert!(_to_ascii("0à.\u{05D0}").is_err());
-
-        // Bidi chars may be punycode-encoded
-        assert!(_to_ascii("xn--0ca24w").is_err());
-    }
-}

idna/tests/unit.rs

@@ -0,0 +1,40 @@
+extern crate idna;
+extern crate unicode_normalization;
+
+use idna::uts46;
+use unicode_normalization::char::is_combining_mark;
+
+
+fn _to_ascii(domain: &str) -> Result<String, uts46::Errors> {
+    uts46::to_ascii(domain, uts46::Flags {
+        transitional_processing: false,
+        use_std3_ascii_rules: true,
+        verify_dns_length: true,
+    })
+}
+
+#[test]
+fn test_v5() {
+    // IdnaTest:784 蔏｡𑰺
+    assert!(is_combining_mark('\u{11C3A}'));
+    assert!(_to_ascii("\u{11C3A}").is_err());
+    assert!(_to_ascii("\u{850f}.\u{11C3A}").is_err());
+    assert!(_to_ascii("\u{850f}\u{ff61}\u{11C3A}").is_err());
+}
+
+#[test]
+fn test_v8_bidi_rules() {
+    assert_eq!(_to_ascii("abc").unwrap(), "abc");
+    assert_eq!(_to_ascii("123").unwrap(), "123");
+    assert_eq!(_to_ascii("אבּג").unwrap(), "xn--kdb3bdf");
+    assert_eq!(_to_ascii("ابج").unwrap(), "xn--mgbcm");
+    assert_eq!(_to_ascii("abc.ابج").unwrap(), "abc.xn--mgbcm");
+    assert_eq!(_to_ascii("אבּג.ابج").unwrap(), "xn--kdb3bdf.xn--mgbcm");
+
+    // Bidi domain names cannot start with digits
+    assert!(_to_ascii("0a.\u{05D0}").is_err());
+    assert!(_to_ascii("0à.\u{05D0}").is_err());
+
+    // Bidi chars may be punycode-encoded
+    assert!(_to_ascii("xn--0ca24w").is_err());
+}