Skip to content

Commit dda39a0

Browse files
committed
Update tests
1 parent 478b162 commit dda39a0

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

tests/test_dashboard_client.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ TEST_F(DashboardClientTest, run_program)
147147
return DashboardResponse{ true, "Program loaded: " + str, { { "program_name", str } } };
148148
});
149149
EXPECT_CALL(*impl, commandPowerOn(std::chrono::duration<double>(1))).WillOnce(testing::Return(SUCCESS_RESPONSE));
150-
EXPECT_CALL(*impl, commandClosePopup()).Times(2).WillRepeatedly(testing::Return(SUCCESS_RESPONSE));
151150
EXPECT_CALL(*impl, commandPlay()).Times(2).WillRepeatedly(testing::Return(SUCCESS_RESPONSE));
152151
EXPECT_CALL(*impl, commandPowerOff()).Times(2).WillRepeatedly(testing::Return(SUCCESS_RESPONSE));
153152
EXPECT_CALL(*impl, commandBrakeRelease()).WillOnce(testing::Return(SUCCESS_RESPONSE));
@@ -174,7 +173,6 @@ TEST_F(DashboardClientTest, run_program)
174173

175174
EXPECT_TRUE(dashboard_client_->commandLoadProgram("wait_program.urp"));
176175
EXPECT_TRUE(dashboard_client_->commandPowerOff());
177-
dashboard_client_->commandClosePopup(); // Necessary for CB3 test
178176
EXPECT_TRUE(dashboard_client_->commandPowerOn(std::chrono::duration<double>(1)));
179177
EXPECT_TRUE(dashboard_client_->commandBrakeRelease());
180178
EXPECT_TRUE(dashboard_client_->commandPlay());
@@ -184,7 +182,6 @@ TEST_F(DashboardClientTest, run_program)
184182
EXPECT_TRUE(dashboard_client_->commandStop());
185183
EXPECT_FALSE(dashboard_client_->commandRunning());
186184
EXPECT_TRUE(dashboard_client_->commandPowerOff());
187-
dashboard_client_->commandClosePopup(); // Necessary for CB3 test
188185
EXPECT_TRUE(dashboard_client_->commandIsProgramSaved());
189186
EXPECT_TRUE(dashboard_client_->commandQuit());
190187
EXPECT_TRUE(dashboard_client_->commandShutdown());
@@ -352,4 +349,4 @@ int main(int argc, char* argv[])
352349
urcl::setLogLevel(urcl::LogLevel::DEBUG);
353350

354351
return RUN_ALL_TESTS();
355-
}
352+
}

tests/test_dashboard_client_g5.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ TEST_F(DashboardClientTestG5, load_installation)
133133
DashboardResponse response;
134134
response = dashboard_client_->commandLoadInstallation("default.installation");
135135
ASSERT_TRUE(response.ok);
136+
ASSERT_EQ(std::get<std::string>(response.data["installation_name"]), "default.installation");
136137
}
137138

138139
TEST_F(DashboardClientTestG5, not_connected)
@@ -618,4 +619,4 @@ int main(int argc, char* argv[])
618619
}
619620

620621
return RUN_ALL_TESTS();
621-
}
622+
}

0 commit comments

Comments
 (0)