refactor: Introduce a parse_lib_provider mock usable throughout the…

… parser library tests (#145)
eclipse-che4z · Jul 13, 2021 · 547948e · 547948e
1 parent 656caf3
commit 547948e
Show file tree

Hide file tree

Showing 26 changed files with 511 additions and 1,258 deletions.
diff --git a/parser_library/test/CMakeLists.txt b/parser_library/test/CMakeLists.txt
@@ -15,7 +15,6 @@ add_executable(library_test)
 target_sources(library_test PRIVATE
 	aread_time_test.cpp
 	common_testing.h
-	copy_mock.h
 	diagnosable_ctx_test.cpp
 	diagnostics_check_test.cpp
 	gtest_stringers.h

diff --git a/parser_library/test/context/context_test.cpp b/parser_library/test/context/context_test.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "../copy_mock.h"
+#include "../common_testing.h"
 #include "analyzer.h"
 #include "context/hlasm_context.h"
 #include "context/variables/system_variable.h"
@@ -585,42 +585,16 @@ TEST(context_system_variables, SYSNEST_SYSMAC)
 
  M2
 )";
-    copy_mock mock;
-    analyzer a(input, analyzer_options { &mock });
+    analyzer a(input);
     a.analyze();
 
     a.collect_diags();
 
     EXPECT_EQ(a.diags().size(), (size_t)0);
 
-    EXPECT_EQ(a.hlasm_ctx()
-                  .get_var_sym(a.hlasm_ctx().ids().add("v1"))
-                  ->access_set_symbol_base()
-                  ->access_set_symbol<context::A_t>()
-                  ->get_value(),
-        2);
-    EXPECT_EQ(a.hlasm_ctx()
-                  .get_var_sym(a.hlasm_ctx().ids().add("v2"))
-                  ->access_set_symbol_base()
-                  ->access_set_symbol<context::C_t>()
-                  ->get_value(),
-        "OPEN CODE");
-    EXPECT_EQ(a.hlasm_ctx()
-                  .get_var_sym(a.hlasm_ctx().ids().add("v3"))
-                  ->access_set_symbol_base()
-                  ->access_set_symbol<context::C_t>()
-                  ->get_value(),
-        "M2");
-    EXPECT_EQ(a.hlasm_ctx()
-                  .get_var_sym(a.hlasm_ctx().ids().add("v4"))
-                  ->access_set_symbol_base()
-                  ->access_set_symbol<context::A_t>()
-                  ->get_value(),
-        1);
-    EXPECT_EQ(a.hlasm_ctx()
-                  .get_var_sym(a.hlasm_ctx().ids().add("v5"))
-                  ->access_set_symbol_base()
-                  ->access_set_symbol<context::C_t>()
-                  ->get_value(),
-        "M1");
+    EXPECT_EQ(get_var_value<context::A_t>(a.hlasm_ctx(), "v1"), 2);
+    EXPECT_EQ(get_var_value<context::C_t>(a.hlasm_ctx(), "v2"), "OPEN CODE");
+    EXPECT_EQ(get_var_value<context::C_t>(a.hlasm_ctx(), "v3"), "M2");
+    EXPECT_EQ(get_var_value<context::A_t>(a.hlasm_ctx(), "v4"), 1);
+    EXPECT_EQ(get_var_value<context::C_t>(a.hlasm_ctx(), "v5"), "M1");
 }