commit 8cff3804868f95f6b4fd92c7ec22d1cb8f169854
author William A. Kennington III <wak@google.com> Sun Apr 21 20:17:27 2019 -0700
committer William A. Kennington III <wak@google.com> Tue Jul 23 13:38:02 2019 -0700
tree 98d02a0407208d1b3d5c7fa6304c5d28db7da5db
parent 7ed1b286ae1620dd629d8cee8ae33ac4f7c53ecf

test: Don't catch exceptions needlessly

If exceptions happen the test will fail anyway. We aren't catching all
possible exceptions so just get rid of the superfluous try catch blocks.

Change-Id: I56b7b59475b4adea8532dd0aded0966609ffb7f3
Signed-off-by: William A. Kennington III <wak@google.com>

test/test_network_manager.cpp

diff --git a/test/test_network_manager.cpp b/test/test_network_manager.cpp
index 2837296..64ca87d 100644
--- a/test/test_network_manager.cpp
+++ b/test/test_network_manager.cpp
@@ -67,51 +67,34 @@
 // getifaddrs returns single interface.
 TEST_F(TestNetworkManager, WithSingleInterface)
 {
-    bool caughtException = false;
-    try
-    {
-        mock_clear();
+    mock_clear();
 
-        // Adds the following ip in the getifaddrs list.
-        mock_addIF("igb1", 2);
-        mock_addIP("igb1", "192.0.2.3", "255.255.255.128",
-                   IFF_UP | IFF_RUNNING);
+    // Adds the following ip in the getifaddrs list.
+    mock_addIF("igb1", 2);
+    mock_addIP("igb1", "192.0.2.3", "255.255.255.128", IFF_UP | IFF_RUNNING);
 
-        // Now create the interfaces which will call the mocked getifaddrs
-        // which returns the above interface detail.
-        createInterfaces();
-        EXPECT_EQ(1, manager.getInterfaceCount());
-        EXPECT_EQ(true, manager.hasInterface("igb1"));
-    }
-    catch (std::exception& e)
-    {
-        caughtException = true;
-    }
-    EXPECT_EQ(false, caughtException);
+    // Now create the interfaces which will call the mocked getifaddrs
+    // which returns the above interface detail.
+    createInterfaces();
+    EXPECT_EQ(1, manager.getInterfaceCount());
+    EXPECT_EQ(true, manager.hasInterface("igb1"));
 }
 
 // getifaddrs returns two interfaces.
 TEST_F(TestNetworkManager, WithMultipleInterfaces)
 {
-    try
-    {
-        mock_clear();
+    mock_clear();
 
-        mock_addIF("igb0", 1);
-        mock_addIP("igb0", "192.0.2.2", "255.255.255.128",
-                   IFF_UP | IFF_RUNNING);
+    mock_addIF("igb0", 1);
+    mock_addIP("igb0", "192.0.2.2", "255.255.255.128", IFF_UP | IFF_RUNNING);
 
-        mock_addIF("igb1", 2);
-        mock_addIP("igb1", "192.0.2.3", "255.255.255.128",
-                   IFF_UP | IFF_RUNNING);
+    mock_addIF("igb1", 2);
+    mock_addIP("igb1", "192.0.2.3", "255.255.255.128", IFF_UP | IFF_RUNNING);
 
-        createInterfaces();
-        EXPECT_EQ(2, manager.getInterfaceCount());
-        EXPECT_EQ(true, manager.hasInterface("igb0"));
-    }
-    catch (std::exception& e)
-    {
-    }
+    createInterfaces();
+    EXPECT_EQ(2, manager.getInterfaceCount());
+    EXPECT_EQ(true, manager.hasInterface("igb0"));
+    EXPECT_EQ(true, manager.hasInterface("igb1"));
 }
 
 } // namespace network