1 files changed, 37 insertions, 20 deletions
diff --git a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
index fae79d4..182dfa1 100644
--- a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
+++ b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
@@ -31,35 +31,52 @@ class ControlReceiver;
 class TelnetServer;
 
 
-class CAmTelnetServerTest : public ::testing::Test{
-   public:
-      CAmTelnetServerTest();
-      ~CAmTelnetServerTest();
+class MyEnvironment : public ::testing::Environment
+{
+ public:
+  MyEnvironment();
 
+  ~MyEnvironment();
+  // Override this to define how to set up the environment.
+  void SetUp();
+  // Override this to define how to tear down the environment.
+  void TearDown();
 
-   void SetUp() ;
+  void setSocketHandler(SocketHandler* pSocketHandler);
 
-   void TearDown() ;
+  void stopSocketHandler();
+
+  std::vector<std::string> mlistRoutingPluginDirs;
+  std::vector<std::string> mlistCommandPluginDirs;
 
-   void setSocketHandler(SocketHandler* pSocketHandler);
+  //SocketHandler*    mpSocketHandler;
+  DatabaseHandler   mDatabasehandler;
+  RoutingSender     mRoutingSender;
+  CommandSender     mCommandSender;
+  ControlSender     mControlSender;
+  Router            mRouter;
 
-   std::vector<std::string> mlistRoutingPluginDirs;
-   std::vector<std::string> mlistCommandPluginDirs;
+  CommandReceiver*  mpCommandReceiver;
+  RoutingReceiver*  mpRoutingReceiver;
+  ControlReceiver*  mpControlReceiver;
 
-   SocketHandler*    mpSocketHandler;
-   DatabaseHandler   mDatabasehandler;
-   RoutingSender     mRoutingSender;
-   CommandSender     mCommandSender;
-   ControlSender     mControlSender;
-   Router            mRouter;
+  TelnetServer*     mpTelnetServer;
 
-   CommandReceiver*  mpCommandReceiver;
-   RoutingReceiver*  mpRoutingReceiver;
-   ControlReceiver*  mpControlReceiver;
+  pthread_t         mSocketHandlerThread;
+};
 
-   TelnetServer*     mpTelnetServer;
+class CAmTelnetServerTest : public ::testing::Test
+{
+   public:
+      CAmTelnetServerTest();
+      ~CAmTelnetServerTest();
+
+
+   void SetUp() ;
+
+   void TearDown() ;
 
-   pthread_t         mSocketHandlerThread;
+   //int              mSocket;
 };
 
 }