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

Commit 4a412790 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "Return<*> getStatus().isOk() -> isOk()"

parents 321e1b7c b6438421

audio/effect/2.0/vts/functional/audio_effect_hidl_hal_test.cpp

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ TEST_F(AudioEffectHidlTest, EnumerateEffects) { 
        retval = r;

        effectCount = result.size();

      });

  EXPECT_EQ(ret.getStatus().exceptionCode(), Status::EX_NONE);

  EXPECT_TRUE(ret.isOk());

  EXPECT_EQ(retval, Result::OK);

  EXPECT_GT(effectCount, 0u);

}
@@ -80,7 +80,7 @@ TEST_F(AudioEffectHidlTest, CreateEffect) { 
          effectUuid = result[0].uuid;

        }

      });

  ASSERT_EQ(ret.getStatus().exceptionCode(), Status::EX_NONE);

  ASSERT_TRUE(ret.isOk());

  ASSERT_TRUE(gotEffect);

  Result retval = Result::NOT_INITIALIZED;

  sp<IEffect> effect;
@@ -92,7 +92,7 @@ TEST_F(AudioEffectHidlTest, CreateEffect) { 
          effect = result;

        }

      });

  EXPECT_EQ(ret.getStatus().exceptionCode(), Status::EX_NONE);

  EXPECT_TRUE(ret.isOk());

  EXPECT_EQ(retval, Result::OK);

  EXPECT_NE(effect, nullptr);

}
@@ -105,7 +105,7 @@ TEST_F(AudioEffectHidlTest, GetDescriptor) { 
          allDescriptors = result;

        }

      });

  ASSERT_EQ(ret.getStatus().exceptionCode(), Status::EX_NONE);

  ASSERT_TRUE(ret.isOk());

  ASSERT_GT(allDescriptors.size(), 0u);

  for (size_t i = 0; i < allDescriptors.size(); ++i) {

    ret = effectsFactory->getDescriptor(
@@ -114,7 +114,7 @@ TEST_F(AudioEffectHidlTest, GetDescriptor) { 
          EXPECT_EQ(result, allDescriptors[i]);

        });

  }

  EXPECT_EQ(ret.getStatus().exceptionCode(), Status::EX_NONE);

  EXPECT_TRUE(ret.isOk());

}



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

boot/1.0/vts/functional/boot_hidl_hal_test.cpp

