From 0fe2f96f83ae843c7d982892018c4188be9a9571 Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Mon, 20 Jan 2025 13:50:16 +0100
Subject: [PATCH 1/5] test: Add unit tests to artifacts.rs module

---
 .github/workflows/ci.yml                      |   2 +
 crates/scarb-api/src/artifacts.rs             | 121 +++++++++++++++++-
 .../scarb-api/src/artifacts/representation.rs |   4 +-
 3 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c644924a4..e630096397 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,6 +160,8 @@ jobs:
           cargo test --package forge --features scarb_2_8_3 e2e::features
       - run: |
           cargo test --package scarb-api --features scarb_2_8_3 get_starknet_artifacts_path
+      - run: |
+          cargo test --package scarb-api --features scarb_2_8_3 test_load_contracts_artifacts
 
   test-forge-runner:
     name: Test Forge Runner
diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 75632b56d2..66e2fb5c8a 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -34,7 +34,6 @@ impl StarknetArtifactsFiles {
         }
     }
 
-    // TODO(#2625) add unit tests
     pub(crate) fn load_contracts_artifacts(
         self,
     ) -> Result<HashMap<String, (StarknetContractArtifacts, Utf8PathBuf)>> {
@@ -61,7 +60,6 @@ impl StarknetArtifactsFiles {
     }
 }
 
