Move to integration tests

Jules-Bertholet · Jules-Bertholet · commit 985be8c6490c · 2024-05-10T00:16:13.000-04:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -31,4 +31,4 @@ jobs:
     - name: Verify regenerated files
       run: ./scripts/unicode.py && diff tables.rs src/tables.rs
     - name: Verify regenerated tests
-      run: ./scripts/unicode_gen_breaktests.py && rustfmt testdata.rs && diff testdata.rs src/testdata.rs
+      run: ./scripts/unicode_gen_breaktests.py && rustfmt testdata.rs && diff testdata.rs tests/testdata/mod.rs
diff --git a/scripts/unicode.py b/scripts/unicode.py
@@ -431,3 +431,22 @@ def emit_break_module(f, break_table, break_cats, name):
             sentence_table.extend([(x, y, cat) for (x, y) in sentence_cats[cat]])
         sentence_table.sort(key=lambda w: w[0])
         emit_break_module(rf, sentence_table, list(sentence_cats.keys()), "sentence")
+
+        rf.write("""
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_syriac_abbr_mark() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\\u{70f}');
+        assert_eq!(cat, wd::WC_ALetter);
+    }
+
+    #[test]
+    fn test_end_of_ayah_cat() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\\u{6dd}');
+        assert_eq!(cat, wd::WC_Numeric);
+    }
+}
+""")
diff --git a/src/lib.rs b/src/lib.rs
@@ -56,14 +56,6 @@
 )]
 #![no_std]
 
-#[cfg(test)]
-#[macro_use]
-extern crate std;
-
-#[cfg(test)]
-#[macro_use]
-extern crate quickcheck;
-
 pub use grapheme::{GraphemeCursor, GraphemeIncomplete};
 pub use grapheme::{GraphemeIndices, Graphemes};
 pub use sentence::{USentenceBoundIndices, USentenceBounds, UnicodeSentences};
@@ -76,11 +68,6 @@ mod tables;
 mod sentence;
 mod word;
 
-#[cfg(test)]
-mod test;
-#[cfg(test)]
-mod testdata;
-
 /// Methods for segmenting strings according to
 /// [Unicode Standard Annex #29](http://www.unicode.org/reports/tr29/).
 pub trait UnicodeSegmentation {
diff --git a/src/tables.rs b/src/tables.rs
@@ -2990,3 +2990,20 @@ pub mod sentence {
     ];
 
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn test_syriac_abbr_mark() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\u{70f}');
+        assert_eq!(cat, wd::WC_ALetter);
+    }
+
+    #[test]
+    fn test_end_of_ayah_cat() {
+        use crate::tables::word as wd;
+        let (_, _, cat) = wd::word_category('\u{6dd}');
+        assert_eq!(cat, wd::WC_Numeric);
+    }
+}
diff --git a/tests/test.rs b/tests/test.rs
@@ -8,9 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use super::UnicodeSegmentation;
+use quickcheck::quickcheck;
+use unicode_segmentation::UnicodeSegmentation;
 
-use std::prelude::v1::*;
+mod testdata;
 
 #[test]
 fn test_graphemes() {
@@ -215,20 +216,6 @@ fn test_sentences() {
     }
 }
 
-#[test]
-fn test_syriac_abbr_mark() {
-    use crate::tables::word as wd;
-    let (_, _, cat) = wd::word_category('\u{70f}');
-    assert_eq!(cat, wd::WC_ALetter);
-}
-
-#[test]
-fn test_end_of_ayah_cat() {
-    use crate::tables::word as wd;
-    let (_, _, cat) = wd::word_category('\u{6dd}');
-    assert_eq!(cat, wd::WC_Numeric);
-}
-
 quickcheck! {
     fn quickcheck_forward_reverse_graphemes_extended(s: String) -> bool {
         let a = s.graphemes(true).collect::<Vec<_>>();
diff --git a/tests/testdata/mod.rs b/tests/testdata/mod.rs
