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

Commit df7711e8 authored by nelsonli's avatar nelsonli Committed by android-build-merger
Browse files

Merge "[vts-core] add VtsHalSoundtriggerV2_*TargetTest to vts-core" 

am: bbdd5e32

Change-Id: Ib84c502360fc5efb9004b9f5c7dab8ea605baae7
parents 20c3cab6 bbdd5e32

soundtrigger/2.0/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ cc_test { 
    defaults: ["VtsHalTargetTestDefaults"],

    srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"],

    static_libs: ["android.hardware.soundtrigger@2.0"],

    test_suites: ["general-tests"],

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

}

soundtrigger/2.0/vts/functional/VtsHalSoundtriggerV2_0TargetTest.cpp

+16 −36
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ 


#include <android/log.h>

#include <cutils/native_handle.h>

#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>

#include <log/log.h>



#include <android/hardware/audio/common/2.0/types.h>

#include <android/hardware/soundtrigger/2.0/ISoundTriggerHw.h>

#include <android/hardware/soundtrigger/2.0/types.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>



#define SHORT_TIMEOUT_PERIOD (1)



using ::android::hardware::audio::common::V2_0::AudioDevice;
@@ -86,27 +86,11 @@ class Monitor { 
  int mCount;

};



// Test environment for SoundTrigger HIDL HAL.

class SoundTriggerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static SoundTriggerHidlEnvironment* Instance() {

        static SoundTriggerHidlEnvironment* instance = new SoundTriggerHidlEnvironment;

        return instance;

    }



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



   private:

    SoundTriggerHidlEnvironment() {}

};



// The main test class for Sound Trigger HIDL HAL.

class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase {

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

 public:

