Refactor execute tests

Author: maciektr

Cargo.lock

@@ -25,18 +25,19 @@ console.workspace = true
 create-output-dir = { path = "../../utils/create-output-dir" }
 indoc.workspace = true
 mimalloc = { workspace = true, features = ["secure"] }
+num-bigint = { version = "0.4", features = ["serde"] }
 predicates.workspace = true
 scarb-extensions-cli = { path = "../../utils/scarb-extensions-cli", default-features = false, features = ["execute"] }
+scarb-fs-utils = { path = "../../utils/scarb-fs-utils" }
 scarb-metadata = { path = "../../scarb-metadata" }
 scarb-oracle-hint-service = { path = "../../utils/scarb-oracle-hint-service" }
 scarb-ui = { path = "../../utils/scarb-ui" }
 serde.workspace = true
 serde_json.workspace = true
 stwo-cairo-adapter.workspace = true
+test-case.workspace = true
 thousands.workspace = true
 tracing-subscriber.workspace = true
-num-bigint = { version = "0.4", features = ["serde"] }
-scarb-fs-utils = { path = "../../utils/scarb-fs-utils" }
 
 [dev-dependencies]
 assert_fs.workspace = true

extensions/scarb-execute/Cargo.toml

@@ -1,51 +1,19 @@
 use assert_fs::TempDir;
 use assert_fs::fixture::{FileWriteStr, PathChild};
-use indoc::indoc;
+use indoc::{formatdoc, indoc};
 use scarb_test_support::command::Scarb;
 use scarb_test_support::project_builder::ProjectBuilder;
-
-#[test]
-fn standalone_can_take_big_number_as_arg() {
-    let t = TempDir::new().unwrap();
-
-    ProjectBuilder::start()
-        .name("hello")
-        .version("0.1.0")
-        .manifest_extra(indoc! {r#"
-            [executable]
-            
-            [cairo]
-            enable-gas = false
-        "#})
-        .dep_cairo_execute()
-        .lib_cairo(indoc! {r#"
-        #[executable]
-        fn main(a: felt252, b: felt252) -> felt252 {
-            b
-        }
-        "#})
-        .build(&t);
-
-    Scarb::quick_command()
-        .arg("execute")
-        .arg("--print-program-output")
-        .arg("--arguments")
-        .arg(r#"1,1129815197211541481934112806673325772687763881719835256646064516195041515616"#)
-        .current_dir(&t)
-        .assert()
-        .success()
-        .stdout_eq(indoc! {r#"
-            [..]Compiling hello v0.1.0 ([..]/Scarb.toml)
-            [..]Finished `dev` profile target(s) in [..]
-            [..]Executing hello
-            Program output:
-            1129815197211541481934112806673325772687763881719835256646064516195041515616
-            Saving output to: target/execute/hello/execution1
-        "#});
-}
-
-#[test]
-fn standalone_can_read_arguments_from_file() {
+use test_case::test_case;
+
+#[test_case(
+    "standalone",
+    "1129815197211541481934112806673325772687763881719835256646064516195041515616"
+)]
+#[test_case(
+    "bootloader",
+    "1\n3\n-1272769738511508193392446484420387256363817420616635924344207712676117344847\n1129815197211541481934112806673325772687763881719835256646064516195041515616"
+)]
+fn can_take_big_number_as_arg(target: &str, output: &str) {
     let t = TempDir::new().unwrap();
 
     ProjectBuilder::start()
@@ -66,73 +34,34 @@ fn standalone_can_read_arguments_from_file() {
         "#})
         .build(&t);
 
-    t.child("args.txt")
-        .write_str(r#"["0x1","0x27F73E6C94FA8249EC9F2F4EEC607ACC97FA632C9E8FB6C49437E62390D9860"]"#)
-        .unwrap();
-
-    Scarb::quick_command()
-        .arg("execute")
-        .arg("--print-program-output")
-        .args(["--arguments-file", "args.txt"])
-        .current_dir(&t)
-        .assert()
-        .success()
-        .stdout_eq(indoc! {r#"
-            [..]Compiling hello v0.1.0 ([..]/Scarb.toml)
-            [..]Finished `dev` profile target(s) in [..]
-            [..]Executing hello
-            Program output:
-            1129815197211541481934112806673325772687763881719835256646064516195041515616
-            Saving output to: target/execute/hello/execution1
-        "#});
-}
-
-#[test]
-fn bootloader_can_take_big_number_as_arg() {
-    let t = TempDir::new().unwrap();
-
-    ProjectBuilder::start()
-        .name("hello")
-        .version("0.1.0")
-        .manifest_extra(indoc! {r#"
-            [executable]
-
-            [cairo]
-            enable-gas = false
-        "#})
-        .dep_cairo_execute()
-        .lib_cairo(indoc! {r#"
-        #[executable]
-        fn main(a: felt252, b: felt252) -> felt252 {
-            b
-        }
-        "#})
-        .build(&t);
-
     Scarb::quick_command()
         .arg("execute")
         .arg("--print-program-output")
-        .arg("--target=bootloader")
+        .arg(format!("--target={target}"))
         .arg("--arguments")
         .arg(r#"1,1129815197211541481934112806673325772687763881719835256646064516195041515616"#)
         .current_dir(&t)
         .assert()
         .success()
-        .stdout_eq(indoc! {r#"
+        .stdout_eq(formatdoc! {r#"
             [..]Compiling hello v0.1.0 ([..]/Scarb.toml)
             [..]Finished `dev` profile target(s) in [..]
             [..]Executing hello
             Program output:
-            1
-            3
-            -1272769738511508193392446484420387256363817420616635924344207712676117344847
-            1129815197211541481934112806673325772687763881719835256646064516195041515616
+            {output}
             Saving output to: target/execute/hello/execution1
         "#});
 }
 
-#[test]
-fn bootloader_can_read_arguments_from_file() {
+#[test_case(
+    "standalone",
+    "1129815197211541481934112806673325772687763881719835256646064516195041515616"
+)]
+#[test_case(
+    "bootloader",
+    "1\n3\n-1272769738511508193392446484420387256363817420616635924344207712676117344847\n1129815197211541481934112806673325772687763881719835256646064516195041515616"
+)]
+fn can_read_arguments_from_file(target: &str, output: &str) {
     let t = TempDir::new().unwrap();
 
     ProjectBuilder::start()
@@ -159,21 +88,18 @@ fn bootloader_can_read_arguments_from_file() {
 
     Scarb::quick_command()
         .arg("execute")
-        .arg("--target=bootloader")
         .arg("--print-program-output")
+        .arg(format!("--target={target}"))
         .args(["--arguments-file", "args.txt"])
         .current_dir(&t)
         .assert()
         .success()
-        .stdout_eq(indoc! {r#"
+        .stdout_eq(formatdoc! {r#"
             [..]Compiling hello v0.1.0 ([..]/Scarb.toml)
             [..]Finished `dev` profile target(s) in [..]
             [..]Executing hello
             Program output:
-            1
-            3
-            -1272769738511508193392446484420387256363817420616635924344207712676117344847
-            1129815197211541481934112806673325772687763881719835256646064516195041515616
+            {output}
             Saving output to: target/execute/hello/execution1
         "#});
 }