add dove test call to test native functions to CI (#215)

* add move-stdlib submodule and run dove build/test directly

* correct test name

.github/workflows/ci.yaml

@@ -57,6 +57,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - name: Restore from cache and run vcpkg
         if: ${{ matrix.platform == 'win' }}
@@ -98,6 +100,24 @@ jobs:
           command: test
           args: --no-fail-fast --all --all-features
 
+      - name: dove build --path ./dove/resources/for_tests/move-stdlib
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: -- build --path ./dove/resources/for_tests/move-stdlib
+
+      - name: dove build --doc --path ./dove/resources/for_tests/move-stdlib
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: -- build --doc --path ./dove/resources/for_tests/move-stdlib
+
+      - name: dove test --path ./dove/resources/for_tests/move-stdlib
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          args: -- test --path ./dove/resources/for_tests/move-stdlib
+
   install:
     name: install (${{ matrix.name }})
     runs-on: ${{ matrix.os }}

.gitignore

@@ -13,4 +13,4 @@ test.sh
 # Direnv cache
 .direnv
 
-.idea
+.idea

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "dove/resources/for_tests/move-stdlib"]
+	path = dove/resources/for_tests/move-stdlib
+	url = https://github.com/pontem-network/move-stdlib.git

dove/resources/for_tests/.gitignore

@@ -0,0 +1,2 @@
+build
+move-stdlib/build

dove/resources/for_tests/Move.toml

@@ -6,6 +6,5 @@ version = "0.1.0"
 Std = "0x1"
 Demo = "0x2"
 
-[dependencies.MoveStdlib]
-git = "https://github.com/pontem-network/move-stdlib"
-rev = "v1.5.2"
+[dependencies]
+MoveStdlib = { local = "./move-stdlib" }

dove/resources/for_tests/scripts/multiple_scripts.move

