Use testdata everywhere

components/datetime/Cargo.toml

@@ -21,7 +21,7 @@ icu-data-provider = { path = "../data-provider" }
 [dev-dependencies]
 criterion = "0.3"
 icu-data-provider = { path = "../data-provider", features = ["invariant"] }
-icu-fs-data-provider = { path = "../fs-data-provider" }
+icu-testdata = { path = "../../resources/testdata" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 

components/datetime/benches/datetime.rs

@@ -5,13 +5,11 @@ use std::fmt::Write;
 
 use icu_datetime::DateTimeFormat;
 use icu_datetime::MockDateTime;
-use icu_fs_data_provider::FsDataProvider;
 
 fn datetime_benches(c: &mut Criterion) {
     let fxs = fixtures::get_fixture("styles").unwrap();
 
-    let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x")
-        .expect("Loading file from testdata directory");
+    let provider = icu_testdata::get_provider();
 
     {
         let mut group = c.benchmark_group("datetime");

components/datetime/benches/fixtures/tests/styles.json

@@ -2,7 +2,7 @@
     {
         "setups": [
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "full",
@@ -11,7 +11,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "long",
@@ -20,7 +20,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "medium",
@@ -29,7 +29,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "short",
@@ -38,7 +38,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": null,
@@ -47,7 +47,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": null,
@@ -56,7 +56,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": null,
@@ -65,7 +65,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": null,
@@ -74,7 +74,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "full",
@@ -83,7 +83,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "long",
@@ -92,7 +92,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "medium",
@@ -101,7 +101,7 @@
                 }
             },
             {
-                "locale": "pl",
+                "locale": "be",
                 "options": {
                     "style": {
                         "date": "short",

components/datetime/examples/work_log.rs

@@ -2,7 +2,6 @@
 // from a work log into human readable dates and times.
 use icu_datetime::date::MockDateTime;
 use icu_datetime::{options::style, DateTimeFormat};
-use icu_fs_data_provider::FsDataProvider;
 use icu_locale::LanguageIdentifier;
 
 const DATES_ISO: &[&str] = &[
@@ -30,8 +29,7 @@ fn print(_input: &str, _value: Option<usize>) {
 fn main() {
     let langid: LanguageIdentifier = "en".parse().expect("Failed to parse Language Identifier.");
 
-    let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x")
-        .expect("Loading file from testdata directory");
+    let provider = icu_testdata::get_provider();
 
     let dates = DATES_ISO
         .iter()

components/datetime/tests/datetime.rs

@@ -2,13 +2,11 @@ mod fixtures;
 
 use icu_datetime::DateTimeFormat;
 use icu_datetime::MockDateTime;
-use icu_fs_data_provider::FsDataProvider;
 use std::fmt::Write;
 
 #[test]
 fn test_fixtures() {
-    let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x")
-        .expect("Loading file from testdata directory");
+    let provider = icu_testdata::get_provider();
 
     for fx in fixtures::get_fixture("styles").unwrap().0 {
         let langid = fx.input.locale.parse().unwrap();

components/datetime/tests/fixtures/tests/styles.json

@@ -91,7 +91,7 @@
     },
     {
         "input": {
-            "locale": "pl",
+            "locale": "be",
             "value": "2020-03-21T08:25:07.000",
             "options": {
                 "style": {
@@ -101,7 +101,7 @@
             }
         },
         "output": {
-            "value": "sobota, 21 marca 2020 08:25:07 zzzz"
+            "value": "субота, 21 сакавіка 2020 'г'. 'у' 08:25:07, zzzz"
         }
     }
 ]

components/fs-data-provider/tests/test_file_io.rs

@@ -5,8 +5,7 @@ use std::borrow::Cow;
 
 #[test]
 fn test_read_json() {
-    let provider = FsDataProvider::try_new("tests/testdata/json_plurals_37")
-        .expect("Loading file from testdata directory");
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
     let response = provider
         .load(&DataRequest {
             data_key: icu_data_key!(plurals: cardinal@1),

components/icu/src/lib.rs

@@ -33,10 +33,8 @@
 //! ```
 //! use icu::locale::LanguageIdentifier;
 //! use icu::datetime::{DateTimeFormat, date::MockDateTime, options::style};
-//! use icu_fs_data_provider::FsDataProvider;
 //!
-//! let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x")
-//!     .expect("Loading file from testdata directory");
+//! let provider = icu_testdata::get_provider();
 //!
 //! let langid: LanguageIdentifier = "en".parse()
 //!     .expect("Failed to parse a Language Identifier.");

components/pluralrules/Cargo.toml

@@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = {version = "1.0" }
 icu-locale = { path = "../locale", features = ["serde"] }
 icu-data-provider = { path = "../data-provider", features = ["invariant"] }
-icu-fs-data-provider = { path = "../fs-data-provider" }
+icu-testdata = { path = "../../resources/testdata" }
 
 [features]
 default = []

components/pluralrules/benches/fixtures/plurals.json

@@ -1,3 +1,3 @@
 {
-  "langs": ["uk", "de", "sk", "ar", "fr", "it", "en", "cs", "es", "zh"]
+  "langs": ["ar", "be", "bn", "en", "es", "fr", "ja", "sr", "th", "tr"]
 }

components/pluralrules/benches/parser.rs

@@ -4,16 +4,14 @@ mod helpers;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
 use icu_data_provider::{icu_data_key, structs, DataEntry, DataProvider, DataRequest};
-use icu_fs_data_provider::FsDataProvider;
 use std::borrow::Cow;
 
 fn parser(c: &mut Criterion) {
     use icu_pluralrules::rules::parse_condition;
 
     let plurals_data = helpers::get_plurals_data();
 
-    let provider = FsDataProvider::try_new("./tests/data/json_plurals_37")
-        .expect("Loading file from testdata directory");
+    let provider = icu_testdata::get_provider();
 
     let mut rules = vec![];
 

components/pluralrules/benches/pluralrules.rs

@@ -3,15 +3,13 @@ mod helpers;
 
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use icu_fs_data_provider::FsDataProvider;
 use icu_pluralrules::{PluralRuleType, PluralRules};
 
 fn pluralrules(c: &mut Criterion) {
     let plurals_data = helpers::get_plurals_data();
     let numbers_data = helpers::get_numbers_data();
 
-    let provider = FsDataProvider::try_new("./tests/data/json_plurals_37")
-        .expect("Loading file from testdata directory");
+    let provider = icu_testdata::get_provider();
 
     c.bench_function("pluralrules/overview", |b| {
         b.iter(|| {