  virtual void SetUp() override {

      mSoundTriggerHal = ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>(

          SoundTriggerHidlEnvironment::Instance()->getServiceName<ISoundTriggerHw>());

      mSoundTriggerHal = ISoundTriggerHw::getService(GetParam());

      ASSERT_NE(nullptr, mSoundTriggerHal.get());

      mCallback = new SoundTriggerHwCallback(*this);

      ASSERT_NE(nullptr, mCallback.get());
@@ -167,7 +151,7 @@ class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
 *  - the implementation supports at least one sound model and one key phrase

 *  - the implementation supports at least VOICE_TRIGGER recognition mode

 */

TEST_F(SoundTriggerHidlTest, GetProperties) {

TEST_P(SoundTriggerHidlTest, GetProperties) {

  ISoundTriggerHw::Properties halProperties;

  Return<void> hidlReturn;

  int ret = -ENODEV;
@@ -194,7 +178,7 @@ TEST_F(SoundTriggerHidlTest, GetProperties) { 
 * There is no way to verify that implementation actually can load a sound model because each

 * sound model is vendor specific.

 */

TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail) {

TEST_P(SoundTriggerHidlTest, LoadInvalidModelFail) {

  Return<void> hidlReturn;

  int ret = -ENODEV;

  ISoundTriggerHw::PhraseSoundModel model;
@@ -220,7 +204,7 @@ TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail) { 
 * Verifies that:

 *  - the implementation returns error when passed a sound model with random data.

 */

TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail) {

TEST_P(SoundTriggerHidlTest, LoadGenericSoundModelFail) {

  int ret = -ENODEV;

  ISoundTriggerHw::SoundModel model;

  SoundModelHandle handle = 0;
@@ -251,7 +235,7 @@ TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail) { 
 *  - the implementation returns an error when called without a valid loaded sound model

 *

 */

TEST_F(SoundTriggerHidlTest, UnloadModelNoModelFail) {

TEST_P(SoundTriggerHidlTest, UnloadModelNoModelFail) {

  Return<int32_t> hidlReturn(0);

  SoundModelHandle halHandle = 0;
@@ -271,7 +255,7 @@ TEST_F(SoundTriggerHidlTest, UnloadModelNoModelFail) { 
 * There is no way to verify that implementation actually starts recognition because no model can

 * be loaded.

 */

TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail) {

TEST_P(SoundTriggerHidlTest, StartRecognitionNoModelFail) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle handle = 0;

    PhraseRecognitionExtra phrase;
@@ -299,7 +283,7 @@ TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail) { 
 *  - the implementation returns an error when called without an active recognition running

 *

 */

TEST_F(SoundTriggerHidlTest, StopRecognitionNoAStartFail) {

TEST_P(SoundTriggerHidlTest, StopRecognitionNoAStartFail) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle handle = 0;
@@ -316,7 +300,7 @@ TEST_F(SoundTriggerHidlTest, StopRecognitionNoAStartFail) { 
 *  - the implementation implements this optional method or indicates it is not support by

 *  returning -ENOSYS

 */

TEST_F(SoundTriggerHidlTest, stopAllRecognitions) {

TEST_P(SoundTriggerHidlTest, stopAllRecognitions) {

    Return<int32_t> hidlReturn(0);



    hidlReturn = mSoundTriggerHal->stopAllRecognitions();
@@ -325,11 +309,7 @@ TEST_F(SoundTriggerHidlTest, stopAllRecognitions) { 
    EXPECT_TRUE(hidlReturn == 0 || hidlReturn == -ENOSYS);

}



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

    ::testing::AddGlobalTestEnvironment(SoundTriggerHidlEnvironment::Instance());

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

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

    int status = RUN_ALL_TESTS();

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

    return status;

}
 
INSTANTIATE_TEST_SUITE_P(

        PerInstance, SoundTriggerHidlTest,

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

        android::hardware::PrintInstanceNameToString);

soundtrigger/2.1/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,5 +25,5 @@ cc_test { 
                 "android.hardware.soundtrigger@2.1",

                 "libhidlmemory"

                 ],

    test_suites: ["general-tests"],

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

}

soundtrigger/2.1/vts/functional/VtsHalSoundtriggerV2_1TargetTest.cpp

+21 −41
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 


#include <android/log.h>

#include <cutils/native_handle.h>

#include <gtest/gtest.h>

#include <hidl/GtestPrinter.h>

#include <hidl/ServiceManagement.h>

#include <log/log.h>



#include <android/hardware/audio/common/2.0/types.h>
@@ -32,9 +35,6 @@ 
#include <android/hidl/allocator/1.0/IAllocator.h>

#include <hidlmemory/mapping.h>



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>



#define SHORT_TIMEOUT_PERIOD (1)



using ::android::sp;
@@ -94,27 +94,11 @@ class Monitor { 
    int mCount;

};



// Test environment for SoundTrigger HIDL HAL.

class SoundTriggerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static SoundTriggerHidlEnvironment* Instance() {

        static SoundTriggerHidlEnvironment* instance = new SoundTriggerHidlEnvironment;

        return instance;

    }



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



   private:

    SoundTriggerHidlEnvironment() {}

};



// The main test class for Sound Trigger HIDL HAL.

class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase {

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

   public:

    virtual void SetUp() override {

        mSoundTriggerHal = ::testing::VtsHalHidlTargetTestBase::getService<ISoundTriggerHw>(

            SoundTriggerHidlEnvironment::Instance()->getServiceName<ISoundTriggerHw>());

        mSoundTriggerHal = ISoundTriggerHw::getService(GetParam());

        ASSERT_NE(nullptr, mSoundTriggerHal.get());

        mCallback = new SoundTriggerHwCallback(*this);

        ASSERT_NE(nullptr, mCallback.get());
@@ -196,7 +180,7 @@ class SoundTriggerHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
 *  - the implementation supports at least one sound model and one key phrase

 *  - the implementation supports at least VOICE_TRIGGER recognition mode

 */

TEST_F(SoundTriggerHidlTest, GetProperties) {

TEST_P(SoundTriggerHidlTest, GetProperties) {

    ISoundTriggerHw::Properties halProperties;

    Return<void> hidlReturn;

    int ret = -ENODEV;
@@ -223,7 +207,7 @@ TEST_F(SoundTriggerHidlTest, GetProperties) { 
 * There is no way to verify that implementation actually can load a sound model because each

 * sound model is vendor specific.

 */

TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail) {

TEST_P(SoundTriggerHidlTest, LoadInvalidModelFail) {

    Return<void> hidlReturn;

    int ret = -ENODEV;

    V2_0_ISoundTriggerHw::PhraseSoundModel model;
@@ -252,7 +236,7 @@ TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail) { 
 * There is no way to verify that implementation actually can load a sound model because each

 * sound model is vendor specific.

 */

TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail_2_1) {

TEST_P(SoundTriggerHidlTest, LoadInvalidModelFail_2_1) {

    Return<void> hidlReturn;

    int ret = -ENODEV;

    ISoundTriggerHw::PhraseSoundModel model;
@@ -277,7 +261,7 @@ TEST_F(SoundTriggerHidlTest, LoadInvalidModelFail_2_1) { 
 * Verifies that:

 *  - the implementation returns an error when passed an empty sound model

 */

TEST_F(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail) {

TEST_P(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail) {

    int ret = -ENODEV;

    V2_0_ISoundTriggerHw::SoundModel model;

    SoundModelHandle handle = 0;
@@ -301,7 +285,7 @@ TEST_F(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail) { 
 * Verifies that:

 *  - the implementation returns error when passed a sound model with random data.

 */

TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail) {

TEST_P(SoundTriggerHidlTest, LoadGenericSoundModelFail) {

    int ret = -ENODEV;

    V2_0_ISoundTriggerHw::SoundModel model;

    SoundModelHandle handle = 0;
@@ -329,7 +313,7 @@ TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail) { 
 * Verifies that:

 *  - the implementation returns error when passed a sound model with random data.

 */

TEST_F(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail_2_1) {

TEST_P(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail_2_1) {

    int ret = -ENODEV;

    ISoundTriggerHw::SoundModel model;

    SoundModelHandle handle = 0;
@@ -353,7 +337,7 @@ TEST_F(SoundTriggerHidlTest, LoadEmptyGenericSoundModelFail_2_1) { 
 * Verifies that:

 *  - the implementation returns error when passed a sound model with random data.

 */

TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail_2_1) {

TEST_P(SoundTriggerHidlTest, LoadGenericSoundModelFail_2_1) {

    int ret = -ENODEV;

    ISoundTriggerHw::SoundModel model;

    SoundModelHandle handle = 0;
@@ -394,7 +378,7 @@ TEST_F(SoundTriggerHidlTest, LoadGenericSoundModelFail_2_1) { 
 *  - the implementation returns an error when called without a valid loaded sound model

 *

 */

TEST_F(SoundTriggerHidlTest, UnloadModelNoModelFail) {

TEST_P(SoundTriggerHidlTest, UnloadModelNoModelFail) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle halHandle = 0;
@@ -414,7 +398,7 @@ TEST_F(SoundTriggerHidlTest, UnloadModelNoModelFail) { 
 * There is no way to verify that implementation actually starts recognition because no model can

 * be loaded.

 */

TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail) {

TEST_P(SoundTriggerHidlTest, StartRecognitionNoModelFail) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle handle = 0;

    PhraseRecognitionExtra phrase;
@@ -444,7 +428,7 @@ TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail) { 
 * There is no way to verify that implementation actually starts recognition because no model can

 * be loaded.

 */

TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail_2_1) {

TEST_P(SoundTriggerHidlTest, StartRecognitionNoModelFail_2_1) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle handle = 0;

    PhraseRecognitionExtra phrase;
@@ -472,7 +456,7 @@ TEST_F(SoundTriggerHidlTest, StartRecognitionNoModelFail_2_1) { 
 *  - the implementation returns an error when called without an active recognition running

 *

 */

TEST_F(SoundTriggerHidlTest, StopRecognitionNoAStartFail) {

TEST_P(SoundTriggerHidlTest, StopRecognitionNoAStartFail) {

    Return<int32_t> hidlReturn(0);

    SoundModelHandle handle = 0;
@@ -489,7 +473,7 @@ TEST_F(SoundTriggerHidlTest, StopRecognitionNoAStartFail) { 
 *  - the implementation implements this optional method or indicates it is not supported by

 *  returning -ENOSYS

 */

TEST_F(SoundTriggerHidlTest, stopAllRecognitions) {

TEST_P(SoundTriggerHidlTest, stopAllRecognitions) {

    Return<int32_t> hidlReturn(0);



    hidlReturn = mSoundTriggerHal->stopAllRecognitions();
@@ -498,11 +482,7 @@ TEST_F(SoundTriggerHidlTest, stopAllRecognitions) { 
    EXPECT_TRUE(hidlReturn == 0 || hidlReturn == -ENOSYS);

}



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

    ::testing::AddGlobalTestEnvironment(SoundTriggerHidlEnvironment::Instance());

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

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

    int status = RUN_ALL_TESTS();

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

    return status;

}
 
INSTANTIATE_TEST_SUITE_P(

        PerInstance, SoundTriggerHidlTest,

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

        android::hardware::PrintInstanceNameToString);

soundtrigger/2.2/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,5 +23,5 @@ cc_test { 
        "android.hardware.soundtrigger@2.1",

        "android.hardware.soundtrigger@2.2",

    ],

    test_suites: ["general-tests"],

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

}