[gem5-dev] Change in gem5/gem5[develop]: base: Stop using macros in base/socket.test.cc.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/45742 )

Change subject: base: Stop using macros in base/socket.test.cc.
......................................................................

base: Stop using macros in base/socket.test.cc.

These macros could easily be integer constants instead.

Change-Id: I62711477def1379ba885a7094aa7e00ec17cabeb
---
M src/base/socket.test.cc
1 file changed, 12 insertions(+), 12 deletions(-)



diff --git a/src/base/socket.test.cc b/src/base/socket.test.cc
index 7372911..bc2dbb7 100644
--- a/src/base/socket.test.cc
+++ b/src/base/socket.test.cc
@@ -31,8 +31,8 @@
 #include "base/gtest/logging.hh"
 #include "base/socket.hh"

-#define TEST_PORT_1 7893
-#define TEST_PORT_2 7894
+static int TestPort1 = 7893;
+static int TestPort2 = 7894;

 /*
  * Socket.test tests socket.cc. It should be noted that some features of
@@ -77,7 +77,7 @@
 TEST(SocketTest, ListenToPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));
     EXPECT_NE(-1, listen_socket.getfd());
     EXPECT_TRUE(listen_socket.islistening());
     EXPECT_FALSE(listen_socket.allDisabled());
@@ -90,7 +90,7 @@
      * The ListenSocket object should have the same state regardless as to
      * whether reuse is true or false (it is true by default).
      */
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1, false));
+    EXPECT_TRUE(listen_socket.listen(TestPort1, false));
     EXPECT_NE(-1, listen_socket.getfd());
     EXPECT_TRUE(listen_socket.islistening());
     EXPECT_FALSE(listen_socket.allDisabled());
@@ -99,13 +99,13 @@
 TEST(SocketTest, RelistenWithSameInstanceSamePort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));

     /*
      * You cannot listen to another port if you are already listening to  
one.
      */
     gtestLogOutput.str("");
-    EXPECT_ANY_THROW(listen_socket.listen(TEST_PORT_1));
+    EXPECT_ANY_THROW(listen_socket.listen(TestPort1));
     std::string expected = "panic: Socket already listening!\n";
     std::string actual = gtestLogOutput.str();
     EXPECT_EQ(expected, actual);
@@ -114,13 +114,13 @@
 TEST(SocketTest, RelistenWithSameInstanceDifferentPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));

     /*
      * You cannot listen to another port if you are already listening to  
one.
      */
     gtestLogOutput.str("");
-    EXPECT_ANY_THROW(listen_socket.listen(TEST_PORT_2));
+    EXPECT_ANY_THROW(listen_socket.listen(TestPort2));

     std::string expected = "panic: Socket already listening!\n";
     std::string actual = gtestLogOutput.str();
@@ -130,25 +130,25 @@
 TEST(SocketTest, RelistenWithDifferentInstanceOnDifferentPort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));

     /*
      * You can listen to another port with a different instance.
      */
     MockListenSocket listen_socket_2;
-    EXPECT_TRUE(listen_socket_2.listen(TEST_PORT_2));
+    EXPECT_TRUE(listen_socket_2.listen(TestPort2));
 }

 TEST(SocketTest, RelistenWithDifferentInstanceOnSamePort)
 {
     MockListenSocket listen_socket;
-    EXPECT_TRUE(listen_socket.listen(TEST_PORT_1));
+    EXPECT_TRUE(listen_socket.listen(TestPort1));

     /*
      * You cannot listen to a port that's already being listened to.
      */
     MockListenSocket listen_socket_2;
-    EXPECT_FALSE(listen_socket_2.listen(TEST_PORT_1));
+    EXPECT_FALSE(listen_socket_2.listen(TestPort1));
 }

 TEST(SocketTest, AcceptError)

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45742
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I62711477def1379ba885a7094aa7e00ec17cabeb
Gerrit-Change-Number: 45742
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s