Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b0a0ad authored by Zhuoyao Zhang's avatar Zhuoyao Zhang
Browse files

Convert radio hal test to use VtsHalHidlTargetTestEnvBase 

Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalRadioV1_0Target
      vts-tradefed run vts -m VtsHalSapV1_0Target
      vts-tradefed run vts -m VtsHalRadioV1_1Target
      vts-tradefed run vts -m VtsHalRadioV1_2Target

Change-Id: I067ce9634e41c0400d9eb060065e9bb3bc511546
parent 9cdd6f95

radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <radio_hidl_hal_utils_v1_0.h>



int main(int argc, char** argv) {

    ::testing::AddGlobalTestEnvironment(RadioHidlEnvironment::Instance());

    ::testing::InitGoogleTest(&argc, argv);

    RadioHidlEnvironment::Instance()->init(&argc, argv);



    // setup seed for rand function

    int seedSrand = time(NULL);

radio/1.0/vts/functional/VtsHalSapV1_0TargetTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <sap_hidl_hal_utils.h>



int main(int argc, char** argv) {

    ::testing::AddGlobalTestEnvironment(SapHidlEnvironment::Instance());

    ::testing::InitGoogleTest(&argc, argv);

    SapHidlEnvironment::Instance()->init(&argc, argv);



    // setup seed for rand function

    int seedSrand = time(NULL);

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+5 −4
Original line number Diff line number Diff line
@@ -17,12 +17,13 @@ 
#include <radio_hidl_hal_utils_v1_0.h>



void RadioHidlTest::SetUp() {

    radio =

        ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(hidl_string(RADIO_SERVICE_NAME));

    radio = ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(

        RadioHidlEnvironment::Instance()->getServiceName<IRadio>(hidl_string(RADIO_SERVICE_NAME)));

    if (radio == NULL) {

        sleep(60);

        radio = ::testing::VtsHalHidlTargetTestBase::getService<IRadio>(

            hidl_string(RADIO_SERVICE_NAME));

            RadioHidlEnvironment::Instance()->getServiceName<IRadio>(

                hidl_string(RADIO_SERVICE_NAME)));

    }

    ASSERT_NE(nullptr, radio.get());

radio/1.0/vts/functional/radio_hidl_hal_utils_v1_0.h

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <android-base/logging.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>

#include <chrono>

#include <condition_variable>

#include <mutex>
@@ -511,6 +512,20 @@ class RadioIndication : public IRadioIndication { 
                            const ::android::hardware::hidl_string& reason);

};



// Test environment for Radio HIDL HAL.

class RadioHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static RadioHidlEnvironment* Instance() {

        static RadioHidlEnvironment* instance = new RadioHidlEnvironment;

        return instance;

    }

    virtual void registerTestServices() override { registerTestService<IRadio>(); }



   private:

    RadioHidlEnvironment() {}

};



// The main test class for Radio HIDL.

class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase {

   protected:

radio/1.0/vts/functional/sap_hidl_hal_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <sap_hidl_hal_utils.h>



void SapHidlTest::SetUp() {

    sap = ::testing::VtsHalHidlTargetTestBase::getService<ISap>(hidl_string(SAP_SERVICE_NAME));

    sap = ::testing::VtsHalHidlTargetTestBase::getService<ISap>(

        SapHidlEnvironment::Instance()->getServiceName<ISap>(hidl_string(SAP_SERVICE_NAME)));

    ASSERT_NE(sap, nullptr);



    sapCb = new SapCallback(*this);