Merge pull request #18 from Berrysoft/citest

Add test in CI.
Berrysoft · Aug 23, 2022 · 4ebaaa0 · 4ebaaa0
2 parents ae2e075 + 9b99611
commit 4ebaaa0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,6 @@
 .PHONY: test clean update doc serve-book
 test: plugins
 	cd utils && $(MAKE) test
-	cd book && $(MAKE) test
 clean:
 	cd bins && $(MAKE) clean
 	cd utils && $(MAKE) clean

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -68,5 +68,8 @@ jobs:
   - pwsh: make plugins
     displayName: "Build plugins"
 
+  - pwsh: make test
+    displayName: "Test"
+
   - pwsh: make release-cross TARGET=$(target)
     displayName: "Build all"
diff --git a/book/Makefile b/book/Makefile
@@ -3,7 +3,5 @@ build:
 	mdbook build
 serve:
 	mdbook serve --open
-test:
-	mdbook test
 clean:
 	mdbook clean
diff --git a/utils/gal-locale/src/lib.rs b/utils/gal-locale/src/lib.rs
@@ -103,13 +103,25 @@ mod test {
 
     #[test]
     fn accept() {
-        let current = "zh-CN".parse::<Locale>().unwrap();
         let accepts = [
             "en".parse::<Locale>().unwrap(),
             "ja".parse().unwrap(),
             "zh-Hans".parse().unwrap(),
             "zh-Hant".parse().unwrap(),
         ];
-        assert_eq!(current.choose_from(accepts).unwrap().to_string(), "zh-Hans");
+        assert_eq!(
+            "zh_CN"
+                .parse::<Locale>()
+                .unwrap()
+                .choose_from(accepts.clone()),
+            Some("zh_Hans".parse::<Locale>().unwrap())
+        );
+        assert_eq!(
+            "zh_TW"
+                .parse::<Locale>()
+                .unwrap()
+                .choose_from(accepts.clone()),
+            Some("zh_Hant".parse::<Locale>().unwrap())
+        );
     }
 }