diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6ecbe9a..1a781db 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,3 +1,6 @@ INCLUDE_DIRECTORIES(${gtest_INCLUDE_DIRS}) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(active_tests) \ No newline at end of file + +IF (ENABLE_ACTIVE_TESTS) + ADD_SUBDIRECTORY(active_tests) +ENDIF() \ No newline at end of file diff --git a/tests/active_tests/include/active_test.h b/tests/active_tests/include/active_test.h index f1d2e37..b5753fe 100644 --- a/tests/active_tests/include/active_test.h +++ b/tests/active_tests/include/active_test.h @@ -43,7 +43,9 @@ class PDU; class TestFailed : public std::runtime_error { public: - using std::runtime_error::runtime_error; + TestFailed(const std::string& message) : std::runtime_error(message) { + + } }; class ActiveTest { diff --git a/tests/active_tests/include/ipv4_tests.h b/tests/active_tests/include/ipv4_tests.h index 78c2362..bc0029d 100644 --- a/tests/active_tests/include/ipv4_tests.h +++ b/tests/active_tests/include/ipv4_tests.h @@ -36,7 +36,8 @@ class IPv4SourceAddressTest : public ActiveTest { public: - using ActiveTest::ActiveTest; + IPv4SourceAddressTest(const PacketSenderPtr& packet_sender, + const ConfigurationPtr& configuration); std::string name() const; private: @@ -47,7 +48,8 @@ private: class IPv4FragmentationTest : public ActiveTest { public: - using ActiveTest::ActiveTest; + IPv4FragmentationTest(const PacketSenderPtr& packet_sender, + const ConfigurationPtr& configuration); std::string name() const; private: diff --git a/tests/active_tests/src/CMakeLists.txt b/tests/active_tests/src/CMakeLists.txt index 23f235b..a8e2044 100644 --- a/tests/active_tests/src/CMakeLists.txt +++ b/tests/active_tests/src/CMakeLists.txt @@ -1,6 +1,8 @@ FILE(GLOB SOURCES "*.cpp") INCLUDE_DIRECTORIES( + ${PROJECT_SOURCE_DIR}/include/ + ${PCAP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include ) @@ -14,4 +16,4 @@ LINK_LIBRARIES( ${PCAP_LIBRARY} ) -ADD_EXECUTABLE(active_tester EXCLUDE_FROM_ALL ${SOURCES}) \ No newline at end of file +ADD_EXECUTABLE(active_tester EXCLUDE_FROM_ALL ${SOURCES}) diff --git a/tests/active_tests/src/ipv4_tests.cpp b/tests/active_tests/src/ipv4_tests.cpp index 3cf6514..c8a21ff 100644 --- a/tests/active_tests/src/ipv4_tests.cpp +++ b/tests/active_tests/src/ipv4_tests.cpp @@ -48,6 +48,12 @@ using Tins::NetworkInterface; // Source address test +IPv4SourceAddressTest::IPv4SourceAddressTest(const PacketSenderPtr& packet_sender, + const ConfigurationPtr& configuration) +: ActiveTest(packet_sender, configuration) { + +} + string IPv4SourceAddressTest::name() const { return "ipv4_source_address"; } @@ -81,6 +87,12 @@ bool IPv4SourceAddressTest::test_matches_packet(const PDU& pdu) const { // Fragmentation test +IPv4FragmentationTest::IPv4FragmentationTest(const PacketSenderPtr& packet_sender, + const ConfigurationPtr& configuration) +: ActiveTest(packet_sender, configuration) { + +} + string IPv4FragmentationTest::name() const { return "ipv4_fragmentation"; }