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

Commit 4652a0e5 authored by Dan Shi's avatar Dan Shi
Browse files

Convert VtsHalGnssV1_1TargetTest to be parameterized test 

Bug: 142397658
Test: atest VtsHalGnssV1_1TargetTest
atest VtsHalGnssV1_1Target

Change-Id: I575630c8cbbf8bbd341425c5bbe04ca49c2c1758
parent 851a9ce6

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ cc_defaults { 
        "-g",

    ],



    require_root: true,

}

gnss/1.1/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,5 +30,5 @@ cc_test { 
    shared_libs: [

        "android.hardware.gnss.measurement_corrections@1.0",

    ],

    test_suites: ["general-tests"],

    test_suites: ["general-tests", "vts-core"],

}

gnss/1.1/vts/functional/VtsHalGnssV1_1TargetTest.cpp

+9 −9
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
 */

#define LOG_TAG "VtsHalGnssV1_1TargetTest"



#include <VtsHalHidlTargetTestBase.h>

#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>



#include "gnss_hal_test.h"



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

    ::testing::AddGlobalTestEnvironment(GnssHidlEnvironment::Instance());

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

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

    int status = RUN_ALL_TESTS();

    ALOGI("Test result = %d", status);

    return status;

}
 
using android::hardware::gnss::V1_1::IGnss;



INSTANTIATE_TEST_SUITE_P(

        PerInstance, GnssHalTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IGnss::descriptor)),

        android::hardware::PrintInstanceNameToString);
 
 No newline at end of file

gnss/1.1/vts/functional/gnss_hal_test.cpp

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#define LOG_TAG "GnssHalTest"



#include <android/hidl/manager/1.2/IServiceManager.h>

#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>



#include <gnss_hal_test.h>
@@ -29,8 +31,7 @@ using ::android::hardware::hidl_vec; 
using ::android::hardware::gnss::common::Utils;



void GnssHalTest::SetUp() {

    gnss_hal_ = ::testing::VtsHalHidlTargetTestBase::getService<IGnss>(

        GnssHidlEnvironment::Instance()->getServiceName<IGnss>());

    gnss_hal_ = IGnss::getService(GetParam());

    ASSERT_NE(gnss_hal_, nullptr);



    SetUpGnssCallback();

gnss/1.1/vts/functional/gnss_hal_test.h

+3 −19
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 


#include <android/hardware/gnss/1.1/IGnss.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>

#include <gtest/gtest.h>

#include "GnssCallbackEventQueue.h"



using android::hardware::Return;
@@ -37,23 +36,8 @@ using android::sp; 


#define TIMEOUT_SEC 2  // for basic commands/responses



// Test environment for GNSS HIDL HAL.

class GnssHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static GnssHidlEnvironment* Instance() {

        static GnssHidlEnvironment* instance = new GnssHidlEnvironment;

        return instance;

    }



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



   private:

    GnssHidlEnvironment() {}

};



// The main test class for GNSS HAL.

class GnssHalTest : public ::testing::VtsHalHidlTargetTestBase {

class GnssHalTest : public testing::TestWithParam<std::string> {

  public:

    virtual void SetUp() override;