Trial C++: Move `static BaseDBTClientServer& base_test_framework` into common test file dbt_client_server1x, ..

8 files changed, 3 insertions, 21 deletions

diff --git a/trial/direct_bt/dbt_client_server1x.hpp b/trial/direct_bt/dbt_client_server1x.hpp
index 012d5234..60f81797 100644
--- a/trial/direct_bt/dbt_client_server1x.hpp
+++ b/trial/direct_bt/dbt_client_server1x.hpp
@@ -34,6 +34,9 @@
 
 using namespace direct_bt;
 
+// Singleton test framework, alive until test program ends
+static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
+
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - start server advertising
diff --git a/trial/direct_bt/test_client_server10_NoEnc.cpp b/trial/direct_bt/test_client_server10_NoEnc.cpp
index ada2271a..d1104ce4 100644
--- a/trial/direct_bt/test_client_server10_NoEnc.cpp
+++ b/trial/direct_bt/test_client_server10_NoEnc.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating w/o encryption
diff --git a/trial/direct_bt/test_client_server12_NoEnc.cpp b/trial/direct_bt/test_client_server12_NoEnc.cpp
index 37c49964..d8be1915 100644
--- a/trial/direct_bt/test_client_server12_NoEnc.cpp
+++ b/trial/direct_bt/test_client_server12_NoEnc.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating w/o encryption
diff --git a/trial/direct_bt/test_client_server20_SC0.cpp b/trial/direct_bt/test_client_server20_SC0.cpp
index 29e1c7c3..b4b13387 100644
--- a/trial/direct_bt/test_client_server20_SC0.cpp
+++ b/trial/direct_bt/test_client_server20_SC0.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating in legacy non SC mode
diff --git a/trial/direct_bt/test_client_server22_SC0.cpp b/trial/direct_bt/test_client_server22_SC0.cpp
index 8cddf1b0..dbe24e7e 100644
--- a/trial/direct_bt/test_client_server22_SC0.cpp
+++ b/trial/direct_bt/test_client_server22_SC0.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating in legacy non SC mode
diff --git a/trial/direct_bt/test_client_server30_SC1.cpp b/trial/direct_bt/test_client_server30_SC1.cpp
index a60b7d95..7118af0a 100644
--- a/trial/direct_bt/test_client_server30_SC1.cpp
+++ b/trial/direct_bt/test_client_server30_SC1.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating in SC mode
diff --git a/trial/direct_bt/test_client_server32_SC1.cpp b/trial/direct_bt/test_client_server32_SC1.cpp
index 6ff7221b..d5540bdb 100644
--- a/trial/direct_bt/test_client_server32_SC1.cpp
+++ b/trial/direct_bt/test_client_server32_SC1.cpp
@@ -31,9 +31,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing a full Bluetooth server and client lifecycle of operations, requiring two BT adapter:
  * - operating in SC mode
diff --git a/trial/direct_bt/test_provoke_client_server_i470.cpp b/trial/direct_bt/test_provoke_client_server_i470.cpp
index ad10c837..0e7ce19a 100644
--- a/trial/direct_bt/test_provoke_client_server_i470.cpp
+++ b/trial/direct_bt/test_provoke_client_server_i470.cpp
@@ -35,9 +35,6 @@
 
 using namespace direct_bt;
 
-// Singleton test framework, alive until test program ends
-static BaseDBTClientServer& base_test_framework = BaseDBTClientServer::get();
-
 /**
  * Testing w/o client filtering processing device and hence not blocking deviceFound.
  *