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

Commit a9a5eb41 authored by Anthony Stange's avatar Anthony Stange
Browse files

Add VTS tests for Sensors HAL 2.1 

Bug: 144139857
Test: atest VtsHalSensorsV2_0TargetTest VtsHalSensorsV2_1TargetTest
Change-Id: If2b751929b8d89c9d381032f5e8424a24719b6bd
parent 535c63e6

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ 
    <hal format="hidl" optional="true">

        <name>android.hardware.sensors</name>

        <version>1.0</version>

        <version>2.0</version>

        <version>2.0-1</version>

        <interface>

            <name>ISensors</name>

            <instance>default</instance>

sensors/1.0/vts/functional/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_test { 
    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "SensorsHidlEnvironmentV1_0.cpp",

        "VtsHalSensorsV1_0TargetTest.cpp"

        "VtsHalSensorsV1_0TargetTest.cpp",

    ],

    static_libs: [

        "android.hardware.graphics.allocator@2.0",
@@ -31,6 +31,8 @@ cc_test { 
        "android.hardware.sensors@1.0",

        "VtsHalSensorsTargetTestUtils",

    ],

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

    test_suites: [

        "general-tests",

        "vts-core",

    ],

}

sensors/1.0/vts/functional/SensorsHidlEnvironmentV1_0.h

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
using ::android::sp;



class SensorsHidlTest;

class SensorsHidlEnvironmentV1_0 : public SensorsHidlEnvironmentBase {

class SensorsHidlEnvironmentV1_0

    : public SensorsHidlEnvironmentBase<::android::hardware::sensors::V1_0::Event> {

  public:

    using Event = ::android::hardware::sensors::V1_0::Event;

    SensorsHidlEnvironmentV1_0(const std::string& service_name)

sensors/1.0/vts/functional/VtsHalSensorsV1_0TargetTest.cpp

+29 −30
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ using ::android::sp; 
using namespace ::android::hardware::sensors::V1_0;



// The main test class for SENSORS HIDL HAL.



class SensorsHidlTest : public SensorsHidlTestBase {

class SensorsHidlTest : public SensorsHidlTestBase<SensorType, Event, SensorInfo> {

  public:

    virtual void SetUp() override {

        mEnvironment = new SensorsHidlEnvironmentV1_0(GetParam());
@@ -80,7 +79,7 @@ class SensorsHidlTest : public SensorsHidlTestBase { 


    inline sp<ISensors>& S() { return mEnvironment->sensors; }



    SensorsHidlEnvironmentBase* getEnvironment() override { return mEnvironment; }

    SensorsHidlEnvironmentBase<Event>* getEnvironment() override { return mEnvironment; }



  private:

    // Test environment for sensors HAL.
@@ -257,55 +256,55 @@ TEST_P(SensorsHidlTest, InjectSensorEventData) { 
// Test if sensor hal can do UI speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationSlow) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do normal speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationNormal) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do game speed accelerometer streaming properly

TEST_P(SensorsHidlTest, AccelerometerStreamingOperationFast) {

    testStreamingOperation(SensorType::ACCELEROMETER, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), sAccelNormChecker);

                           std::chrono::seconds(5), mAccelNormChecker);

}



// Test if sensor hal can do UI speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationSlow) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do normal speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationNormal) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do game speed gyroscope streaming properly

TEST_P(SensorsHidlTest, GyroscopeStreamingOperationFast) {

    testStreamingOperation(SensorType::GYROSCOPE, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), sGyroNormChecker);

                           std::chrono::seconds(5), mGyroNormChecker);

}



// Test if sensor hal can do UI speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationSlow) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(200),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do normal speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationNormal) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(20),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do game speed magnetometer streaming properly

TEST_P(SensorsHidlTest, MagnetometerStreamingOperationFast) {

    testStreamingOperation(SensorType::MAGNETIC_FIELD, std::chrono::milliseconds(5),

                           std::chrono::seconds(5), NullChecker());

                           std::chrono::seconds(5), NullChecker<Event>());

}



// Test if sensor hal can do accelerometer sampling rate switch properly when sensor is active
@@ -344,109 +343,109 @@ TEST_P(SensorsHidlTest, MagnetometerBatchingOperation) { 
// Test sensor event direct report with ashmem for accel sensor at normal rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with ashmem for accel sensor at fast rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM, RateLevel::FAST,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with ashmem for accel sensor at very fast rate

TEST_P(SensorsHidlTest, AccelerometerAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::ASHMEM,

                              RateLevel::VERY_FAST, sAccelNormChecker);

                              RateLevel::VERY_FAST, mAccelNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at normal rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at fast rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for gyro sensor at very fast rate

TEST_P(SensorsHidlTest, GyroscopeAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::ASHMEM, RateLevel::VERY_FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with ashmem for mag sensor at normal rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM, RateLevel::NORMAL,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with ashmem for mag sensor at fast rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM, RateLevel::FAST,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with ashmem for mag sensor at very fast rate

TEST_P(SensorsHidlTest, MagnetometerAshmemDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::ASHMEM,

                              RateLevel::VERY_FAST, NullChecker());

                              RateLevel::VERY_FAST, NullChecker<Event>());

}



// Test sensor event direct report with gralloc for accel sensor at normal rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with gralloc for accel sensor at fast rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC, RateLevel::FAST,

                              sAccelNormChecker);

