Support log in tests (FuelLabs#3483)

Closes FuelLabs#3363
taaraneh · Dec 1, 2022 · c506f1d · c506f1d
1 parent 7951992
commit c506f1d
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 3 deletions.
diff --git a/sway-core/src/language/ty/ast_node.rs b/sway-core/src/language/ty/ast_node.rs
@@ -6,6 +6,7 @@ use crate::{
     declaration_engine::{de_get_function, DeclMapping, ReplaceDecls},
     error::*,
     language::{parsed, ty::*},
+    transform::AttributeKind,
     type_system::*,
     types::DeterministicallyAborts,
 };
@@ -182,6 +183,32 @@ impl TyAstNode {
         }
     }
 
+    /// Check to see if this node is a function declaration of a function annotated as test.
+    pub(crate) fn is_test_function(&self) -> CompileResult<bool> {
+        let mut warnings = vec![];
+        let mut errors = vec![];
+        match &self {
+            TyAstNode {
+                span,
+                content: TyAstNodeContent::Declaration(TyDeclaration::FunctionDeclaration(decl_id)),
+                ..
+            } => {
+                let TyFunctionDeclaration { attributes, .. } = check!(
+                    CompileResult::from(de_get_function(decl_id.clone(), span)),
+                    return err(warnings, errors),
+                    warnings,
+                    errors
+                );
+                ok(
+                    attributes.contains_key(&AttributeKind::Test),
+                    warnings,
+                    errors,
+                )
+            }
+            _ => ok(false, warnings, errors),
+        }
+    }
+
     pub(crate) fn type_info(&self, type_engine: &TypeEngine) -> TypeInfo {
         // return statement should be ()
         match &self.content {

diff --git a/sway-core/src/language/ty/program.rs b/sway-core/src/language/ty/program.rs
@@ -253,7 +253,13 @@ impl TyProgram {
                         warnings,
                         errors
                     );
-                    if public {
+                    let is_test = check!(
+                        node.is_test_function(),
+                        return err(warnings, errors),
+                        warnings,
+                        errors
+                    );
+                    if public || is_test {
                         ret.append(&mut check!(
                             node.collect_types_metadata(ctx),
                             return err(warnings, errors),
@@ -273,7 +279,13 @@ impl TyProgram {
                         warnings,
                         errors
                     );
-                    if is_main {
+                    let is_test = check!(
+                        node.is_test_function(),
+                        return err(warnings, errors),
+                        warnings,
+                        errors
+                    );
+                    if is_main || is_test {
                         data.append(&mut check!(
                             node.collect_types_metadata(ctx),
                             return err(warnings, errors),
@@ -293,7 +305,13 @@ impl TyProgram {
                         warnings,
                         errors
                     );
-                    if is_main {
+                    let is_test = check!(
+                        node.is_test_function(),
+                        return err(warnings, errors),
+                        warnings,
+                        errors
+                    );
+                    if is_main || is_test {
                         data.append(&mut check!(
                             node.collect_types_metadata(ctx),
                             return err(warnings, errors),
@@ -306,6 +324,22 @@ impl TyProgram {
             }
             TyProgramKind::Contract { abi_entries, .. } => {
                 let mut data = vec![];
+                for node in self.root.all_nodes.iter() {
+                    let is_test = check!(
+                        node.is_test_function(),
+                        return err(warnings, errors),
+                        warnings,
+                        errors
+                    );
+                    if is_test {
+                        data.append(&mut check!(
+                            node.collect_types_metadata(ctx),
+                            return err(warnings, errors),
+                            warnings,
+                            errors
+                        ));
+                    }
+                }
                 for entry in abi_entries.iter() {
                     data.append(&mut check!(
                         TyAstNode::from(entry).collect_types_metadata(ctx),

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/contract_multi_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/contract_multi_test/src/main.sw
@@ -1,5 +1,7 @@
 contract;
 
+use std::logging::log;
+
 abi MyContract {
     fn test_function() -> bool;
 }
@@ -19,5 +21,6 @@ fn test_foo() {
 #[test]
 fn test_bar() {
     let meaning = 6 * 7;
+    log(meaning);
     assert(meaning == 42);
 }
diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/lib_multi_test/src/lib.sw b/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/lib_multi_test/src/lib.sw
@@ -1,6 +1,9 @@
 library lib_multi_test;
 
+use std::logging::log;
+
 fn pow2(x: u64) -> u64 {
+    log(x);
     x * x
 }
 
@@ -16,6 +19,7 @@ fn test_sub() {
 
 #[test]
 fn test_gt() {
+    log(100);
     assert(101 > 100);
 }
 

diff --git a/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/script_multi_test/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_pass/unit_tests/script_multi_test/src/main.sw
@@ -1,5 +1,7 @@
 script;
 
+use std::logging::log;
+
 fn main() {
     revert(0);
 }
@@ -11,5 +13,6 @@ fn test_foo() {
 
 #[test]
 fn test_bar() {
+    log("test");
     assert(4 / 2 == 2);
 }