+7 −7
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ TEST_F(BootHidlTest, GetCurrentSlot) { 
TEST_F(BootHidlTest, MarkBootSuccessful) {

  CommandResult cr;

  Return<void> result = boot->markBootSuccessful(generate_callback(&cr));

  ASSERT_TRUE(result.getStatus().isOk());

  ASSERT_TRUE(result.isOk());

  if (cr.success) {

    Slot curSlot = boot->getCurrentSlot();

    BoolResult ret = boot->isSlotMarkedSuccessful(curSlot);
@@ -88,14 +88,14 @@ TEST_F(BootHidlTest, SetActiveBootSlot) { 
  for (Slot s = 0; s < 2; s++) {

    CommandResult cr;

    Return<void> result = boot->setActiveBootSlot(s, generate_callback(&cr));

    EXPECT_TRUE(result.getStatus().isOk());

    EXPECT_TRUE(result.isOk());

  }

  {

    CommandResult cr;

    uint32_t slots = boot->getNumberSlots();

    Return<void> result =

        boot->setActiveBootSlot(slots, generate_callback(&cr));

    ASSERT_TRUE(result.getStatus().isOk());

    ASSERT_TRUE(result.isOk());

    EXPECT_EQ(false, cr.success);

  }

}
@@ -108,7 +108,7 @@ TEST_F(BootHidlTest, SetSlotAsUnbootable) { 
    Slot otherSlot = curSlot ? 0 : 1;

    Return<void> result =

        boot->setSlotAsUnbootable(otherSlot, generate_callback(&cr));

    EXPECT_TRUE(result.getStatus().isOk());

    EXPECT_TRUE(result.isOk());

    if (cr.success) {

      EXPECT_EQ(BoolResult::FALSE, boot->isSlotBootable(otherSlot));

      boot->setActiveBootSlot(otherSlot, generate_callback(&cr));
@@ -120,7 +120,7 @@ TEST_F(BootHidlTest, SetSlotAsUnbootable) { 
    uint32_t slots = boot->getNumberSlots();

    Return<void> result =

        boot->setSlotAsUnbootable(slots, generate_callback(&cr));

    EXPECT_TRUE(result.getStatus().isOk());

    EXPECT_TRUE(result.isOk());

    EXPECT_EQ(false, cr.success);

  }

}
@@ -150,7 +150,7 @@ TEST_F(BootHidlTest, GetSuffix) { 
  for (Slot i = 0; i < 2; i++) {

    CommandResult cr;

    Return<void> result = boot->getSuffix(i, cb);

    EXPECT_TRUE(result.getStatus().isOk());

    EXPECT_TRUE(result.isOk());

    char correctSuffix[3];

    snprintf(correctSuffix, sizeof(correctSuffix), "_%c", 'a' + i);

    ASSERT_EQ(0, strcmp(suffixPtr, correctSuffix));
@@ -158,7 +158,7 @@ TEST_F(BootHidlTest, GetSuffix) { 
  {

    char emptySuffix[] = "";

    Return<void> result = boot->getSuffix(boot->getNumberSlots(), cb);

    EXPECT_TRUE(result.getStatus().isOk());

    EXPECT_TRUE(result.isOk());

    ASSERT_EQ(0, strcmp(emptySuffix, suffixPtr));

  }

}

broadcastradio/1.0/vts/functional/broadcastradio_hidl_hal_test.cpp

+11 −11
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ bool BroadcastRadioHidlTest::getProperties() 
                        }

                    });



        EXPECT_EQ(Status::EX_NONE, hidlReturn.getStatus().exceptionCode());

        EXPECT_TRUE(hidlReturn.isOk());

        EXPECT_EQ(Result::OK, halResult);

        EXPECT_EQ(Class::AM_FM, mHalProperties.classId);

        EXPECT_GT(mHalProperties.numTuners, 0u);
@@ -265,7 +265,7 @@ bool BroadcastRadioHidlTest::openTuner() 
                            mTuner = tuner;

                        }

                    });

        EXPECT_EQ(Status::EX_NONE, hidlReturn.getStatus().exceptionCode());

        EXPECT_TRUE(hidlReturn.isOk());

        EXPECT_EQ(Result::OK, halResult);

        EXPECT_EQ(true, waitForCallback(kConfigCallbacktimeoutNs));

    }
@@ -328,7 +328,7 @@ TEST_F(BroadcastRadioHidlTest, SetAndGetConfiguration) { 
    // test setConfiguration

    mCallbackCalled = false;

    Return<Result> hidlResult = mTuner->setConfiguration(mHalProperties.bands[0]);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kConfigCallbacktimeoutNs));

    EXPECT_EQ(Result::OK, mResultCallbackData);
