tests: Avoid using C-style NUL-terminated strings as arguments

practicalswift · practicalswift · commit 7a046cdc1423 · 2020-01-08T12:35:59.000Z
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
@@ -59,29 +59,20 @@ class CAddrManTest : public CAddrMan
      }
 };
 
-static CNetAddr ResolveIP(const char* ip)
+static CNetAddr ResolveIP(const std::string& ip)
 {
     CNetAddr addr;
     BOOST_CHECK_MESSAGE(LookupHost(ip, addr, false), strprintf("failed to resolve: %s", ip));
     return addr;
 }
 
-static CNetAddr ResolveIP(std::string ip)
-{
-    return ResolveIP(ip.c_str());
-}
-
-static CService ResolveService(const char* ip, int port = 0)
+static CService ResolveService(const std::string& ip, const int port = 0)
 {
     CService serv;
     BOOST_CHECK_MESSAGE(Lookup(ip, serv, port, false), strprintf("failed to resolve: %s:%i", ip, port));
     return serv;
 }
 
-static CService ResolveService(std::string ip, int port = 0)
-{
-    return ResolveService(ip.c_str(), port);
-}
 
 BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)
 
diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp
@@ -13,21 +13,21 @@
 
 BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
 
-static CNetAddr ResolveIP(const char* ip)
+static CNetAddr ResolveIP(const std::string& ip)
 {
     CNetAddr addr;
     LookupHost(ip, addr, false);
     return addr;
 }
 
-static CSubNet ResolveSubNet(const char* subnet)
+static CSubNet ResolveSubNet(const std::string& subnet)
 {
     CSubNet ret;
     LookupSubNet(subnet, ret);
     return ret;
 }
 
-static CNetAddr CreateInternal(const char* host)
+static CNetAddr CreateInternal(const std::string& host)
 {
     CNetAddr addr;
     addr.SetInternal(host);

Original file line number	Diff line number	Diff line change
`@@ -59,29 +59,20 @@ class CAddrManTest : public CAddrMan`
`59`	`59`	`}`
`60`	`60`	`};`
`61`	`61`
`62`		`-static CNetAddr ResolveIP(const char* ip)`
	`62`	`+static CNetAddr ResolveIP(const std::string& ip)`
`63`	`63`	`{`
`64`	`64`	`CNetAddr addr;`
`65`	`65`	`BOOST_CHECK_MESSAGE(LookupHost(ip, addr, false), strprintf("failed to resolve: %s", ip));`
`66`	`66`	`return addr;`
`67`	`67`	`}`
`68`	`68`
`69`		`-static CNetAddr ResolveIP(std::string ip)`
`70`		`-{`
`71`		`- return ResolveIP(ip.c_str());`
`72`		`-}`
`73`		`-`
`74`		`-static CService ResolveService(const char* ip, int port = 0)`
	`69`	`+static CService ResolveService(const std::string& ip, const int port = 0)`
`75`	`70`	`{`
`76`	`71`	`CService serv;`
`77`	`72`	`BOOST_CHECK_MESSAGE(Lookup(ip, serv, port, false), strprintf("failed to resolve: %s:%i", ip, port));`
`78`	`73`	`return serv;`
`79`	`74`	`}`
`80`	`75`
`81`		`-static CService ResolveService(std::string ip, int port = 0)`
`82`		`-{`
`83`		`- return ResolveService(ip.c_str(), port);`
`84`		`-}`
`85`	`76`
`86`	`77`	`BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)`
`87`	`78`
Original file line number	Diff line number	Diff line change
`@@ -13,21 +13,21 @@`
`13`	`13`
`14`	`14`	`BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)`
`15`	`15`
`16`		`-static CNetAddr ResolveIP(const char* ip)`
	`16`	`+static CNetAddr ResolveIP(const std::string& ip)`
`17`	`17`	`{`
`18`	`18`	`CNetAddr addr;`
`19`	`19`	`LookupHost(ip, addr, false);`
`20`	`20`	`return addr;`
`21`	`21`	`}`
`22`	`22`
`23`		`-static CSubNet ResolveSubNet(const char* subnet)`
	`23`	`+static CSubNet ResolveSubNet(const std::string& subnet)`
`24`	`24`	`{`
`25`	`25`	`CSubNet ret;`
`26`	`26`	`LookupSubNet(subnet, ret);`
`27`	`27`	`return ret;`
`28`	`28`	`}`
`29`	`29`
`30`		`-static CNetAddr CreateInternal(const char* host)`
	`30`	`+static CNetAddr CreateInternal(const std::string& host)`
`31`	`31`	`{`
`32`	`32`	`CNetAddr addr;`
`33`	`33`	`addr.SetInternal(host);`