Refactor radio folder for 1.0 and 1.1
authorsqian <shuoq@google.com>
Wed, 11 Oct 2017 22:10:14 +0000 (15:10 -0700)
committersqian <shuoq@google.com>
Wed, 11 Oct 2017 22:10:14 +0000 (15:10 -0700)
Remove unused environment variable.

Test: run vts
Bug: 63760809
Change-Id: Iff7919980d7bbe0e9f8a73a3679d37426faec679
Merged-In: Iff7919980d7bbe0e9f8a73a3679d37426faec679

radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp
radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp
radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h
radio/1.0/vts/functional/sap_hidl_hal_utils.h
radio/1.1/vts/functional/VtsHalRadioV1_1TargetTest.cpp
radio/1.1/vts/functional/radio_hidl_hal_utils_v1_1.h

index 3448494ffd53a9128603a040e6519c8e263a4845..a3eb54cf18ddea82998b02f7bc250a7390057266 100644 (file)
@@ -17,7 +17,6 @@
 #include <radio_hidl_hal_utils_v1_0.h>
 
 int main(int argc, char** argv) {
-    ::testing::AddGlobalTestEnvironment(new RadioHidlEnvironment);
     ::testing::InitGoogleTest(&argc, argv);
 
     // setup seed for rand function
index 5e5c50c7add9c569ba421a66d2e873497d5cf7ff..84b67c9453b27b28bf7d4f90487f5937f4f689f8 100644 (file)
@@ -17,8 +17,6 @@
 #include <sap_hidl_hal_utils.h>
 
 int main(int argc, char** argv) {
-    // Add Sim-access Profile Hidl Environment
-    ::testing::AddGlobalTestEnvironment(new SapHidlEnvironment);
     ::testing::InitGoogleTest(&argc, argv);
 
     // setup seed for rand function
index b0d67dad94f7bc492df0361af50a571c56edffdf..b60887c74b5984f98c8441bb5fba193fd359e763 100644 (file)
@@ -538,11 +538,4 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase {
     sp<IRadio> radio;
     sp<RadioResponse> radioRsp;
     sp<RadioIndication> radioInd;
-};
-
-// A class for test environment setup
-class RadioHidlEnvironment : public ::testing::Environment {
-   public:
-    virtual void SetUp() {}
-    virtual void TearDown() {}
 };
\ No newline at end of file
index 7126b06e037091b2cfe9cc91a0268f137a76c852..fb142b796fb21d48d53b6bb3a0444a73ae306546 100644 (file)
@@ -102,11 +102,4 @@ class SapHidlTest : public ::testing::VtsHalHidlTargetTestBase {
 
     /* Sap Callback object */
     sp<SapCallback> sapCb;
-};
-
-// A class for test environment setup
-class SapHidlEnvironment : public ::testing::Environment {
-   public:
-    virtual void SetUp() {}
-    virtual void TearDown() {}
-};
+};
\ No newline at end of file
index 09351c850a04c6f3444f1a0c38523b8adf259dcf..107a9e0d4c6ff1ac8b877d10b5b52283ffe91f00 100644 (file)
@@ -17,7 +17,6 @@
 #include <radio_hidl_hal_utils_v1_1.h>
 
 int main(int argc, char** argv) {
-    ::testing::AddGlobalTestEnvironment(new RadioHidlEnvironment);
     ::testing::InitGoogleTest(&argc, argv);
 
     int status = RUN_ALL_TESTS();
index dd4f1efc0f15e9ee1fe496e6e620a2fa2c523c53..fc102a5ce99f9300fe153111b4e3756275d9959d 100644 (file)
@@ -561,10 +561,3 @@ class RadioHidlTest_v1_1 : public ::testing::VtsHalHidlTargetTestBase {
     sp<RadioResponse_v1_1> radioRsp_v1_1;
     sp<RadioIndication_v1_1> radioInd_v1_1;
 };
-
-// A class for test environment setup
-class RadioHidlEnvironment : public ::testing::Environment {
-   public:
-    virtual void SetUp() {}
-    virtual void TearDown() {}
-};
\ No newline at end of file