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

Commit 4cf8cc03 authored by Zhuoyao Zhang's avatar Zhuoyao Zhang Committed by android-build-merger
Browse files

Merge "Update vts test to use the updated test template." into oc-mr1-dev 

am: 69270ce3

Change-Id: I6c34ee4d363c3d485abc8e71d938c1e3a98e6f51
parents 87b997de 69270ce3

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+2 −5
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ using ::android::hardware::kSynchronizedReadWrite; 
using ResultMetadataQueue = MessageQueue<uint8_t, kSynchronizedReadWrite>;

using ::android::hidl::manager::V1_0::IServiceManager;



const char *kProviderFQName = "android.hardware.camera.provider@2.4::ICameraProvider";

const uint32_t kMaxPreviewWidth = 1920;

const uint32_t kMaxPreviewHeight = 1080;

const uint32_t kMaxVideoWidth = 4096;
@@ -243,9 +242,7 @@ class CameraHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { 


    virtual void HidlTearDown() override { ALOGI("TearDown CameraHidlEnvironment"); }



    virtual void registerTestServices() override {

        registerTestService("android.hardware.camera.provider", "2.4", "ICameraProvider");

    }

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



   private:

    CameraHidlEnvironment() {}
@@ -496,7 +493,7 @@ Return<Status> PreviewWindowCb::setTimestamp(int64_t timestamp) { 
class CameraHidlTest : public ::testing::VtsHalHidlTargetTestBase {

public:

 virtual void SetUp() override {

     string service_name = CameraHidlEnvironment::Instance()->getServiceName(kProviderFQName);

     string service_name = CameraHidlEnvironment::Instance()->getServiceName<ICameraProvider>();

     ALOGI("get service with name: %s", service_name.c_str());

     mProvider = ::testing::VtsHalHidlTargetTestBase::getService<ICameraProvider>(service_name);

     ASSERT_NE(mProvider, nullptr);

graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp

+28 −9
Original line number Diff line number Diff line
@@ -50,10 +50,29 @@ using android::hardware::graphics::mapper::V2_0::IMapper; 
using android::hardware::graphics::mapper::V2_0::tests::Gralloc;

using GrallocError = android::hardware::graphics::mapper::V2_0::Error;



// Test environment for graphics.composer

class GraphicsComposerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:

    // get the test environment singleton

    static GraphicsComposerHidlEnvironment* Instance() {

        static GraphicsComposerHidlEnvironment* instance = new GraphicsComposerHidlEnvironment;

        return instance;

    }



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



   private:

    GraphicsComposerHidlEnvironment() {}



    GTEST_DISALLOW_COPY_AND_ASSIGN_(GraphicsComposerHidlEnvironment);

};



class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase {

 protected:

  void SetUp() override {

    ASSERT_NO_FATAL_FAILURE(mComposer = std::make_unique<Composer>());

      ASSERT_NO_FATAL_FAILURE(

          mComposer = std::make_unique<Composer>(

              GraphicsComposerHidlEnvironment::Instance()->getServiceName<IComposer>()));

      ASSERT_NO_FATAL_FAILURE(mComposerClient = mComposer->createClient());



      mComposerCallback = new GraphicsComposerCallback;

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworksV1_0TargetTest.cpp

+3 −5
Original line number Diff line number Diff line
@@ -40,15 +40,13 @@ NeuralnetworksHidlEnvironment* NeuralnetworksHidlEnvironment::getInstance() { 
}



void NeuralnetworksHidlEnvironment::registerTestServices() {

    registerTestService("android.hardware.neuralnetworks", "1.0", "IDevice");

    registerTestService<IDevice>();

}



// The main test class for NEURALNETWORK HIDL HAL.

void NeuralnetworksHidlTest::SetUp() {

    std::string instance =

        NeuralnetworksHidlEnvironment::getInstance()->getServiceName(IDevice::descriptor);

    LOG(INFO) << "running vts test with instance: " << instance;

    device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(instance);

    device = ::testing::VtsHalHidlTargetTestBase::getService<IDevice>(

        NeuralnetworksHidlEnvironment::getInstance());

    ASSERT_NE(nullptr, device.get());

}