Refactor radio folder for 1.0 and 1.1
am: 8735a7d935
Change-Id: I1aefd73cd8a6b9937605e308c016b8e2dc4dff39
This commit is contained in:
commit
2576f3505f
6 changed files with 2 additions and 27 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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() {}
|
||||
};
|
|
@ -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() {}
|
||||
};
|
||||
};
|
|
@ -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();
|
||||
|
|
|
@ -561,11 +561,4 @@ class RadioHidlTest_v1_1 : public ::testing::VtsHalHidlTargetTestBase {
|
|||
sp<::android::hardware::radio::V1_1::IRadio> radio_v1_1;
|
||||
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() {}
|
||||
};
|
||||
};
|
Loading…
Reference in a new issue