-// TODO(#2625) add unit tests
 fn unique_artifacts(
     artifact_representations: Vec<StarknetArtifactsRepresentation>,
     current_artifacts: &HashMap<String, (StarknetContractArtifacts, Utf8PathBuf)>,
@@ -92,3 +90,122 @@ fn compile_artifact_at_path(path: &Utf8Path) -> Result<StarknetContractArtifacts
 
     Ok(StarknetContractArtifacts { sierra, casm })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::ScarbCommand;
+    use assert_fs::fixture::{FileWriteStr, PathChild};
+    use camino::Utf8PathBuf;
+    use deserialized::{StarknetArtifacts, StarknetContract, StarknetContractArtifactPaths};
+    use indoc::indoc;
+
+    #[test]
+    fn test_unique_artifacts() {
+        // Mock StarknetArtifactsRepresentation
+        let mock_base_artifacts = HashMap::from([(
+            "contract1".to_string(),
+            (
+                StarknetContractArtifacts {
+                    sierra: "sierra1".to_string(),
+                    casm: "casm1".to_string(),
+                },
+                Utf8PathBuf::from("path1"),
+            ),
+        )]);
+
+        let mock_representation_1 = StarknetArtifactsRepresentation {
+            base_path: Utf8PathBuf::from("mock/path1"),
+            artifacts: StarknetArtifacts {
+                version: 1,
+                contracts: vec![StarknetContract {
+                    id: "1".to_string(),
+                    package_name: "package1".to_string(),
+                    contract_name: "contract1".to_string(),
+                    artifacts: StarknetContractArtifactPaths {
+                        sierra: Utf8PathBuf::from("mock/path1/contract1.sierra"),
+                    },
+                }],
+            },
+        };
+
+        let mock_representation_2 = StarknetArtifactsRepresentation {
+            base_path: Utf8PathBuf::from("mock/path2"),
+            artifacts: StarknetArtifacts {
+                version: 1,
+                contracts: vec![StarknetContract {
+                    id: "2".to_string(),
+                    package_name: "package2".to_string(),
+                    contract_name: "contract2".to_string(),
+                    artifacts: StarknetContractArtifactPaths {
+                        sierra: Utf8PathBuf::from("mock/path2/contract2.sierra"),
+                    },
+                }],
+            },
+        };
+
+        let representations = vec![mock_representation_1, mock_representation_2];
+
+        let result = unique_artifacts(representations, &mock_base_artifacts);
+
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].0, "contract2");
+    }
+
+    #[test]
+    #[cfg_attr(not(feature = "scarb_2_8_3"), ignore)]
+    fn test_load_contracts_artifacts() {
+        let temp = crate::tests::setup_package("basic_package");
+        let tests_dir = temp.join("tests");
+        fs::create_dir(&tests_dir).unwrap();
+
+        temp.child(tests_dir.join("test.cairo"))
+            .write_str(indoc!(
+                r"
+                    #[test]
+                    fn mock_test() {
+                        assert!(true);
+                    }
+                "
+            ))
+            .unwrap();
+
+        ScarbCommand::new_with_stdio()
+            .current_dir(temp.path())
+            .arg("build")
+            .arg("--test")
+            .run()
+            .unwrap();
+
+        // Define path to the generated artifacts
+        let base_artifacts_path = temp.to_path_buf().join("target").join("dev");
+
+        // Get the base artifact
+        let base_file = Utf8PathBuf::from_path_buf(
+            base_artifacts_path.join("basic_package_integrationtest.test.starknet_artifacts.json"),
+        )
+        .unwrap();
+
+        // Load other artifact files and add them to the temporary directory
+        let other_files = vec![Utf8PathBuf::from_path_buf(
+            base_artifacts_path.join("basic_package_unittest.test.starknet_artifacts.json"),
+        )
+        .unwrap()];
+
+        // Create `StarknetArtifactsFiles`
+        let artifacts_files = StarknetArtifactsFiles::new(base_file, other_files);
+
+        // Load the contracts
+        let result = artifacts_files.load_contracts_artifacts();
+        println!("{result:?}");
+
+        // Ensure no errors and non-empty result
+        assert!(result.is_ok());
+
+        // Assert the Contract Artifacts are loaded.
+        let artifacts_map = result.unwrap();
+        assert!(!artifacts_map.is_empty());
+        assert!(artifacts_map.contains_key("ERC20"));
+        assert!(artifacts_map.contains_key("HelloStarknet"));
+    }
+}
diff --git a/crates/scarb-api/src/artifacts/representation.rs b/crates/scarb-api/src/artifacts/representation.rs
index 31d61c5e9b..85f9bb7878 100644
--- a/crates/scarb-api/src/artifacts/representation.rs
+++ b/crates/scarb-api/src/artifacts/representation.rs
@@ -3,8 +3,8 @@ use anyhow::anyhow;
 use camino::{Utf8Path, Utf8PathBuf};
 
 pub struct StarknetArtifactsRepresentation {
-    base_path: Utf8PathBuf,
-    artifacts: StarknetArtifacts,
+    pub(crate) base_path: Utf8PathBuf,
+    pub(crate) artifacts: StarknetArtifacts,
 }
 
 impl StarknetArtifactsRepresentation {

From 35870050bd56d82ba2f4f86f96e588a50abad0e5 Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Mon, 20 Jan 2025 15:28:08 +0100
Subject: [PATCH 2/5] requested changes cleanup

---
 crates/scarb-api/src/artifacts.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 66e2fb5c8a..6536051805 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -197,14 +197,12 @@ mod tests {
 
         // Load the contracts
         let result = artifacts_files.load_contracts_artifacts();
-        println!("{result:?}");
 
         // Ensure no errors and non-empty result
         assert!(result.is_ok());
 
         // Assert the Contract Artifacts are loaded.
         let artifacts_map = result.unwrap();
-        assert!(!artifacts_map.is_empty());
         assert!(artifacts_map.contains_key("ERC20"));
         assert!(artifacts_map.contains_key("HelloStarknet"));
     }

From cae0bbf288dcba40bd057866f26d54e1e7ce85fa Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Mon, 20 Jan 2025 13:50:16 +0100
Subject: [PATCH 3/5] test: Add unit tests to artifacts.rs module

---
 .github/workflows/ci.yml                      |   2 +
 crates/scarb-api/src/artifacts.rs             | 121 +++++++++++++++++-
 .../scarb-api/src/artifacts/representation.rs |   4 +-
 3 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c644924a4..e630096397 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,6 +160,8 @@ jobs:
           cargo test --package forge --features scarb_2_8_3 e2e::features
       - run: |
           cargo test --package scarb-api --features scarb_2_8_3 get_starknet_artifacts_path
+      - run: |
+          cargo test --package scarb-api --features scarb_2_8_3 test_load_contracts_artifacts
 
   test-forge-runner:
     name: Test Forge Runner
diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 75632b56d2..66e2fb5c8a 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -34,7 +34,6 @@ impl StarknetArtifactsFiles {
         }
     }
 
