Revert "Test: updating test cases to use the ping protocol fallback feature."

This reverts commit 8e693035e02c8f6cb780cf594e41862fcd71ce2b.

diff --git a/test/test_configurationcommandline.cpp b/test/test_configurationcommandline.cpp
index 4190c02..9400c9c 100644 (file)
--- a/test/test_configurationcommandline.cpp
+++ b/test/test_configurationcommandline.cpp
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE( normal_options )
         "--host.name=www.kernel.org",
         "--host.port=80",
         "--host.interval=1000",
-        "--host.ping-protocol=ICMP,584,ICMPv6",
+        "--host.ping-protocol=ICMP,ICMPv6",
     };
     boost::program_options::variables_map vm;
     Configuration config;
@@ -99,7 +99,6 @@ BOOST_AUTO_TEST_CASE( normal_options )
     BOOST_CHECK_EQUAL( host3->get_interval_in_sec(), 1000 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().size(), 2 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().front(), PingProtocol_ICMP );
-    BOOST_CHECK_EQUAL( host3->get_ping_protocol_fallback_count(), 584 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().back(), PingProtocol_ICMPv6 );
 }
 

diff --git a/test/test_configurationfile.cpp b/test/test_configurationfile.cpp
index c0975d3..f4f249c 100644 (file)
--- a/test/test_configurationfile.cpp
+++ b/test/test_configurationfile.cpp
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE( normal_options )
     file << "name=www.kernel.org\n";
     file << "port=80\n";
     file << "interval=1000\n";
-    file << "ping-protocol=TCP,275,TCP_IPv6\n";
+    file << "ping-protocol=TCP,TCP_IPv6\n";
     file.close();
 
     ConfigurationFile configuration_file( file_name );
@@ -103,7 +103,6 @@ BOOST_AUTO_TEST_CASE( normal_options )
     BOOST_CHECK_EQUAL( host3->get_interval_in_sec(), 1000 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().size(), 2 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().front(), PingProtocol_TCP );
-    BOOST_CHECK_EQUAL( host3->get_ping_protocol_fallback_count(), 275 );
     BOOST_CHECK_EQUAL( host3->get_ping_protocol_list().back(), PingProtocol_TCP_IPv6 );
 }
 

diff --git a/test/test_configurationoptions.cpp b/test/test_configurationoptions.cpp
index 0c0a54d..0fecaf7 100644 (file)
--- a/test/test_configurationoptions.cpp
+++ b/test/test_configurationoptions.cpp
@@ -205,12 +205,12 @@ BOOST_AUTO_TEST_CASE( parse_hosts_options )
     // host 5
     hosts_names.push_back( "www.kernel.org" );
     hosts_ports.push_back( 64 );
-    hosts_ping_protocols.push_back( "TCP,10,ICMP" );
+    hosts_ping_protocols.push_back( "TCP,ICMP" );
     hosts_intervals.push_back( 75 );
     // host 6
     hosts_names.push_back( "www.linux.com" );
     hosts_ports.push_back( 64 );
-    hosts_ping_protocols.push_back( "ICMPv6,67,TCP_IPv6" );
+    hosts_ping_protocols.push_back( "ICMPv6,TCP_IPv6" );
     hosts_intervals.push_back( 76 );
 
     ConfigurationOptions config_options;
@@ -253,7 +253,6 @@ BOOST_AUTO_TEST_CASE( parse_hosts_options )
     BOOST_CHECK_EQUAL( host5->get_port(), 64 );
     BOOST_CHECK_EQUAL( host5->get_ping_protocol_list().size(), 2 );
     BOOST_CHECK_EQUAL( host5->get_ping_protocol_list().front(), PingProtocol_TCP );
-    BOOST_CHECK_EQUAL( host5->get_ping_protocol_fallback_count(), 10 );
     BOOST_CHECK_EQUAL( host5->get_ping_protocol_list().back(), PingProtocol_ICMP );
     BOOST_CHECK_EQUAL( host5->get_interval_in_sec(), 75 );
     // host 6
@@ -262,7 +261,6 @@ BOOST_AUTO_TEST_CASE( parse_hosts_options )
     BOOST_CHECK_EQUAL( host6->get_port(), 64 );
     BOOST_CHECK_EQUAL( host6->get_ping_protocol_list().size(), 2 );
     BOOST_CHECK_EQUAL( host6->get_ping_protocol_list().front(), PingProtocol_ICMPv6 );
-    BOOST_CHECK_EQUAL( host6->get_ping_protocol_fallback_count(), 67 );
     BOOST_CHECK_EQUAL( host6->get_ping_protocol_list().back(), PingProtocol_TCP_IPv6 );
     BOOST_CHECK_EQUAL( host6->get_interval_in_sec(), 76 );
 }