1 files changed, 10 insertions, 16 deletions

diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
index f77dfd80986..23cd201c551 100644
--- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp
+++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp
@@ -21,7 +21,7 @@ TEST_SETUP(Test);
 class Server : public FRT_Invokable
 {
 private:
-    FRT_Supervisor _orb;
+    fnet::frt::StandaloneFRT _server;
     std::string    _name;
     std::string    _slobrokSpec;
 
@@ -34,12 +34,12 @@ public:
 
 
 Server::Server(std::string name, int port, std::string slobrokSpec)
-    : _orb(),
+    : _server(),
       _name(name),
       _slobrokSpec(slobrokSpec)
 {
     {
-        FRT_ReflectionBuilder rb(&_orb);
+        FRT_ReflectionBuilder rb(&_server.supervisor());
         //---------------------------------------------------------------------
         rb.DefineMethod("slobrok.callback.listNamesServed", "", "S",
                         FRT_METHOD(Server::rpc_listNamesServed), this);
@@ -47,8 +47,7 @@ Server::Server(std::string name, int port, std::string slobrokSpec)
         rb.ReturnDesc("names", "The rpcserver names on this server");
         //---------------------------------------------------------------------
     }
-    _orb.Listen(port);
-    _orb.Start();
+    _server.supervisor().Listen(port);
 }
 
 
@@ -56,14 +55,14 @@ void
 Server::reg()
 {
     char spec[64];
-    sprintf(spec, "tcp/localhost:%d", _orb.GetListenPort());
+    sprintf(spec, "tcp/localhost:%d", _server.supervisor().GetListenPort());
 
-    FRT_RPCRequest *req = _orb.AllocRPCRequest();
+    FRT_RPCRequest *req = _server.supervisor().AllocRPCRequest();
     req->SetMethodName("slobrok.registerRpcServer");
     req->GetParams()->AddString(_name.c_str());
     req->GetParams()->AddString(spec);
 
-    FRT_Target *sb = _orb.GetTarget(_slobrokSpec.c_str());
+    FRT_Target *sb = _server.supervisor().GetTarget(_slobrokSpec.c_str());
     sb->InvokeSync(req, 5.0);
     sb->SubRef();
     req->SubRef();
@@ -79,10 +78,7 @@ Server::rpc_listNamesServed(FRT_RPCRequest *req)
 }
 
 
-Server::~Server()
-{
-    _orb.ShutDown(true);
-}
+Server::~Server() = default;
 
 //-----------------------------------------------------------------------------
 
@@ -140,10 +136,9 @@ Test::Main()
     cloud::config::SlobroksConfig::Slobrok slobrok;
     slobrok.connectionspec = "tcp/localhost:18501";
     specBuilder.slobrok.push_back(slobrok);
-    FRT_Supervisor orb;
-    MirrorAPI mirror(orb, config::ConfigUri::createFromInstance(specBuilder));
+    fnet::frt::StandaloneFRT server;
+    MirrorAPI mirror(server.supervisor(), config::ConfigUri::createFromInstance(specBuilder));
     EXPECT_TRUE(!mirror.ready());
-    orb.Start();
     FastOS_Thread::Sleep(1000);
 
     a.reg();
@@ -224,6 +219,5 @@ Test::Main()
                        .add("A/x/w", "tcp/localhost:18502")));
 
     mock.stop();
-    orb.ShutDown(true);
     TEST_DONE();
 }