Merge changes from topic "sp14-ipahal" am: d202400f63 am: 05daef03ec am:... (f9859e98) · Commits · e / os / android_hardware_interfaces

tetheroffload/control/1.0/vts/functional/OffloadControlTestBase.cpp

+0 −23

Original line number	Diff line number	Diff line
		@@ -53,29 +53,6 @@ void OffloadControlTestBase::setupConfigHal() {
		ASSERT_TRUE(ret.isOk());
		}

		void OffloadControlTestBase::prepareControlHal() {
		control = createControl(std::get<1>(GetParam()));
		ASSERT_NE(nullptr, control.get()) << "Could not get HIDL instance";

		control_cb = new TetheringOffloadCallback();
		ASSERT_NE(nullptr, control_cb.get()) << "Could not get get offload callback";
		}

		void OffloadControlTestBase::initOffload(const bool expected_result) {
		auto init_cb = [&](bool success, std::string errMsg) {
		std::string msg = StringPrintf("Unexpectedly %s to init offload: %s",
		success ? "succeeded" : "failed", errMsg.c_str());
		ASSERT_EQ(expected_result, success) << msg;
		};
		const Return<void> ret = control->initOffload(control_cb, init_cb);
		ASSERT_TRUE(ret.isOk());
		}

		void OffloadControlTestBase::setupControlHal() {
		prepareControlHal();
		initOffload(true);
		}

		void OffloadControlTestBase::stopOffload(const ExpectBoolean value) {
		auto cb = [&](bool success, const hidl_string& errMsg) {
		switch (value) {

tetheroffload/control/1.0/vts/functional/include/OffloadControlTestBase.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -70,11 +70,14 @@ class OffloadControlTestBase : public testing::TestWithParam<std::tuple<std::str
		// class just setup everything correctly and verify basic readiness.
		void setupConfigHal();

		void prepareControlHal();
		virtual void prepareControlHal() = 0;

		void initOffload(const bool expected_result);
		virtual void initOffload(const bool expected_result) = 0;

		void setupControlHal();
		void setupControlHal() {
		prepareControlHal();
		initOffload(true);
		};

		void stopOffload(const ExpectBoolean value);

tetheroffload/control/1.0/vts/functional/include/OffloadControlTestV1_0.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,24 @@ class OffloadControlTestV1_0_HalNotStarted : public OffloadControlTestBase {
		return android::hardware::tetheroffload::control::V1_0::IOffloadControl::getService(
		serviceName);
		}

		virtual void prepareControlHal() override {
		control = createControl(std::get<1>(GetParam()));
		ASSERT_NE(nullptr, control.get()) << "Could not get HIDL instance";

		control_cb = new TetheringOffloadCallback();
		ASSERT_NE(nullptr, control_cb.get()) << "Could not get get offload callback";
		}

		virtual void initOffload(const bool expected_result) override {
		auto init_cb = [&](bool success, std::string errMsg) {
		std::string msg = StringPrintf("Unexpectedly %s to init offload: %s",
		success ? "succeeded" : "failed", errMsg.c_str());
		ASSERT_EQ(expected_result, success) << msg;
		};
		const Return<void> ret = control->initOffload(control_cb, init_cb);
		ASSERT_TRUE(ret.isOk());
		}
		};

		class OffloadControlTestV1_0_HalStarted : public OffloadControlTestV1_0_HalNotStarted {

tetheroffload/control/1.1/vts/functional/include/OffloadControlTestV1_1.h

+57 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,15 @@

		#include <OffloadControlTestV1_0.h>
		#include <android/hardware/tetheroffload/control/1.1/IOffloadControl.h>
		#include <android/hardware/tetheroffload/control/1.1/ITetheringOffloadCallback.h>
		#include <gtest/gtest.h>

		constexpr char kCallbackOnEvent_1_1[] = "onEvent_1_1";

		class TetheringOffloadCallbackArgsV1_1 {
		public:
		android::hardware::tetheroffload::control::V1_1::OffloadCallbackEvent last_event;
		};

		class OffloadControlTestV1_1_HalNotStarted : public OffloadControlTestV1_0_HalNotStarted {
		public:
		@@ -25,14 +34,60 @@ class OffloadControlTestV1_1_HalNotStarted : public OffloadControlTestV1_0_HalNo
		const std::string& serviceName) override {
		return android::hardware::tetheroffload::control::V1_1::IOffloadControl::getService(
		serviceName);
		}
		};

		void prepareControlHal() override {
		control = createControl(std::get<1>(GetParam()));
		ASSERT_NE(nullptr, control.get()) << "Could not get HIDL instance";

		control_cb_1_1 = new TetheringOffloadCallbackV1_1();
		ASSERT_NE(nullptr, control_cb_1_1.get()) << "Could not get offload callback";
		};

		void initOffload(const bool expected_result) override {
		auto init_cb = [&](bool success, std::string errMsg) {
		std::string msg = StringPrintf("Unexpectedly %s to init offload: %s",
		success ? "succeeded" : "failed", errMsg.c_str());
		ASSERT_EQ(expected_result, success) << msg;
		};
		auto control = getControlV1_1();
		ASSERT_NE(control, nullptr);
		const Return<void> ret = control->initOffload(control_cb_1_1, init_cb);
		ASSERT_TRUE(ret.isOk());
		};

		sp<android::hardware::tetheroffload::control::V1_1::IOffloadControl> getControlV1_1() {
		// The cast is safe since only devices with V1.1+ HAL will be enumerated and pass in to the
		// test.
		return android::hardware::tetheroffload::control::V1_1::IOffloadControl::castFrom(control)
		.withDefault(nullptr);
		}
		};

		// Callback class for both new events.
		class TetheringOffloadCallbackV1_1
		: public testing::VtsHalHidlTargetCallbackBase<TetheringOffloadCallbackArgsV1_1>,
		public android::hardware::tetheroffload::control::V1_1::ITetheringOffloadCallback {
		public:
		Return<void> onEvent_1_1(
		android::hardware::tetheroffload::control::V1_1::OffloadCallbackEvent event)
		override {
		const TetheringOffloadCallbackArgsV1_1 args{.last_event = event};
		NotifyFromCallback(kCallbackOnEvent_1_1, args);
		return Void();
		};

		Return<void> onEvent([[maybe_unused]] OffloadCallbackEvent event) override {
		// Tested only in IOffloadControl 1.0.
		return Void();
		};

		Return<void> updateTimeout([[maybe_unused]] const NatTimeoutUpdate& params) override {
		// Tested only in IOffloadControl 1.0.
		return Void();
		};
		};

		sp<TetheringOffloadCallbackV1_1> control_cb_1_1;
		};

		class OffloadControlTestV1_1_HalStarted : public OffloadControlTestV1_1_HalNotStarted {