CU-86drpncrq - Refactor assertCompilerLogs to handle path the same wa…

…y as assertCompile

boa3_test/tests/boatestcase.py

@@ -617,13 +617,13 @@ def assertCompile(self,
 
     def assertCompilerLogs(self,
                            expected_logged_exception,
-                           path
+                           *path: str
                            ) -> CompilerOutput | str:
+        py_abs_path = self.get_contract_path(*path)
+        output, error_msg = self._assert_compiler_logs_error(expected_logged_exception, py_abs_path)
 
-        output, error_msg = self._assert_compiler_logs_error(expected_logged_exception, path)
-        manifest = {}
         if not issubclass(expected_logged_exception, CompilerError):
-            return output, manifest
+            return self.compile_and_save(py_abs_path)
         else:
             # filter to get only the error message, without location information
             import re

boa3_test/tests/compiler_tests/test_any.py

@@ -34,8 +34,7 @@ def test_any_variable_assignments(self):
         self.assertEqual(expected_output, output)
 
     def test_variable_assignment_with_any(self):
-        path = self.get_contract_path('VariableAssignmentWithAny.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'VariableAssignmentWithAny.py')
 
     def test_any_list(self):
         ok = String('ok').to_bytes()
@@ -76,8 +75,7 @@ def test_any_tuple(self):
         self.assertEqual(expected_output, output)
 
     def test_any_operation(self):
-        path = self.get_contract_path('OperationWithAny.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'OperationWithAny.py')
 
     def test_function_any_param(self):
         ok = String('ok').to_bytes()
@@ -346,6 +344,5 @@ def test_sequence_of_int_sequence_fail(self):
             + Opcode.RET
         )
 
-        path = self.get_contract_path('SequenceOfAnyIntSequence.py')
-        output, _ = self.assertCompilerLogs(CompilerWarning.TypeCasting, path)
+        output, _ = self.assertCompilerLogs(CompilerWarning.TypeCasting, 'SequenceOfAnyIntSequence.py')
         self.assertEqual(expected_output, output)

boa3_test/tests/compiler_tests/test_arithmetic.py

@@ -318,12 +318,10 @@ async def test_concat_string_variables_and_constants(self):
     # region Division
 
     def test_division_operation(self):
-        path = self.get_contract_path('Division.py')
-        self.assertCompilerLogs(CompilerError.NotSupportedOperation, path)
+        self.assertCompilerLogs(CompilerError.NotSupportedOperation, 'Division.py')
 
     def test_division_augmented_assignment(self):
-        path = self.get_contract_path('DivisionAugmentedAssignment.py')
-        self.assertCompilerLogs(CompilerError.NotSupportedOperation, path)
+        self.assertCompilerLogs(CompilerError.NotSupportedOperation, 'DivisionAugmentedAssignment.py')
 
     async def test_division_builtin_type(self):
         await self.set_up_contract('DivisionBuiltinType.py')
@@ -404,12 +402,10 @@ async def test_list_addition(self):
     # region Mismatched
 
     def test_mismatched_type_binary_operation(self):
-        path = self.get_contract_path('MismatchedOperandBinary.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'MismatchedOperandBinary.py')
 
     def test_mismatched_type_unary_operation(self):
-        path = self.get_contract_path('MismatchedOperandUnary.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'MismatchedOperandUnary.py')
 
     # endregion
 

boa3_test/tests/compiler_tests/test_assert.py

@@ -123,16 +123,13 @@ async def test_assert_with_bytes_message_run(self):
         self.assertRegex(String(str(context.exception)).to_bytes(), assert_msg)
 
     def test_assert_with_int_message(self):
-        path = self.get_contract_path('AssertWithIntMessage.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'AssertWithIntMessage.py')
 
     def test_assert_with_bool_message(self):
-        path = self.get_contract_path('AssertWithBoolMessage.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'AssertWithBoolMessage.py')
 
     def test_assert_with_list_message(self):
-        path = self.get_contract_path('AssertWithListMessage.py')
-        self.assertCompilerLogs(CompilerError.MismatchedTypes, path)
+        self.assertCompilerLogs(CompilerError.MismatchedTypes, 'AssertWithListMessage.py')
 
     def test_assert_with_str_var_message_compile(self):
         assert_msg = String('a must be greater than zero').to_bytes()

boa3_test/tests/compiler_tests/test_boa_builtin_method.py

@@ -123,12 +123,10 @@ async def test_deploy_def(self):
         self.assertEqual(10, result)
 
     def test_deploy_def_incorrect_signature(self):
-        path = self.get_contract_path('DeployDefWrongSignature.py')
-        self.assertCompilerLogs(CompilerError.InternalIncorrectSignature, path)
+        self.assertCompilerLogs(CompilerError.InternalIncorrectSignature, 'DeployDefWrongSignature.py')
 
     def test_will_not_compile(self):
-        path = self.get_contract_path('WillNotCompile.py')
-        self.assertCompilerLogs(CompilerError.UnresolvedReference, path)
+        self.assertCompilerLogs(CompilerError.UnresolvedReference, 'WillNotCompile.py')
 
     # region math builtins