Use testdata everywhere

components/datetime/benches/datetime.rs

@@ -10,7 +10,7 @@ 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")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     {

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

@@ -30,7 +30,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")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     let dates = DATES_ISO

components/datetime/tests/datetime.rs

@@ -7,7 +7,7 @@ use std::fmt::Write;
 
 #[test]
 fn test_fixtures() {
-    let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     for fx in fixtures::get_fixture("styles").unwrap().0 {

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,15 +5,15 @@ use std::borrow::Cow;
 
 #[test]
 fn test_read_json() {
-    let provider = FsDataProvider::try_new("tests/testdata/json_plurals_37")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
     let response = provider
         .load(&DataRequest {
             data_key: icu_data_key!(plurals: cardinal@1),
             data_entry: DataEntry {
                 variant: None,
                 // TODO: Migrate to LanguageIdentifier macro
-                langid: "sr".parse().expect("Valid language tag"),
+                langid: "en".parse().expect("Valid language tag"),
             },
         })
         .expect("The key should be present in the testdata");
@@ -24,9 +24,9 @@ fn test_read_json() {
         plurals_data,
         &structs::plurals::PluralRuleStringsV1 {
             zero: None,
-            one: Some(Cow::Borrowed("v = 0 and i % 10 = 1 and i % 100 != 11 or f % 10 = 1 and f % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …")),
+            one: Some(Cow::Borrowed("i = 1 and v = 0")),
             two: None,
-            few: Some(Cow::Borrowed("v = 0 and i % 10 = 2..4 and i % 100 != 12..14 or f % 10 = 2..4 and f % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, … @decimal 0.2~0.4, 1.2~1.4, 2.2~2.4, 3.2~3.4, 4.2~4.4, 5.2, 10.2, 100.2, 1000.2, …")),
+            few: None,
             many: None,
         }
     );

components/pluralrules/benches/fixtures/plurals.json

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

components/pluralrules/benches/parser.rs

@@ -12,7 +12,7 @@ fn parser(c: &mut Criterion) {
 
     let plurals_data = helpers::get_plurals_data();
 
-    let provider = FsDataProvider::try_new("./tests/data/json_plurals_37")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     let mut rules = vec![];

components/pluralrules/benches/pluralrules.rs

@@ -10,7 +10,7 @@ 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")
+    let provider = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     c.bench_function("pluralrules/overview", |b| {

components/pluralrules/examples/elevator_floors.rs

@@ -17,7 +17,7 @@ fn print(_input: &str, _value: Option<usize>) {
 
 fn main() {
     let langid: LanguageIdentifier = "en".parse().expect("Failed to parse Language Identifier.");
-    let dtp = FsDataProvider::try_new("./tests/data/json_plurals_37")
+    let dtp = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     {

components/pluralrules/examples/unread_emails.rs

@@ -17,7 +17,7 @@ fn print(_input: &str, _value: Option<usize>) {
 
 fn main() {
     let langid: LanguageIdentifier = "en".parse().expect("Failed to parse Language Identifier.");
-    let dtp = FsDataProvider::try_new("./tests/data/json_plurals_37")
+    let dtp = FsDataProvider::try_new("../../resources/testdata/data/json")
         .expect("Loading file from testdata directory");
 
     {