From 321b70b40b8a1db9747e697503fd5003a7166508 Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Sat, 16 Nov 2024 11:42:54 +0100
Subject: [PATCH 1/2] test: Add unit tests to artifacts.rs module

---
 crates/scarb-api/src/artifacts.rs             | 112 ++++++++++++++++++
 .../scarb-api/src/artifacts/representation.rs |   4 +-
 .../basic_package/tests/test_contract.cairo   |   0
 3 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 crates/scarb-api/tests/data/basic_package/tests/test_contract.cairo

diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 75632b56d2..9a50a03e4f 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -92,3 +92,115 @@ fn compile_artifact_at_path(path: &Utf8Path) -> Result<StarknetContractArtifacts
 
     Ok(StarknetContractArtifacts { sierra, casm })
 }
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use super::*;
+    use crate::ScarbCommand;
+    use camino::Utf8PathBuf;
+    use deserialized::{StarknetArtifacts, StarknetContract, StarknetContractArtifactPaths};
+
+    #[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]
+    fn test_load_contracts_artifacts() {
+        let temp = crate::tests::setup_package("basic_package");
+
+        ScarbCommand::new_with_stdio()
+            .current_dir(temp.path())
+            .arg("build")
+            .run()
+            .unwrap();
+
+        ScarbCommand::new_with_stdio()
+            .current_dir(temp.path())
+            .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.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_integrationtest.test.starknet_artifacts.json"),
+            )
+            .unwrap(),
+            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();
+
+        // Ensure no errors and non-empty result
+        assert!(result.is_ok());
+        let artifacts_map = result.unwrap();
+        assert!(!artifacts_map.is_empty());
+    }
+}
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 {
diff --git a/crates/scarb-api/tests/data/basic_package/tests/test_contract.cairo b/crates/scarb-api/tests/data/basic_package/tests/test_contract.cairo
new file mode 100644
index 0000000000..e69de29bb2

From 1561c2ccfc79924cb18eb76ea77ad9a639f9c8b2 Mon Sep 17 00:00:00 2001
From: Abeeujah <abeeujah@gmail.com>
Date: Thu, 21 Nov 2024 12:06:06 +0100
Subject: [PATCH 2/2] fix: Requested Changes

---
 crates/scarb-api/src/artifacts.rs | 32 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/crates/scarb-api/src/artifacts.rs b/crates/scarb-api/src/artifacts.rs
index 9a50a03e4f..e16a6d7178 100644
--- a/crates/scarb-api/src/artifacts.rs
+++ b/crates/scarb-api/src/artifacts.rs
@@ -95,8 +95,6 @@ fn compile_artifact_at_path(path: &Utf8Path) -> Result<StarknetContractArtifacts
 
 #[cfg(test)]
 mod tests {
-    use std::path::Path;
-
     use super::*;
     use crate::ScarbCommand;
     use camino::Utf8PathBuf;
@@ -155,18 +153,14 @@ mod tests {
     }
 
     #[test]
+    #[cfg_attr(not(feature = "scarb_2_8_3"), ignore)]
     fn test_load_contracts_artifacts() {
         let temp = crate::tests::setup_package("basic_package");
 
         ScarbCommand::new_with_stdio()
             .current_dir(temp.path())
             .arg("build")
-            .run()
-            .unwrap();
-
-        ScarbCommand::new_with_stdio()
-            .current_dir(temp.path())
-            .arg("test")
+            .arg("--test")
             .run()
             .unwrap();
 
@@ -175,22 +169,15 @@ mod tests {
 
         // Get the base artifact
         let base_file = Utf8PathBuf::from_path_buf(
-            base_artifacts_path.join("basic_package.starknet_artifacts.json"),
+            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_integrationtest.test.starknet_artifacts.json"),
-            )
-            .unwrap(),
-            Utf8PathBuf::from_path_buf(
-                base_artifacts_path.join("basic_package_unittest.test.starknet_artifacts.json"),
-            )
-            .unwrap(),
-        ];
+        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);
@@ -200,7 +187,12 @@ mod tests {
 
         // Ensure no errors and non-empty result
         assert!(result.is_ok());
+
+        // Assert the Contract Artifacts are loaded.
         let artifacts_map = result.unwrap();
+        println!("{:?}", artifacts_map);
         assert!(!artifacts_map.is_empty());
+        assert!(artifacts_map.contains_key("ERC20"));
+        assert!(artifacts_map.contains_key("HelloStarknet"));
     }
 }