1 files changed, 12 insertions, 18 deletions

diff --git a/slobrok/src/tests/oldapi/old.cpp b/slobrok/src/tests/oldapi/old.cpp
index 42cec186a08..26cf94613bd 100644
--- a/slobrok/src/tests/oldapi/old.cpp
+++ b/slobrok/src/tests/oldapi/old.cpp
@@ -19,9 +19,9 @@ TEST_SETUP(Test);
 class Server : public FRT_Invokable
 {
 private:
-    FRT_Supervisor _orb;
-    std::string    _name;
-    std::string    _slobrokSpec;
+    fnet::frt::StandaloneFRT _server;
+    std::string              _name;
+    std::string              _slobrokSpec;
 
 public:
     Server(std::string name, int port, std::string slobrokSpec);
@@ -32,12 +32,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);
@@ -45,8 +45,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);
 }
 
 
@@ -54,14 +53,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();
@@ -77,10 +76,7 @@ Server::rpc_listNamesServed(FRT_RPCRequest *req)
 }
 
 
-Server::~Server()
-{
-    _orb.ShutDown(true);
-}
+Server::~Server() = default;
 
 //-----------------------------------------------------------------------------
 
@@ -136,10 +132,9 @@ Test::Main()
 
     std::vector<std::string> slobrokSpecs;
     slobrokSpecs.push_back("tcp/localhost:18531");
-    FRT_Supervisor orb;
-    MirrorOld mirror(orb, slobrokSpecs);
+    fnet::frt::StandaloneFRT server;
+    MirrorOld mirror(server.supervisor(), slobrokSpecs);
     EXPECT_TRUE(!mirror.ready());
-    orb.Start();
     FastOS_Thread::Sleep(1000);
 
     a.reg();
@@ -217,6 +212,5 @@ Test::Main()
                        .add("A/x/w", "tcp/localhost:18532")));
 
     mock.stop();
-    orb.ShutDown(true);
     TEST_DONE();
 }