Merge "Refactor radio folder for 1.0 and 1.1"

#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

#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

    sp<RadioResponse> radioRsp;

    sp<RadioIndication> radioInd;

};

 No newline at end of file

// A class for test environment setup

class RadioHidlEnvironment : public ::testing::Environment {

   public:

    virtual void SetUp() {}

    virtual void TearDown() {}

};

 No newline at end of file

    /* Sap Callback object */

    sp<SapCallback> sapCb;

};

 No newline at end of file

// A class for test environment setup

class SapHidlEnvironment : public ::testing::Environment {

   public:

    virtual void SetUp() {}

    virtual void TearDown() {}

};

#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();