@@ -1,11 +1,10 @@
 script {
-    fun script_1(a:bool){
+    fun script_1(a: bool) {
         assert!(a, 1);
-
     }
 }
 script {
-    fun script_2(a:u8, b:u8){
-        assert!(a==b,2);
+    fun script_2(a: u8, b: u8) {
+        assert!(a == b, 2);
     }
 }

dove/resources/for_tests/scripts/one_param.move

@@ -1,5 +1,5 @@
 script {
-    fun one_param(a:bool){
-        assert!(a,2);
+    fun one_param(a: bool) {
+        assert!(a, 2);
     }
-}
+}

dove/resources/for_tests/scripts/two_params.move

@@ -1,5 +1,5 @@
 script {
-    fun two_params(a:u8, b:u8){
-        assert!(a==b,2);
+    fun two_params(a: u8, b: u8) {
+        assert!(a == b, 2);
     }
 }

dove/resources/for_tests/scripts/with_type.move

@@ -1,5 +1,5 @@
 script {
-    fun with_type<T>(_a:u8){
+    fun with_type<T>(_a: u8) {
         assert!(true, 3);
     }
 }

dove/resources/for_tests/sources/demo1v.move

@@ -1,3 +1,3 @@
-module Demo::Demo1v{
-    fun run(){ }
-}
+module Demo::Demo1v {
+    fun run() {}
+}

dove/resources/for_tests/sources/demo2v.move

@@ -1,3 +1,3 @@
-module Demo::Demo2v{
-    fun run(){ }
-}
+module Demo::Demo2v {
+    fun run() {}
+}

dove/resources/for_tests/tests/test1.move

@@ -1,7 +1,7 @@
 #[test_only]
-module Demo::Test1{
+module Demo::Test1 {
     #[test]
-    fun success(){
-        assert!(true,1);
+    fun success() {
+        assert!(true, 1);
     }
-}
+}

dove/resources/for_tests/tests/test2.move

@@ -1,7 +1,7 @@
 #[test_only]
-module Demo::Test2{
+module Demo::Test2 {
     #[test]
-    fun success(){
-        assert!(true,2);
+    fun success() {
+        assert!(true, 2);
     }
-}
+}

dove/resources/for_tests/tests/test3.move

@@ -1,7 +1,7 @@
 #[test_only]
-module Demo::Test3{
+module Demo::Test3 {
     #[test]
-    fun error(){
-        assert!(false,3);
+    fun error() {
+        assert!(false, 3);
     }
-}
+}

dove/tests/helper.rs → dove/tests/helpers.rs

@@ -23,7 +23,7 @@ pub fn delete_project(project_path: &Path) -> Result<()> {
 }
 
 /// run bin dove
-pub fn execute_dove_at(args: &[&str], project_path: &Path) -> Result<String> {
+pub fn dove(args: &[&str], project_path: &Path) -> Result<String> {
     ensure!(
         project_path.exists(),
         "Project folder {:?} does not exist",
@@ -102,7 +102,7 @@ pub fn new_demo_project(project_name: &str) -> Result<PathBuf> {
 
 /// Build a project
 pub fn build(project_dir: &Path) -> Result<String> {
-    execute_dove_at(&["build"], project_dir)
+    dove(&["build"], project_dir)
 }
 
 fn copy_folder(from: &Path, to: &Path) -> Result<()> {

dove/tests/test_cmd_dove_call.rs

@@ -1,6 +1,6 @@
-mod helper;
+mod helpers;
 
-use helper::{new_demo_project, execute_dove_at, delete_project};
+use helpers::{new_demo_project, dove, delete_project};
 
 /// $ dove call 'main()'
 /// $ dove call 'one_param(true)'
@@ -11,12 +11,11 @@ fn test_cmd_dove_call() {
     let project_folder = new_demo_project(project_name).unwrap();
 
     for call in ["main()", "one_param(true)", "two_params(1,1)"] {
-        execute_dove_at(&["call", call], &project_folder).unwrap();
+        dove(&["call", call], &project_folder).unwrap();
     }
     delete_project(&project_folder).unwrap();
 }
 
-/// $ dove call 'main()'
 /// $ dove call 'one_param' -a true
 /// $ dove call 'two_params' --args 1 1
 #[test]
@@ -28,7 +27,7 @@ fn test_cmd_dove_call_with_params() {
         vec!["call", "one_param", "-a", "true"],
         vec!["call", "two_params", "--args", "1", "1"],
     ] {
-        execute_dove_at(&call, &project_folder).unwrap();
+        dove(&call, &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();
@@ -48,7 +47,7 @@ fn test_cmd_dove_call_with_type() {
         vec!["call", "with_type(1)", "-t", "u8"],
         vec!["call", "with_type", "-a", "1", "-t", "u8"],
     ] {
-        execute_dove_at(&call, &project_folder).unwrap();
+        dove(&call, &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();
@@ -65,7 +64,7 @@ fn test_cmd_dove_call_output() {
         ("main", vec!["call", "main()"]),
         ("tmpname", vec!["call", "main()", "-o", "tmpname"]),
     ] {
-        execute_dove_at(&args, &project_folder).unwrap();
+        dove(&args, &project_folder).unwrap();
         let tx_path = project_folder
             .join("build")
             .join("for_tests")

dove/tests/test_cmd_dove_clean.rs

@@ -1,6 +1,6 @@
-mod helper;
+mod helpers;
 
-use crate::helper::{new_demo_project, delete_project, build, execute_dove_at};
+use crate::helpers::{new_demo_project, delete_project, build, dove};
 
 /// $ dove clean
 #[test]
@@ -10,7 +10,7 @@ fn test_cmd_dove_clean() {
     build(&project_dir).unwrap();
 
     assert!(project_dir.join("build").exists());
-    execute_dove_at(&["clean"], &project_dir).unwrap();
+    dove(&["clean"], &project_dir).unwrap();
     assert!(!project_dir.join("build").exists());
 
     delete_project(&project_dir).unwrap();

dove/tests/test_cmd_dove_init.rs

@@ -1,7 +1,7 @@
-mod helper;
+mod helpers;
 
 use std::fs;
-use crate::helper::{execute_dove_at, delete_project, get_project_name_from_toml, new_demo_project};
+use crate::helpers::{dove, delete_project, get_project_name_from_toml, new_demo_project};
 
 /// Creating a project in an existing folder
 /// $ dove init NAME_PROJECT
@@ -13,7 +13,7 @@ fn test_cmd_dove_init() {
 
     fs::remove_file(project_path.join("Move.toml")).unwrap();
 
-    execute_dove_at(&["init", project_name], &project_path).unwrap();
+    dove(&["init", project_name], &project_path).unwrap();
 
     assert_eq!(
         get_project_name_from_toml(&project_path),

dove/tests/test_cmd_dove_run.rs

@@ -1,6 +1,6 @@
-mod helper;
+mod helpers;
 
-use helper::{new_demo_project, execute_dove_at, delete_project};
+use helpers::{new_demo_project, dove, delete_project};
 
 /// $ dove run 'main()'
 /// $ dove run 'one_param(true)'
@@ -11,14 +11,12 @@ fn test_cmd_dove_run_with_call() {
     let project_folder = new_demo_project(project_name).unwrap();
 
     for call in ["main()", "one_param(true)", "two_params(1,1)"] {
-        execute_dove_at(&["run", call], &project_folder).unwrap();
+        dove(&["run", call], &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();
 }
 
-/// $ dove run 'one_param' -a true
-/// $ dove run 'two_params' --args 1 1
 #[test]
 fn test_cmd_dove_run_with_params() {
     let project_name = "project_run_with_params";
@@ -28,7 +26,7 @@ fn test_cmd_dove_run_with_params() {
         vec!["run", "one_param", "-a", "true"],
         vec!["run", "two_params", "--args", "1", "1"],
     ] {
-        execute_dove_at(&call, &project_folder).unwrap();
+        dove(&call, &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();
@@ -48,7 +46,7 @@ fn test_cmd_dove_run_with_type() {
         vec!["run", "with_type(1)", "-t", "u8"],
         vec!["run", "with_type", "-a", "1", "-t", "u8"],
     ] {
-        execute_dove_at(&call, &project_folder).unwrap();
+        dove(&call, &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();
@@ -64,7 +62,7 @@ fn test_cmd_dove_run_multiple() {
     let project_folder = new_demo_project(project_name).unwrap();
 
     for call in ["script_1(true)", "script_2(1,1)"] {
-        execute_dove_at(&["run", call], &project_folder).unwrap();
+        dove(&["run", call], &project_folder).unwrap();
     }
 
     delete_project(&project_folder).unwrap();