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

Commit 43d7498d authored by Tony Mak's avatar Tony Mak
Browse files

Revert "Update vts test to use the updated test template." 

This reverts commit d71b654d.

Reason for revert: It breaks some targets in master
                   Example error: https://android-build.googleplex.com/builds/submitted/4303994/sailfish-userdebug_fastbuild3_linux/latest/view/logs/build_error.log

Change-Id: I63a90318bde8869972a8fc4b9a2cc36db26037f5
parent d71b654d

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

+5 −2
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 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;
@@ -242,7 +243,9 @@ class CameraHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase { 


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



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

    virtual void registerTestServices() override {

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

    }



   private:

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

public:

 virtual void SetUp() override {

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

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

     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

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 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;



const char* kHalFQName = "android.hardware.graphics.composer@2.1::IComposer";



// Test environment for graphics.composer

class GraphicsComposerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEnvBase {

   public:
@@ -60,7 +62,7 @@ class GraphicsComposerHidlEnvironment : public ::testing::VtsHalHidlTargetTestEn 
        return instance;

    }



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

    virtual void registerTestServices() override { registerTestService(kHalFQName); }



   private:

    GraphicsComposerHidlEnvironment() {}
@@ -73,7 +75,7 @@ class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
  void SetUp() override {

      ASSERT_NO_FATAL_FAILURE(

          mComposer = std::make_unique<Composer>(

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

              GraphicsComposerHidlEnvironment::Instance()->getServiceName(kHalFQName)));

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



      mComposerCallback = new GraphicsComposerCallback;

neuralnetworks/1.0/vts/functional/VtsHalNeuralnetworksV1_0TargetTest.cpp

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



void NeuralnetworksHidlEnvironment::registerTestServices() {

    registerTestService<IDevice>();

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

}



// The main test class for NEURALNETWORK HIDL HAL.

void NeuralnetworksHidlTest::SetUp() {

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

        NeuralnetworksHidlEnvironment::getInstance());

    std::string instance =

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

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

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

    ASSERT_NE(nullptr, device.get());

}