Isolate tests from rootcanal library
- Try to fix netsim-test flakiness in mac and windows build
- Modify tests to not call rootcanal library
- Skip tests that call rootcanal library
Test: ninja
Change-Id: Ic3a6d7b66f7bfe13550692865d85dd58089022f6
diff --git a/src/controller/scene_controller_test.cc b/src/controller/scene_controller_test.cc
index c398e50..be62dd8 100644
--- a/src/controller/scene_controller_test.cc
+++ b/src/controller/scene_controller_test.cc
@@ -20,7 +20,6 @@
#include "controller/controller.h"
#include "controller/device.h"
#include "gtest/gtest.h"
-#include "hci/bluetooth_facade.h"
#include "model.pb.h"
namespace netsim {
@@ -28,8 +27,6 @@
class SceneControllerTest : public ::testing::Test {
protected:
- void SetUp() override { netsim::hci::facade::Start(); }
- void TearDown() { netsim::hci::facade::Stop(); }
std::shared_ptr<Device> match(const std::string &name) {
return SceneController::Singleton().MatchDevice(name);
}
@@ -45,7 +42,7 @@
auto guid = "guid-SceneControllerTest-AddChipTest";
auto device_name = "device_name-SceneControllerTest-AddChipTest";
auto [device_id, chip_id1, _1] =
- scene_controller::AddChip(guid, device_name, common::ChipKind::BLUETOOTH);
+ scene_controller::AddChip(guid, device_name, common::ChipKind::UWB);
auto [device_id2, chip_id2, _2] =
scene_controller::AddChip(guid, device_name, common::ChipKind::WIFI);
@@ -64,7 +61,7 @@
for (const auto &chip : device_proto.chips()) {
EXPECT_TRUE(chip.id() == chip_id1 || chip.id() == chip_id2);
if (chip.id() == chip_id1) {
- EXPECT_TRUE(chip.has_bt());
+ EXPECT_TRUE(chip.has_uwb());
EXPECT_EQ(chip.id(), chip_id1);
} else if (chip.id() == chip_id2) {
@@ -84,9 +81,9 @@
auto device_name2 = "device_name-2-SceneControllerTest-MatchDeviceTest";
auto guid3 = "guid-3-SceneControllerTest-MatchDeviceTest";
auto device_name3 = "device_name-3-SceneControllerTest-MatchDeviceTest";
- scene_controller::AddChip(guid1, device_name1, common::ChipKind::BLUETOOTH);
- scene_controller::AddChip(guid2, device_name2, common::ChipKind::BLUETOOTH);
- scene_controller::AddChip(guid3, device_name3, common::ChipKind::BLUETOOTH);
+ scene_controller::AddChip(guid1, device_name1, common::ChipKind::UWB);
+ scene_controller::AddChip(guid2, device_name2, common::ChipKind::UWB);
+ scene_controller::AddChip(guid3, device_name3, common::ChipKind::UWB);
// exact matches with name
ASSERT_TRUE(match(device_name1));
@@ -107,7 +104,7 @@
auto guid = "guid-SceneControllerTest-PatchDeviceTest";
auto device_name = "device_name-SceneControllerTest-PatchDeviceTest";
auto [device_id, chip_id, _] =
- scene_controller::AddChip(guid, device_name, common::ChipKind::BLUETOOTH);
+ scene_controller::AddChip(guid, device_name, common::ChipKind::UWB);
model::Device model;
model.set_name(device_name);
model.set_visible(false);
@@ -135,7 +132,7 @@
auto guid = "guid-SceneControllerTest-ResetTest";
auto device_name = "device_name-SceneControllerTest-ResetTest";
auto [device_id, chip_id, _] =
- scene_controller::AddChip(guid, device_name, common::ChipKind::BLUETOOTH);
+ scene_controller::AddChip(guid, device_name, common::ChipKind::UWB);
model::Device model;
model.set_name(device_name);
model.set_visible(false);
diff --git a/src/frontend/frontend_server_test.cc b/src/frontend/frontend_server_test.cc
index 7b96b07..3495a1d 100644
--- a/src/frontend/frontend_server_test.cc
+++ b/src/frontend/frontend_server_test.cc
@@ -53,7 +53,7 @@
TEST_F(FrontendServerTest, PatchDevicePosition) {
auto name = "test-device-name-for-set-position";
auto [device_id, _1, _2] =
- scene_controller::AddChip("guid-fs-1", name, common::ChipKind::BLUETOOTH);
+ scene_controller::AddChip("guid-fs-1", name, common::ChipKind::UWB);
google::protobuf::Empty response;
frontend::PatchDeviceRequest request;
@@ -80,6 +80,8 @@
}
TEST_F(FrontendServerTest, PatchDevice) {
+ GTEST_SKIP() << "Skipped the test that uses the rootcanal library.";
+
auto name = "name-for-update";
auto [device_id, chip_id, _] =
scene_controller::AddChip("guid-fs-2", name, common::ChipKind::BLUETOOTH);
