diff --git a/sharing/outgoing_share_session_test.cc b/sharing/outgoing_share_session_test.cc index 5c565963..cd633701 100644 --- a/sharing/outgoing_share_session_test.cc +++ b/sharing/outgoing_share_session_test.cc @@ -526,6 +526,7 @@ TEST_F(OutgoingShareSessionTest, AcceptTransferNotConnected) { TEST_F(OutgoingShareSessionTest, AcceptTransferNotReady) { FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); EXPECT_THAT( @@ -631,6 +632,7 @@ TEST_F(OutgoingShareSessionTest, HandleConnectionResponseAcceptResponse) { ConnectionResponseFrame response; response.set_status(ConnectionResponseFrame::ACCEPT); FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); EXPECT_CALL(transfer_metadata_callback_, Call(_, HasStatus(TransferMetadata::Status::kInProgress))); @@ -815,6 +817,7 @@ TEST_F(OutgoingShareSessionTest, SendNextPayload) { TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultFail) { FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); session_.SetTokenForTests("1234"); @@ -830,6 +833,7 @@ TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultFail) { TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultSuccess) { FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); session_.SetTokenForTests("1234"); @@ -845,6 +849,7 @@ TEST_F(OutgoingShareSessionTest, ProcessKeyVerificationResultSuccess) { TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataReceiverDisconnect) { FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); TransferMetadata complete_metadata = TransferMetadataBuilder() @@ -862,6 +867,7 @@ TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataReceiverDisconnect) { TEST_F(OutgoingShareSessionTest, DelayCompleteMetadataDisconnectTimeout) { FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); TransferMetadata complete_metadata = TransferMetadataBuilder() @@ -907,6 +913,7 @@ TEST_F(OutgoingShareSessionTest, UpdateSessionForDedupWithoutCertificate) { TEST_F(OutgoingShareSessionTest, UpdateSessionForDedupConnectedIsNoOp) { auto share_target_org = session_.share_target(); FakeNearbyConnection connection; + session_.set_session_id(1234); ConnectionSuccess(&connection); ShareTarget share_target2{ "test_update_name", ::nearby::network::Url(), ShareTargetType::kPhone, diff --git a/sharing/share_session.h b/sharing/share_session.h index 2c6f1aac..d3d0d68b 100644 --- a/sharing/share_session.h +++ b/sharing/share_session.h @@ -191,7 +191,7 @@ class ShareSession { std::shared_ptr frames_reader_; std::shared_ptr key_verification_runner_; std::shared_ptr payload_tracker_; - int64_t session_id_; + int64_t session_id_ = 0; ::location::nearby::proto::sharing::OSType os_type_ = ::location::nearby::proto::sharing::OSType::UNKNOWN_OS_TYPE; bool self_share_ = false;