Code coverage on models (#4)

* increase code coverage

* fix workflow missing fmt

Author: muhrifqii

.github/workflows/validation.yml

@@ -14,6 +14,8 @@ jobs:
       options: --security-opt seccomp=unconfined
     steps:
       - uses: actions/checkout@v4
+      - name: Setup tools
+        run: rustup component add rustfmt
       - name: Cargo check
         timeout-minutes: 2
         run: cargo check --locked

scraper/src/df/models.rs

@@ -51,7 +51,7 @@ impl Ord for DevilFruit {
 
 impl PartialOrd for DevilFruit {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.df_url.partial_cmp(&other.df_url)
+        Some(self.cmp(other))
     }
 }
 
@@ -86,3 +86,75 @@ impl UrlTyped for Character {
         format!("/wiki/Character:{}", self.id)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        df::{
+            models::DfTypeInfo,
+            types::{DfSubType, DfType},
+        },
+        types::UrlTyped,
+    };
+
+    use super::{Character, DevilFruit};
+
+    #[test]
+    fn df_has_valid_traits() {
+        let dftype = DfTypeInfo {
+            df_type: DfType::Logia,
+            cannon_count: 10,
+            non_cannon_count: 1,
+            description: "logia".to_string(),
+        };
+        assert_eq!(
+            format!("{}", dftype),
+            "(df_type: Logia, cannon: 10, non-cannon: 1, description: logia)"
+        );
+        let df1 = DevilFruit {
+            df_type: DfType::Zoan,
+            df_sub_type: Some(DfSubType::MythicalZoan),
+            name: "Nika".to_string(),
+            en_name: "Nika".to_string(),
+            description: "Used to Gomu".to_string(),
+            pic_url: "pic".to_string(),
+            df_url: "nika".to_string(),
+        };
+        let df2 = DevilFruit {
+            df_type: DfType::Zoan,
+            df_sub_type: Some(DfSubType::MythicalZoan),
+            name: "Zeus".to_string(),
+            en_name: "Zeus".to_string(),
+            description: "Greek".to_string(),
+            pic_url: "pic".to_string(),
+            df_url: "zeus".to_string(),
+        };
+        let df3 = DevilFruit {
+            df_type: DfType::Zoan,
+            df_sub_type: Some(DfSubType::MythicalZoan),
+            name: "Nika".to_string(),
+            en_name: "Nika".to_string(),
+            description: "Used to Gomu".to_string(),
+            pic_url: "pic".to_string(),
+            df_url: "nika".to_string(),
+        };
+        assert_ne!(df1, df2);
+        assert_eq!(df1, df3);
+        assert!(df1 < df2);
+        assert_eq!(
+            format!("{}", df1),
+            format!("(df_type: {}, df_sub_type: {:?}, name: {}, english name: {}, pic: {}, url: {}, description: {})",
+                df1.df_type, df1.df_sub_type, df1.name, df1.en_name, df1.pic_url, df1.df_url, df1.description
+            ));
+    }
+
+    #[test]
+    fn char_has_valid_traits() {
+        let character = Character {
+            id: "1234".to_string(),
+            name: "Foo".to_string(),
+            pic_url: "pic".to_string(),
+        };
+        assert_eq!(character.get_path(), "/wiki/Character:1234");
+    }
+}

scraper/src/df/types.rs

@@ -70,3 +70,33 @@ impl DfSubType {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::{df::types::DfSubType, types::UrlTyped};
+
+    use super::DfType;
+
+    #[test]
+    fn dftype_has_valid_impl() {
+        let dft = DfType::Zoan;
+        assert_eq!(dft.get_path(), "/wiki/Zoan");
+        assert_eq!(dft.id_for_fruit_list(), "#List_of_Zoan-Type_Fruits");
+        let dft = DfType::Logia;
+        assert_eq!(dft.get_path(), "/wiki/Logia");
+        assert_eq!(dft.id_for_fruit_list(), "#Logia-Types");
+        let dft = DfType::Paramecia;
+        assert_eq!(dft.get_path(), "/wiki/Paramecia");
+        assert_eq!(dft.id_for_fruit_list(), "#Paramecia-Type_Fruits");
+        let dft = DfType::Undetermined;
+        assert_eq!(dft.get_path(), "");
+        assert_eq!(dft.id_for_fruit_list(), "");
+
+        let dfsub = DfSubType::AncientZoan;
+        assert_eq!(dfsub.get_path(), "/wiki/Zoan");
+        assert_eq!(dfsub.id_for_fruit_list(), "#Ancient_Zoan");
+        let dfsub = DfSubType::MythicalZoan;
+        assert_eq!(dfsub.get_path(), "/wiki/Zoan");
+        assert_eq!(dfsub.id_for_fruit_list(), "#Mythical_Zoan");
+    }
+}

tarpaulin.toml

@@ -3,4 +3,4 @@ name = "complete code coverage"
 manifest-path = "./Cargo.toml"
 output-dir = "./coverage"
 out = ["Html", "Xml"]
-exclude-files = []
+exclude-files = ["scraper/src/main.rs"]