Move src/test.rs to tests/test.rs

kentfredric · kentfredric · commit d42fff26fa2b · 2019-11-07T16:50:24.000+13:00
Adding various __test_api shims in the process
diff --git a/src/__test_api.rs b/src/__test_api.rs
@@ -26,3 +26,7 @@ pub fn classify_nonstarters(c: char) -> Decomposition {
 pub fn stream_safe(s: &str) -> String {
         StreamSafe::new(s.chars()).collect()
 }
+
+pub mod quick_check {
+    pub use crate::quick_check::*;
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -73,8 +73,6 @@ mod quick_check;
 mod stream_safe;
 mod tables;
 
-#[cfg(test)]
-mod test;
 mod normalization_tests;
 #[doc(hidden)]
 pub mod __test_api;
diff --git a/tests/test.rs b/tests/test.rs
@@ -1,3 +1,4 @@
+
 // Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
@@ -9,9 +10,11 @@
 // except according to those terms.
 
 
+extern crate unicode_normalization;
+
 use std::char;
-use super::UnicodeNormalization;
-use super::char::is_combining_mark;
+use unicode_normalization::UnicodeNormalization;
+use unicode_normalization::char::is_combining_mark;
 
 
 #[test]
@@ -97,7 +100,7 @@ fn test_nfkc() {
 
 #[test]
 fn test_official() {
-    use normalization_tests::NORMALIZATION_TESTS;
+    use unicode_normalization::__test_api::NORMALIZATION_TESTS;
     macro_rules! normString {
         ($method: ident, $input: expr) => { $input.$method().collect::<String>() }
     }
@@ -161,8 +164,8 @@ fn test_official() {
 
 #[test]
 fn test_quick_check() {
-    use normalization_tests::NORMALIZATION_TESTS;
-    use quick_check;
+    use unicode_normalization::__test_api::NORMALIZATION_TESTS;
+    use unicode_normalization::__test_api::quick_check;
     for test in NORMALIZATION_TESTS {
         assert!(quick_check::is_nfc(test.nfc));
         assert!(quick_check::is_nfd(test.nfd));

Original file line number	Diff line number	Diff line change
`@@ -26,3 +26,7 @@ pub fn classify_nonstarters(c: char) -> Decomposition {`
`26`	`26`	`pub fn stream_safe(s: &str) -> String {`
`27`	`27`	`StreamSafe::new(s.chars()).collect()`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+pub mod quick_check {`
	`31`	`+ pub use crate::quick_check::*;`
	`32`	`+}`