-    // TODO(#2625) add unit tests
     pub(crate) fn load_contracts_artifacts(
         self,
     ) -> Result<HashMap<String, (StarknetContractArtifacts, Utf8PathBuf)>> {
@@ -61,7 +60,6 @@ impl StarknetArtifactsFiles {
     }
 }
 
-// TODO(#2625) add unit tests
 fn unique_artifacts(
     artifact_representations: Vec<StarknetArtifactsRepresentation>,
     current_artifacts: &HashMap<String, (StarknetContractArtifacts, Utf8PathBuf)>,
@@ -92,3 +90,122 @@ fn compile_artifact_at_path(path: &Utf8Path) -> Result<StarknetContractArtifacts
 
     Ok(StarknetContractArtifacts { sierra, casm })
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::ScarbCommand;
+    use assert_fs::fixture::{FileWriteStr, PathChild};
+    use camino::Utf8PathBuf;
+    use deserialized::{StarknetArtifacts, StarknetContract, StarknetContractArtifactPaths};
+    use indoc::indoc;
+
+    #[test]
+    fn test_unique_artifacts() {
+        // Mock StarknetArtifactsRepresentation
+        let mock_base_artifacts = HashMap::from([(
+            "contract1".to_string(),
+            (
+                StarknetContractArtifacts {
+                    sierra: "sierra1".to_string(),
+                    casm: "casm1".to_string(),
+                },
+                Utf8PathBuf::from("path1"),
+            ),
+        )]);
+
+        let mock_representation_1 = StarknetArtifactsRepresentation {
+            base_path: Utf8PathBuf::from("mock/path1"),
+            artifacts: StarknetArtifacts {
+                version: 1,
+                contracts: vec![StarknetContract {
+                    id: "1".to_string(),
+                    package_name: "package1".to_string(),
+                    contract_name: "contract1".to_string(),
+                    artifacts: StarknetContractArtifactPaths {
+                        sierra: Utf8PathBuf::from("mock/path1/contract1.sierra"),
+                    },
+                }],
+            },
+        };
+
+        let mock_representation_2 = StarknetArtifactsRepresentation {
+            base_path: Utf8PathBuf::from("mock/path2"),
+            artifacts: StarknetArtifacts {
+                version: 1,
+                contracts: vec![StarknetContract {
+                    id: "2".to_string(),
+                    package_name: "package2".to_string(),
+                    contract_name: "contract2".to_string(),
+                    artifacts: StarknetContractArtifactPaths {
+                        sierra: Utf8PathBuf::from("mock/path2/contract2.sierra"),
+                    },
+                }],
+            },
+        };
+
+        let representations = vec![mock_representation_1, mock_representation_2];
+
+        let result = unique_artifacts(representations, &mock_base_artifacts);
+
+        assert_eq!(result.len(), 1);
+        assert_eq!(result[0].0, "contract2");
+    }
+
+    #[test]
+    #[cfg_attr(not(feature = "scarb_2_8_3"), ignore)]
+    fn test_load_contracts_artifacts() {
+        let temp = crate::tests::setup_package("basic_package");
+        let tests_dir = temp.join("tests");
+        fs::create_dir(&tests_dir).unwrap();
+
+        temp.child(tests_dir.join("test.cairo"))
+            .write_str(indoc!(
+                r"
+                    #[test]
+                    fn mock_test() {
+                        assert!(true);
+                    }
+                "
+            ))
+            .unwrap();
+
+        ScarbCommand::new_with_stdio()
+            .current_dir(temp.path())
+            .arg("build")
+            .arg("--test")
+            .run()
+            .unwrap();
+
+        // Define path to the generated artifacts
+        let base_artifacts_path = temp.to_path_buf().join("target").join("dev");
+
+        // Get the base artifact
+        let base_file = Utf8PathBuf::from_path_buf(
+            base_artifacts_path.join("basic_package_integrationtest.test.starknet_artifacts.json"),
+        )
+        .unwrap();
+
+        // Load other artifact files and add them to the temporary directory
+        let other_files = vec![Utf8PathBuf::from_path_buf(
+            base_artifacts_path.join("basic_package_unittest.test.starknet_artifacts.json"),
+        )
+        .unwrap()];
+
+        // Create `StarknetArtifactsFiles`
+        let artifacts_files = StarknetArtifactsFiles::new(base_file, other_files);
+
+        // Load the contracts
+        let result = artifacts_files.load_contracts_artifacts();
+        println!("{result:?}");
+
+        // Ensure no errors and non-empty result
+        assert!(result.is_ok());
+
+        // Assert the Contract Artifacts are loaded.
+        let artifacts_map = result.unwrap();
+        assert!(!artifacts_map.is_empty());
+        assert!(artifacts_map.contains_key("ERC20"));
+        assert!(artifacts_map.contains_key("HelloStarknet"));
+    }
+}
diff --git a/crates/scarb-api/src/artifacts/representation.rs b/crates/scarb-api/src/artifacts/representation.rs
index 31d61c5e9b..85f9bb7878 100644
--- a/crates/scarb-api/src/artifacts/representation.rs
+++ b/crates/scarb-api/src/artifacts/representation.rs
@@ -3,8 +3,8 @@ use anyhow::anyhow;
 use camino::{Utf8Path, Utf8PathBuf};
 
 pub struct StarknetArtifactsRepresentation {
-    base_path: Utf8PathBuf,
-    artifacts: StarknetArtifacts,
+    pub(crate) base_path: Utf8PathBuf,
+    pub(crate) artifacts: StarknetArtifacts,
 }
 
 impl StarknetArtifactsRepresentation {

From fcdcbe38549915e4ad36516d39b424e04b4f6dd6 Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Mon, 20 Jan 2025 15:28:08 +0100
Subject: [PATCH 4/5] requested changes cleanup

---
 crates/scarb-api/src/artifacts.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 66e2fb5c8a..6536051805 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -197,14 +197,12 @@ mod tests {
 
         // Load the contracts
         let result = artifacts_files.load_contracts_artifacts();
-        println!("{result:?}");
 
         // Ensure no errors and non-empty result
         assert!(result.is_ok());
 
         // Assert the Contract Artifacts are loaded.
         let artifacts_map = result.unwrap();
-        assert!(!artifacts_map.is_empty());
         assert!(artifacts_map.contains_key("ERC20"));
         assert!(artifacts_map.contains_key("HelloStarknet"));
     }

From affa83fc9000d9d84c870395f778d566d89e59ee Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Tue, 21 Jan 2025 15:18:06 +0100
Subject: [PATCH 5/5] load_contracts_artifacts test result unwrapped

---
 crates/scarb-api/src/artifacts.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 6536051805..8b3e2c74b7 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -196,14 +196,10 @@ mod tests {
         let artifacts_files = StarknetArtifactsFiles::new(base_file, other_files);
 
         // Load the contracts
-        let result = artifacts_files.load_contracts_artifacts();
-
-        // Ensure no errors and non-empty result
-        assert!(result.is_ok());
+        let result = artifacts_files.load_contracts_artifacts().unwrap();
 
         // Assert the Contract Artifacts are loaded.
-        let artifacts_map = result.unwrap();
-        assert!(artifacts_map.contains_key("ERC20"));
-        assert!(artifacts_map.contains_key("HelloStarknet"));
+        assert!(result.contains_key("ERC20"));
+        assert!(result.contains_key("HelloStarknet"));
     }
 }