Commit d04a70e6 authored by Amr Aboelkher's avatar Amr Aboelkher Committed by Chromium LUCI CQ

PSM: Add helper functions to assign the PSM responses

The PSM RLWE OPRF/Query response will be assigned to the
DeviceManagementResponse in several places after providing the
mocked async replies from the server. Thus, this CL is providing
helper functions to assign these replies accordingly.

The async replies will be used to mock the behaviour when the PSM is
in progress and OnConnectionChanged has been triggered, which will
trigger RetryStep again. That will be needed due to a bug that shows
that both protocols will be executed at the same time, instead of
waiting until PSM finishes. Its fix, along with tests will be
uploaded in another CL.

BUG=chromium:1156119

Change-Id: I0e333987c63eac161437a0853049e015d10a7ace
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2577496Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarRoland Bock <rbock@google.com>
Reviewed-by: default avatarPavol Marko <pmarko@chromium.org>
Commit-Queue: Amr Aboelkher <amraboelkher@google.com>
Cr-Commit-Position: refs/heads/master@{#834973}
parent e6e87967
...@@ -1369,26 +1369,16 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1369,26 +1369,16 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
} }
void ServerWillReplyWithPrivateSetMembershipOprfResponse() { void ServerWillReplyWithPrivateSetMembershipOprfResponse() {
em::DeviceManagementResponse response; em::DeviceManagementResponse response =
em::PrivateSetMembershipResponse* private_set_membership_response = GetPrivateSetMembershipOprfResponse();
response.mutable_private_set_membership_response();
*private_set_membership_response->mutable_rlwe_response()
->mutable_oprf_response() =
private_set_membership_test_case_.oprf_response();
ServerWillReplyForPrivateSetMembership( ServerWillReplyForPrivateSetMembership(
net::OK, DeviceManagementService::kSuccess, response); net::OK, DeviceManagementService::kSuccess, response);
} }
void ServerWillReplyWithPrivateSetMembershipQueryResponse() { void ServerWillReplyWithPrivateSetMembershipQueryResponse() {
em::DeviceManagementResponse response; em::DeviceManagementResponse response =
em::PrivateSetMembershipResponse* private_set_membership_response = GetPrivateSetMembershipQueryResponse();
response.mutable_private_set_membership_response();
*private_set_membership_response->mutable_rlwe_response()
->mutable_query_response() =
private_set_membership_test_case_.query_response();
ServerWillReplyForPrivateSetMembership( ServerWillReplyForPrivateSetMembership(
net::OK, DeviceManagementService::kSuccess, response); net::OK, DeviceManagementService::kSuccess, response);
...@@ -1421,12 +1411,13 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1421,12 +1411,13 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
.RetiresOnSaturation(); .RetiresOnSaturation();
} }
const em::PrivateSetMembershipRequest& private_set_membership_request() { const em::PrivateSetMembershipRequest& private_set_membership_request()
const {
return private_set_membership_last_request_ return private_set_membership_last_request_
.private_set_membership_request(); .private_set_membership_request();
} }
StateDiscoveryResult GetStateDiscoveryResult() { StateDiscoveryResult GetStateDiscoveryResult() const {
const base::Value* device_state_value = const base::Value* device_state_value =
local_state_->GetUserPref(prefs::kShouldRetrieveDeviceState); local_state_->GetUserPref(prefs::kShouldRetrieveDeviceState);
if (!device_state_value) if (!device_state_value)
...@@ -1438,7 +1429,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1438,7 +1429,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
// Returns the expected membership result for the current private set // Returns the expected membership result for the current private set
// membership test case. // membership test case.
bool GetExpectedMembershipResult() { bool GetExpectedMembershipResult() const {
return private_set_membership_test_case_.is_positive_membership_expected(); return private_set_membership_test_case_.is_positive_membership_expected();
} }
...@@ -1457,7 +1448,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1457,7 +1448,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
// Expects a sample for kUMAPrivateSetMembershipSuccessTime to be recorded // Expects a sample for kUMAPrivateSetMembershipSuccessTime to be recorded
// |count| times. // |count| times.
void ExpectPrivateSetMembershipSuccessTimeRecorded(int count) { void ExpectPrivateSetMembershipSuccessTimeRecorded(int count) const {
histogram_tester_.ExpectTotalCount(kUMAPrivateSetMembershipSuccessTime, histogram_tester_.ExpectTotalCount(kUMAPrivateSetMembershipSuccessTime,
count); count);
} }
...@@ -1465,19 +1456,19 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1465,19 +1456,19 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
// Expects a sample for kUMAPrivateSetMembershipHashDanceComparison to be // Expects a sample for kUMAPrivateSetMembershipHashDanceComparison to be
// recorded once with value |comparison|. // recorded once with value |comparison|.
void ExpectPrivateSetMembershipHashDanceComparisonRecorded( void ExpectPrivateSetMembershipHashDanceComparisonRecorded(
PrivateSetMembershipHashDanceComparison comparison) { PrivateSetMembershipHashDanceComparison comparison) const {
histogram_tester_.ExpectUniqueSample( histogram_tester_.ExpectUniqueSample(
kUMAPrivateSetMembershipHashDanceComparison, comparison, kUMAPrivateSetMembershipHashDanceComparison, comparison,
/*expected_count=*/1); /*expected_count=*/1);
} }
void VerifyPrivateSetMembershipLastRequestJobType() { void VerifyPrivateSetMembershipLastRequestJobType() const {
EXPECT_EQ(DeviceManagementService::JobConfiguration:: EXPECT_EQ(DeviceManagementService::JobConfiguration::
TYPE_PSM_HAS_DEVICE_STATE_REQUEST, TYPE_PSM_HAS_DEVICE_STATE_REQUEST,
private_set_membership_last_job_type_); private_set_membership_last_job_type_);
} }
void VerifyPrivateSetMembershipRlweOprfRequest() { void VerifyPrivateSetMembershipRlweOprfRequest() const {
EXPECT_EQ(private_set_membership_test_case_.expected_oprf_request() EXPECT_EQ(private_set_membership_test_case_.expected_oprf_request()
.SerializeAsString(), .SerializeAsString(),
private_set_membership_request() private_set_membership_request()
...@@ -1486,7 +1477,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1486,7 +1477,7 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
.SerializeAsString()); .SerializeAsString());
} }
void VerifyPrivateSetMembershipRlweQueryRequest() { void VerifyPrivateSetMembershipRlweQueryRequest() const {
EXPECT_EQ(private_set_membership_test_case_.expected_query_request() EXPECT_EQ(private_set_membership_test_case_.expected_query_request()
.SerializeAsString(), .SerializeAsString(),
private_set_membership_request() private_set_membership_request()
...@@ -1502,6 +1493,28 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest { ...@@ -1502,6 +1493,28 @@ class PrivateSetMembershipHelperTest : public AutoEnrollmentClientImplTest {
const PrivateSetMembershipHelperTest&) = delete; const PrivateSetMembershipHelperTest&) = delete;
private: private:
em::DeviceManagementResponse GetPrivateSetMembershipOprfResponse() const {
em::DeviceManagementResponse response;
em::PrivateSetMembershipResponse* private_set_membership_response =
response.mutable_private_set_membership_response();
*private_set_membership_response->mutable_rlwe_response()
->mutable_oprf_response() =
private_set_membership_test_case_.oprf_response();
return response;
}
em::DeviceManagementResponse GetPrivateSetMembershipQueryResponse() const {
em::DeviceManagementResponse response;
em::PrivateSetMembershipResponse* private_set_membership_response =
response.mutable_private_set_membership_response();
*private_set_membership_response->mutable_rlwe_response()
->mutable_query_response() =
private_set_membership_test_case_.query_response();
return response;
}
psm_rlwe::PrivateMembershipRlweClientRegressionTestData::TestCase psm_rlwe::PrivateMembershipRlweClientRegressionTestData::TestCase
private_set_membership_test_case_; private_set_membership_test_case_;
DeviceManagementService::JobConfiguration::JobType DeviceManagementService::JobConfiguration::JobType
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment