From 06edeb9b2bfbc3e07b4a7f6f05aa6530336f0998 Mon Sep 17 00:00:00 2001 From: Vivek Reddy Karri Date: Tue, 2 Aug 2022 08:10:29 +0000 Subject: [PATCH] Refactored mock_tests/ folder Signed-off-by: Vivek Reddy Karri --- tests/mock_tests/Makefile.am | 76 +++++++++---------- .../{ => common}/fake_response_publisher.cpp | 0 .../{ => common}/mock_consumerstatetable.cpp | 0 .../{ => common}/mock_dbconnector.cpp | 0 .../mock_tests/{ => common}/mock_hiredis.cpp | 0 .../{ => common}/mock_orchagent_main.cpp | 0 .../{ => common}/mock_redisreply.cpp | 0 tests/mock_tests/{ => common}/mock_table.cpp | 0 .../mock_tests/{ => common}/ut_saihelper.cpp | 0 .../fdborch/flush_syncd_notif_ut.cpp | 6 +- tests/mock_tests/{ => includes}/check.h | 0 .../{ => includes}/mock_orchagent_main.h | 0 tests/mock_tests/{ => includes}/mock_table.h | 0 tests/mock_tests/{ => includes}/portal.h | 0 tests/mock_tests/{ => includes}/saispy.h | 0 tests/mock_tests/{ => includes}/ut_helper.h | 0 .../intfmgrd/add_ipv6_prefix_ut.cpp | 2 +- tests/mock_tests/mock_shell_command.cpp | 15 ---- tests/mock_tests/portsyncd/portsyncd_ut.cpp | 2 +- 19 files changed, 40 insertions(+), 61 deletions(-) rename tests/mock_tests/{ => common}/fake_response_publisher.cpp (100%) rename tests/mock_tests/{ => common}/mock_consumerstatetable.cpp (100%) rename tests/mock_tests/{ => common}/mock_dbconnector.cpp (100%) rename tests/mock_tests/{ => common}/mock_hiredis.cpp (100%) rename tests/mock_tests/{ => common}/mock_orchagent_main.cpp (100%) rename tests/mock_tests/{ => common}/mock_redisreply.cpp (100%) rename tests/mock_tests/{ => common}/mock_table.cpp (100%) rename tests/mock_tests/{ => common}/ut_saihelper.cpp (100%) rename tests/mock_tests/{ => includes}/check.h (100%) rename tests/mock_tests/{ => includes}/mock_orchagent_main.h (100%) rename tests/mock_tests/{ => includes}/mock_table.h (100%) rename tests/mock_tests/{ => includes}/portal.h (100%) rename tests/mock_tests/{ => includes}/saispy.h (100%) rename tests/mock_tests/{ => includes}/ut_helper.h (100%) delete mode 100644 tests/mock_tests/mock_shell_command.cpp diff --git a/tests/mock_tests/Makefile.am b/tests/mock_tests/Makefile.am index bc13e2f3ad..7521bedb7b 100644 --- a/tests/mock_tests/Makefile.am +++ b/tests/mock_tests/Makefile.am @@ -9,6 +9,7 @@ TESTS = tests tests_intfmgrd tests_portsyncd noinst_PROGRAMS = tests tests_intfmgrd tests_portsyncd LDADD_SAI = -lsaimeta -lsaimetadata -lsaivs -lsairedis +LDADD_COMMON = -lnl-genl-3 -lhiredis -lswsscommon -lgtest -lgtest_main -lzmq -lnl-3 -lnl-route-3 -lpthread if DEBUG DBGFLAGS = -ggdb -DDEBUG @@ -19,9 +20,21 @@ endif CFLAGS_GTEST = LDADD_GTEST = -L/usr/src/gtest +mock_swsscommon_SOURCES = common/mock_shell_command.cpp \ + common/mock_redisreply.cpp \ + common/mock_dbconnector.cpp \ + common/mock_hiredis.cpp \ + common/mock_table.cpp \ + common/mock_consumerstatetable.cpp + +mock_swss_SOURCES = common/mock_orchagent_main.cpp \ + common/fake_response_publisher.cpp + +mock_sai_SOURCES = common/ut_saihelper.cpp + ## Orchagent Unit Tests -tests_INCLUDES = -I $(FLEX_CTR_DIR) -I $(DEBUG_CTR_DIR) -I $(top_srcdir)/lib -I$(top_srcdir)/cfgmgr -I$(top_srcdir)/orchagent +tests_INCLUDES = -I $(FLEX_CTR_DIR) -I $(DEBUG_CTR_DIR) -I $(top_srcdir)/lib -I$(top_srcdir)/cfgmgr -I$(top_srcdir)/orchagent -Iincludes tests_SOURCES = aclorch_ut.cpp \ portsorch_ut.cpp \ @@ -34,18 +47,12 @@ tests_SOURCES = aclorch_ut.cpp \ saispy_ut.cpp \ consumer_ut.cpp \ sfloworh_ut.cpp \ - ut_saihelper.cpp \ - mock_orchagent_main.cpp \ - mock_dbconnector.cpp \ - mock_consumerstatetable.cpp \ - common/mock_shell_command.cpp \ - mock_table.cpp \ - mock_hiredis.cpp \ - mock_redisreply.cpp \ bulker_ut.cpp \ portmgr_ut.cpp \ - fake_response_publisher.cpp \ swssnet_ut.cpp \ + $(mock_swsscommon_SOURCES) \ + $(mock_sai_SOURCES) \ + $(mock_swss_SOURCES) \ flowcounterrouteorch_ut.cpp \ $(top_srcdir)/lib/gearboxutils.cpp \ $(top_srcdir)/lib/subintf.cpp \ @@ -122,44 +129,31 @@ tests_SOURCES += $(P4_ORCH_DIR)/p4orch.cpp \ tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) $(tests_INCLUDES) -tests_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis -lpthread \ - -lswsscommon -lswsscommon -lgtest -lgtest_main -lzmq -lnl-3 -lnl-route-3 +tests_LDADD = $(LDADD_GTEST) $(LDADD_SAI) $(LDADD_COMMON) + +## intfmgrd unit tests + +tests_intfmgrd_SOURCES = intfmgrd/add_ipv6_prefix_ut.cpp \ + $(top_srcdir)/cfgmgr/intfmgr.cpp \ + $(top_srcdir)/lib/subintf.cpp \ + $(top_srcdir)/orchagent/orch.cpp \ + $(top_srcdir)/orchagent/request_parser.cpp \ + $(mock_swsscommon_SOURCES) \ + $(mock_swss_SOURCES) + +tests_intfmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) +tests_intfmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) $(tests_INCLUDES) +tests_intfmgrd_LDADD = $(LDADD_GTEST) $(LDADD_SAI) $(LDADD_COMMON) ## portsyncd unit tests tests_portsyncd_SOURCES = portsyncd/portsyncd_ut.cpp \ $(top_srcdir)/portsyncd/linksync.cpp \ $(top_srcdir)/portsyncd/portsyncd_helper.cpp \ - mock_dbconnector.cpp \ - common/mock_shell_command.cpp \ - mock_table.cpp \ - mock_hiredis.cpp \ - mock_redisreply.cpp + $(mock_swsscommon_SOURCES) -tests_portsyncd_INCLUDES = -I $(top_srcdir)/portsyncd -I $(top_srcdir)/cfgmgr +tests_portsyncd_INCLUDES = -I $(top_srcdir)/lib -I$(top_srcdir)/portsyncd -I$(top_srcdir)/cfgmgr -Iincludes tests_portsyncd_CXXFLAGS = -Wl,-wrap,if_nameindex -Wl,-wrap,if_freenameindex tests_portsyncd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) tests_portsyncd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(tests_portsyncd_INCLUDES) -tests_portsyncd_LDADD = $(LDADD_GTEST) -lnl-genl-3 -lhiredis -lhiredis \ - -lswsscommon -lswsscommon -lgtest -lgtest_main -lnl-3 -lnl-route-3 -lpthread - -## intfmgrd unit tests - -tests_intfmgrd_SOURCES = intfmgrd/add_ipv6_prefix_ut.cpp \ - $(top_srcdir)/cfgmgr/intfmgr.cpp \ - $(top_srcdir)/lib/subintf.cpp \ - $(top_srcdir)/orchagent/orch.cpp \ - $(top_srcdir)/orchagent/request_parser.cpp \ - mock_orchagent_main.cpp \ - mock_dbconnector.cpp \ - mock_table.cpp \ - mock_hiredis.cpp \ - fake_response_publisher.cpp \ - mock_redisreply.cpp \ - common/mock_shell_command.cpp - -tests_intfmgrd_INCLUDES = $(tests_INCLUDES) -I$(top_srcdir)/cfgmgr -I$(top_srcdir)/lib -tests_intfmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -tests_intfmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) $(tests_intfmgrd_INCLUDES) -tests_intfmgrd_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis \ - -lswsscommon -lswsscommon -lgtest -lgtest_main -lzmq -lnl-3 -lnl-route-3 -lpthread +tests_portsyncd_LDADD = $(LDADD_GTEST) $(LDADD_COMMON) diff --git a/tests/mock_tests/fake_response_publisher.cpp b/tests/mock_tests/common/fake_response_publisher.cpp similarity index 100% rename from tests/mock_tests/fake_response_publisher.cpp rename to tests/mock_tests/common/fake_response_publisher.cpp diff --git a/tests/mock_tests/mock_consumerstatetable.cpp b/tests/mock_tests/common/mock_consumerstatetable.cpp similarity index 100% rename from tests/mock_tests/mock_consumerstatetable.cpp rename to tests/mock_tests/common/mock_consumerstatetable.cpp diff --git a/tests/mock_tests/mock_dbconnector.cpp b/tests/mock_tests/common/mock_dbconnector.cpp similarity index 100% rename from tests/mock_tests/mock_dbconnector.cpp rename to tests/mock_tests/common/mock_dbconnector.cpp diff --git a/tests/mock_tests/mock_hiredis.cpp b/tests/mock_tests/common/mock_hiredis.cpp similarity index 100% rename from tests/mock_tests/mock_hiredis.cpp rename to tests/mock_tests/common/mock_hiredis.cpp diff --git a/tests/mock_tests/mock_orchagent_main.cpp b/tests/mock_tests/common/mock_orchagent_main.cpp similarity index 100% rename from tests/mock_tests/mock_orchagent_main.cpp rename to tests/mock_tests/common/mock_orchagent_main.cpp diff --git a/tests/mock_tests/mock_redisreply.cpp b/tests/mock_tests/common/mock_redisreply.cpp similarity index 100% rename from tests/mock_tests/mock_redisreply.cpp rename to tests/mock_tests/common/mock_redisreply.cpp diff --git a/tests/mock_tests/mock_table.cpp b/tests/mock_tests/common/mock_table.cpp similarity index 100% rename from tests/mock_tests/mock_table.cpp rename to tests/mock_tests/common/mock_table.cpp diff --git a/tests/mock_tests/ut_saihelper.cpp b/tests/mock_tests/common/ut_saihelper.cpp similarity index 100% rename from tests/mock_tests/ut_saihelper.cpp rename to tests/mock_tests/common/ut_saihelper.cpp diff --git a/tests/mock_tests/fdborch/flush_syncd_notif_ut.cpp b/tests/mock_tests/fdborch/flush_syncd_notif_ut.cpp index 7bf22373c1..ccdb832d5e 100644 --- a/tests/mock_tests/fdborch/flush_syncd_notif_ut.cpp +++ b/tests/mock_tests/fdborch/flush_syncd_notif_ut.cpp @@ -1,6 +1,6 @@ -#include "../ut_helper.h" -#include "../mock_orchagent_main.h" -#include "../mock_table.h" +#include "ut_helper.h" +#include "mock_orchagent_main.h" +#include "mock_table.h" #include "port.h" #define private public // Need to modify internal cache #include "portsorch.h" diff --git a/tests/mock_tests/check.h b/tests/mock_tests/includes/check.h similarity index 100% rename from tests/mock_tests/check.h rename to tests/mock_tests/includes/check.h diff --git a/tests/mock_tests/mock_orchagent_main.h b/tests/mock_tests/includes/mock_orchagent_main.h similarity index 100% rename from tests/mock_tests/mock_orchagent_main.h rename to tests/mock_tests/includes/mock_orchagent_main.h diff --git a/tests/mock_tests/mock_table.h b/tests/mock_tests/includes/mock_table.h similarity index 100% rename from tests/mock_tests/mock_table.h rename to tests/mock_tests/includes/mock_table.h diff --git a/tests/mock_tests/portal.h b/tests/mock_tests/includes/portal.h similarity index 100% rename from tests/mock_tests/portal.h rename to tests/mock_tests/includes/portal.h diff --git a/tests/mock_tests/saispy.h b/tests/mock_tests/includes/saispy.h similarity index 100% rename from tests/mock_tests/saispy.h rename to tests/mock_tests/includes/saispy.h diff --git a/tests/mock_tests/ut_helper.h b/tests/mock_tests/includes/ut_helper.h similarity index 100% rename from tests/mock_tests/ut_helper.h rename to tests/mock_tests/includes/ut_helper.h diff --git a/tests/mock_tests/intfmgrd/add_ipv6_prefix_ut.cpp b/tests/mock_tests/intfmgrd/add_ipv6_prefix_ut.cpp index 2ed1a1b6af..83b68800e8 100644 --- a/tests/mock_tests/intfmgrd/add_ipv6_prefix_ut.cpp +++ b/tests/mock_tests/intfmgrd/add_ipv6_prefix_ut.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "../mock_table.h" +#include "mock_table.h" #include "warm_restart.h" #define private public #include "intfmgr.h" diff --git a/tests/mock_tests/mock_shell_command.cpp b/tests/mock_tests/mock_shell_command.cpp deleted file mode 100644 index f3ccfbfe5e..0000000000 --- a/tests/mock_tests/mock_shell_command.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include - -int mockCmdReturn = 0; -std::string mockCmdStdcout = ""; -std::vector mockCallArgs; - -namespace swss { - int exec(const std::string &cmd, std::string &stdout) - { - mockCallArgs.push_back(cmd); - stdout = mockCmdStdcout; - return mockCmdReturn; - } -} diff --git a/tests/mock_tests/portsyncd/portsyncd_ut.cpp b/tests/mock_tests/portsyncd/portsyncd_ut.cpp index 46726c10d2..aeb1915ec1 100644 --- a/tests/mock_tests/portsyncd/portsyncd_ut.cpp +++ b/tests/mock_tests/portsyncd/portsyncd_ut.cpp @@ -1,7 +1,7 @@ #include "gtest/gtest.h" #include #include -#include "../mock_table.h" +#include "mock_table.h" #define private public #include "linksync.h" #undef private