reslove() -> make_address

2 files changed, 5 insertions, 9 deletions

diff --git a/messagebus/src/tests/error/error.cpp b/messagebus/src/tests/error/error.cpp
index 1d8a489a5ed..6ac15ae4015 100644
--- a/messagebus/src/tests/error/error.cpp
+++ b/messagebus/src/tests/error/error.cpp
@@ -18,8 +18,6 @@
 
 using namespace mbus;
 
-TEST_SETUP(Test);
-
 RoutingSpec getRouting() {
     return RoutingSpec()
         .addTable(RoutingTableSpec("Simple")
@@ -28,10 +26,7 @@ RoutingSpec getRouting() {
                   .addRoute(RouteSpec("test").addHop("pxy").addHop("dst")));
 }
 
-int
-Test::Main()
-{
-    TEST_INIT("error_test");
+TEST("error_test") {
 
     Slobrok     slobrok;
     TestServer  srcNet(Identity("test/src"), getRouting(), slobrok);
@@ -76,5 +71,6 @@ Test::Main()
         EXPECT_EQUAL(reply->getError(0).getService(), "test/dst/session");
         EXPECT_EQUAL(reply->getError(1).getService(), "test/pxy/session");
     }
-    TEST_DONE();
 }
+
+TEST_MAIN() { TEST_RUN_ALL(); }
\ No newline at end of file
diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
index 770cac620a9..c5d07bc437a 100644
--- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp
+++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
@@ -24,7 +24,7 @@ bool
 testNullAddress(RPCNetwork &network, const string &pattern)
 {
     RPCService service(network.getMirror(), pattern);
-    RPCServiceAddress::UP obj = service.resolve();
+    RPCServiceAddress::UP obj = service.make_address();
     if ( ! EXPECT_FALSE(obj)) {
         return false;
     }
@@ -36,7 +36,7 @@ testAddress(RPCNetwork &network, const string &pattern,
             const string &expectedSpec, const string &expectedSession)
 {
     RPCService service(network.getMirror(), pattern);
-    RPCServiceAddress::UP obj = service.resolve();
+    RPCServiceAddress::UP obj = service.make_address();
     if (!EXPECT_TRUE(obj)) {
         return false;
     }