@@ -343,7 +343,7 @@ TEST_F(BroadcastRadioHidlTest, SetAndGetConfiguration) { 
                    halConfig = config;

                }

            });

    EXPECT_EQ(Status::EX_NONE, hidlReturn.getStatus().exceptionCode());

    EXPECT_TRUE(hidlReturn.isOk());

    EXPECT_EQ(Result::OK, halResult);

    EXPECT_EQ(mHalProperties.bands[0].type, halConfig.type);

}
@@ -362,14 +362,14 @@ TEST_F(BroadcastRadioHidlTest, Scan) { 
    // test scan UP

    mCallbackCalled = false;

    Return<Result> hidlResult = mTuner->scan(Direction::UP, true);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));



    // test scan DOWN

    mCallbackCalled = false;

    hidlResult = mTuner->scan(Direction::DOWN, true);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));

}
@@ -388,14 +388,14 @@ TEST_F(BroadcastRadioHidlTest, Step) { 
    // test step UP

    mCallbackCalled = false;

    Return<Result> hidlResult = mTuner->step(Direction::UP, true);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));



    // test step DOWN

    mCallbackCalled = false;

    hidlResult = mTuner->step(Direction::DOWN, true);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));

}
@@ -426,7 +426,7 @@ TEST_F(BroadcastRadioHidlTest, TuneAndGetProgramInformationAndCancel) { 
    mCallbackCalled = false;

    mResultCallbackData = Result::NOT_INITIALIZED;

    Return<Result> hidlResult = mTuner->tune(channel, 0);

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

    EXPECT_EQ(true, waitForCallback(kTuneCallbacktimeoutNs));
@@ -440,7 +440,7 @@ TEST_F(BroadcastRadioHidlTest, TuneAndGetProgramInformationAndCancel) { 
                                    halInfo = info;

                                }

        });

    EXPECT_EQ(Status::EX_NONE, hidlReturn.getStatus().exceptionCode());

    EXPECT_TRUE(hidlReturn.isOk());

    EXPECT_EQ(Result::OK, halResult);

    if (mResultCallbackData == Result::OK) {

        EXPECT_EQ(true, halInfo.tuned);
@@ -453,7 +453,7 @@ TEST_F(BroadcastRadioHidlTest, TuneAndGetProgramInformationAndCancel) { 
    // test cancel

    mTuner->tune(lowerLimit, 0);

    hidlResult = mTuner->cancel();

    EXPECT_EQ(Status::EX_NONE, hidlResult.getStatus().exceptionCode());

    EXPECT_TRUE(hidlResult.isOk());

    EXPECT_EQ(Result::OK, hidlResult);

}

gatekeeper/1.0/vts/functional/gatekeeper_hidl_hal_test.cpp

+4 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ class GatekeeperHidlTest : public ::testing::Test { 
      auto ret = gatekeeper_->enroll(

          uid_, req.curPwdHandle, req.curPwd, req.newPwd,

          [&rsp](const GatekeeperResponse &cbRsp) { rsp = cbRsp; });

      ASSERT_TRUE(ret.getStatus().isOk());

      ASSERT_TRUE(ret.isOk());

      if (rsp.code != GatekeeperStatusCode::ERROR_RETRY_TIMEOUT) break;

      ALOGI("%s: got retry code; retrying in 1 sec", __func__);

      sleep(1);
@@ -97,7 +97,7 @@ class GatekeeperHidlTest : public ::testing::Test { 
      auto ret = gatekeeper_->verify(

          uid_, req.challenge, req.curPwdHandle, req.newPwd,

          [&rsp](const GatekeeperResponse &cb_rsp) { rsp = cb_rsp; });

      ASSERT_TRUE(ret.getStatus().isOk());

      ASSERT_TRUE(ret.isOk());

      if (rsp.code != GatekeeperStatusCode::ERROR_RETRY_TIMEOUT) break;

      ALOGI("%s: got retry code; retrying in 1 sec", __func__);

      sleep(1);
@@ -108,7 +108,7 @@ class GatekeeperHidlTest : public ::testing::Test { 
    while (true) {

      auto ret = gatekeeper_->deleteUser(

          uid_, [&rsp](const GatekeeperResponse &cb_rsp) { rsp = cb_rsp; });

      ASSERT_TRUE(ret.getStatus().isOk());

      ASSERT_TRUE(ret.isOk());

      if (rsp.code != GatekeeperStatusCode::ERROR_RETRY_TIMEOUT) break;

      ALOGI("%s: got retry code; retrying in 1 sec", __func__);

      sleep(1);
@@ -119,7 +119,7 @@ class GatekeeperHidlTest : public ::testing::Test { 
    while (true) {

      auto ret = gatekeeper_->deleteAllUsers(

          [&rsp](const GatekeeperResponse &cb_rsp) { rsp = cb_rsp; });

      ASSERT_TRUE(ret.getStatus().isOk());

      ASSERT_TRUE(ret.isOk());

      if (rsp.code != GatekeeperStatusCode::ERROR_RETRY_TIMEOUT) break;

      ALOGI("%s: got retry code; retrying in 1 sec", __func__);

      sleep(1);

graphics/allocator/2.0/vts/functional/graphics_allocator_hidl_hal_test.cpp

+13 −13
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ TEST_F(GraphicsAllocatorHidlTest, GetCapabilities) { 
    }

  });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

}



TEST_F(GraphicsAllocatorHidlTest, DumpDebugInfo) {
@@ -137,7 +137,7 @@ TEST_F(GraphicsAllocatorHidlTest, DumpDebugInfo) { 
    // nothing to do

  });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

}



TEST_F(GraphicsAllocatorHidlTest, CreateDestroyDescriptor) {
@@ -150,11 +150,11 @@ TEST_F(GraphicsAllocatorHidlTest, CreateDestroyDescriptor) { 
        descriptor = tmpDescriptor;

      });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

  ASSERT_EQ(Error::NONE, error);



  auto err_ret = mClient->destroyDescriptor(descriptor);

  ASSERT_TRUE(err_ret.getStatus().isOk());

  ASSERT_TRUE(err_ret.isOk());

  ASSERT_EQ(Error::NONE, static_cast<Error>(err_ret));

}
@@ -172,7 +172,7 @@ TEST_F(GraphicsAllocatorHidlTest, TestAllocateBasic) { 
  descriptors[0] = descriptor;



  auto ret = mClient->testAllocate(descriptors);

  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());



  auto error = static_cast<Error>(ret);

  ASSERT_TRUE(error == Error::NONE || error == Error::NOT_SHARED);
@@ -193,7 +193,7 @@ TEST_F(GraphicsAllocatorHidlTest, TestAllocateArray) { 
  descriptors[1] = descriptor;



  auto ret = mClient->testAllocate(descriptors);

  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());



  auto error = static_cast<Error>(ret);

  ASSERT_TRUE(error == Error::NONE || error == Error::NOT_SHARED);
@@ -218,13 +218,13 @@ TEST_F(GraphicsAllocatorHidlTest, AllocateFreeBasic) { 
        buffers = tmpBuffers;

      });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

  ASSERT_TRUE(error == Error::NONE || error == Error::NOT_SHARED);

  EXPECT_EQ(1u, buffers.size());



  if (!buffers.empty()) {

    auto err_ret = mClient->free(buffers[0]);

    EXPECT_TRUE(err_ret.getStatus().isOk());

    EXPECT_TRUE(err_ret.isOk());

    EXPECT_EQ(Error::NONE, static_cast<Error>(err_ret));

  }

}
@@ -253,13 +253,13 @@ TEST_F(GraphicsAllocatorHidlTest, AllocateFreeArray) { 
        buffers = tmpBuffers;

      });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

  ASSERT_TRUE(error == Error::NONE || error == Error::NOT_SHARED);

  EXPECT_EQ(descriptors.size(), buffers.size());



  for (auto buf : buffers) {

    auto err_ret = mClient->free(buf);

    EXPECT_TRUE(err_ret.getStatus().isOk());

    EXPECT_TRUE(err_ret.isOk());

    EXPECT_EQ(Error::NONE, static_cast<Error>(err_ret));

  }

}
@@ -280,18 +280,18 @@ TEST_F(GraphicsAllocatorHidlTest, ExportHandle) { 
        buffers = tmpBuffers;

      });



  ASSERT_TRUE(ret.getStatus().isOk());

  ASSERT_TRUE(ret.isOk());

  ASSERT_TRUE(error == Error::NONE || error == Error::NOT_SHARED);

  ASSERT_EQ(1u, buffers.size());



  ret = mClient->exportHandle(

      descriptors[0], buffers[0],

      [&](const auto& tmpError, const auto&) { error = tmpError; });

  EXPECT_TRUE(ret.getStatus().isOk());

  EXPECT_TRUE(ret.isOk());

  EXPECT_EQ(Error::NONE, error);



  auto err_ret = mClient->free(buffers[0]);

  EXPECT_TRUE(err_ret.getStatus().isOk());

  EXPECT_TRUE(err_ret.isOk());

  EXPECT_EQ(Error::NONE, static_cast<Error>(err_ret));

}