                              mAccelNormChecker);

}



// Test sensor event direct report with gralloc for accel sensor at very fast rate

TEST_P(SensorsHidlTest, AccelerometerGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::ACCELEROMETER, SharedMemType::GRALLOC,

                              RateLevel::VERY_FAST, sAccelNormChecker);

                              RateLevel::VERY_FAST, mAccelNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at normal rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at fast rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for gyro sensor at very fast rate

TEST_P(SensorsHidlTest, GyroscopeGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::GYROSCOPE, SharedMemType::GRALLOC, RateLevel::VERY_FAST,

                              sGyroNormChecker);

                              mGyroNormChecker);

}



// Test sensor event direct report with gralloc for mag sensor at normal rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationNormal) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC, RateLevel::NORMAL,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with gralloc for mag sensor at fast rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC, RateLevel::FAST,

                              NullChecker());

                              NullChecker<Event>());

}



// Test sensor event direct report with gralloc for mag sensor at very fast rate

TEST_P(SensorsHidlTest, MagnetometerGrallocDirectReportOperationVeryFast) {

    testDirectReportOperation(SensorType::MAGNETIC_FIELD, SharedMemType::GRALLOC,

                              RateLevel::VERY_FAST, NullChecker());

                              RateLevel::VERY_FAST, NullChecker<Event>());

}



INSTANTIATE_TEST_SUITE_P(

sensors/2.0/vts/functional/Android.bp

+11 −3
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ cc_test { 
    cflags: ["-DLOG_TAG=\"sensors_hidl_hal_test\""],

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "SensorsHidlEnvironmentV2_0.cpp",

        "VtsHalSensorsV2_0TargetTest.cpp"

        "VtsHalSensorsV2_0TargetTest.cpp",

    ],

    header_libs: [

        "android.hardware.sensors@2.X-shared-utils",

    ],

    static_libs: [

        "android.hardware.graphics.allocator@2.0",
@@ -29,9 +31,15 @@ cc_test { 
        "android.hardware.graphics.mapper@2.1",

        "android.hardware.graphics.mapper@3.0",

        "android.hardware.sensors@1.0",

        "android.hardware.sensors@1.0-convert",

        "android.hardware.sensors@2.0",

        "android.hardware.sensors@2.1",

        "libfmq",

        "VtsHalSensorsTargetTestUtils",

        "VtsHalSensorsV2_XTargetTest",

    ],

    test_suites: [

        "general-tests",

        "vts-core",

    ],

}