Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/battor_agent/battor_agent_unittest.cc

Issue 1567683002: Makes the BattOrConnection read messages instead of bytes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« tools/battor_agent/battor_agent.cc ('K') | « tools/battor_agent/battor_agent.cc ('k') | tools/battor_agent/battor_connection.h » ('j') | tools/battor_agent/battor_connection_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/battor_agent/battor_agent_unittest.cc
diff --git a/tools/battor_agent/battor_agent_unittest.cc b/tools/battor_agent/battor_agent_unittest.cc
index 4157119643eb722e39daeee9307aba106b40c148..e7b0a9a8e2cf02e096c5b3e1ca21609b36462525 100644
--- a/tools/battor_agent/battor_agent_unittest.cc
+++ b/tools/battor_agent/battor_agent_unittest.cc
@@ -50,7 +50,7 @@ class MockBattOrConnection : public BattOrConnection {
void(BattOrMessageType type,
const void* buffer,
size_t bytes_to_send));
- MOCK_METHOD1(ReadBytes, void(size_t bytes_to_read));
+ MOCK_METHOD1(ReadMessage, void(size_t bytes_to_read));
MOCK_METHOD0(Flush, void());
private:
@@ -128,8 +128,8 @@ class BattOrAgentTest : public testing::Test, public BattOrAgent::Listener {
if (end_state == BattOrAgentState::INIT_SENT)
return;
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kInitAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kInitAck));
GetTaskRunner()->RunUntilIdle();
if (end_state == BattOrAgentState::INIT_ACKED)
@@ -141,8 +141,8 @@ class BattOrAgentTest : public testing::Test, public BattOrAgent::Listener {
if (end_state == BattOrAgentState::SET_GAIN_SENT)
return;
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kSetGainAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kSetGainAck));
GetTaskRunner()->RunUntilIdle();
if (end_state == BattOrAgentState::GAIN_ACKED)
@@ -158,8 +158,8 @@ class BattOrAgentTest : public testing::Test, public BattOrAgent::Listener {
// state machine.
DCHECK(end_state == BattOrAgentState::START_TRACING_COMPLETE);
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kStartTracingAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kStartTracingAck));
GetTaskRunner()->RunUntilIdle();
}
@@ -201,7 +201,7 @@ TEST_F(BattOrAgentTest, StartTracing) {
SendBytes(BATTOR_MESSAGE_TYPE_CONTROL,
BufferEq(&init_msg, sizeof(init_msg)), sizeof(init_msg)));
- EXPECT_CALL(*GetAgent()->GetConnection(), ReadBytes(sizeof(kInitAck)));
+ EXPECT_CALL(*GetAgent()->GetConnection(), ReadMessage(sizeof(kInitAck)));
BattOrControlMessage set_gain_msg{BATTOR_CONTROL_MESSAGE_TYPE_SET_GAIN,
BATTOR_GAIN_LOW, 0};
@@ -210,7 +210,7 @@ TEST_F(BattOrAgentTest, StartTracing) {
BufferEq(&set_gain_msg, sizeof(set_gain_msg)),
sizeof(set_gain_msg)));
- EXPECT_CALL(*GetAgent()->GetConnection(), ReadBytes(sizeof(kSetGainAck)));
+ EXPECT_CALL(*GetAgent()->GetConnection(), ReadMessage(sizeof(kSetGainAck)));
BattOrControlMessage start_tracing_msg{
BATTOR_CONTROL_MESSAGE_TYPE_START_SAMPLING_SD, 0, 0};
@@ -220,7 +220,7 @@ TEST_F(BattOrAgentTest, StartTracing) {
sizeof(start_tracing_msg)));
EXPECT_CALL(*GetAgent()->GetConnection(),
- ReadBytes(sizeof(kStartTracingAck)));
+ ReadMessage(sizeof(kStartTracingAck)));
RunStartTracingTo(BattOrAgentState::START_TRACING_COMPLETE);
EXPECT_TRUE(IsStartTracingComplete());
@@ -258,7 +258,7 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfInitSendFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfInitAckReadFails) {
RunStartTracingTo(BattOrAgentState::INIT_SENT);
- GetAgent()->OnBytesRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
+ GetAgent()->OnMessageRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
@@ -267,8 +267,8 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfInitAckReadFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfInitWrongAckRead) {
RunStartTracingTo(BattOrAgentState::INIT_SENT);
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kStartTracingAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kStartTracingAck));
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
@@ -286,7 +286,7 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfSetGainSendFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfSetGainAckReadFails) {
RunStartTracingTo(BattOrAgentState::SET_GAIN_SENT);
- GetAgent()->OnBytesRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
+ GetAgent()->OnMessageRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
@@ -295,8 +295,8 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfSetGainAckReadFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfSetGainWrongAckRead) {
RunStartTracingTo(BattOrAgentState::SET_GAIN_SENT);
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kStartTracingAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kStartTracingAck));
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
@@ -314,7 +314,7 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfStartTracingSendFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfStartTracingAckReadFails) {
RunStartTracingTo(BattOrAgentState::START_TRACING_SENT);
- GetAgent()->OnBytesRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
+ GetAgent()->OnMessageRead(false, BATTOR_MESSAGE_TYPE_CONTROL_ACK, nullptr);
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
@@ -323,8 +323,8 @@ TEST_F(BattOrAgentTest, StartTracingFailsIfStartTracingAckReadFails) {
TEST_F(BattOrAgentTest, StartTracingFailsIfStartTracingWrongAckRead) {
RunStartTracingTo(BattOrAgentState::START_TRACING_SENT);
- GetAgent()->OnBytesRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
- AckToCharVector(kInitAck));
+ GetAgent()->OnMessageRead(true, BATTOR_MESSAGE_TYPE_CONTROL_ACK,
+ AckToCharVector(kInitAck));
GetTaskRunner()->RunUntilIdle();
EXPECT_TRUE(IsStartTracingComplete());
« tools/battor_agent/battor_agent.cc ('K') | « tools/battor_agent/battor_agent.cc ('k') | tools/battor_agent/battor_connection.h » ('j') | tools/battor_agent/battor_connection_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698