diff options
Diffstat (limited to 'libappfuse/tests')
-rw-r--r-- | libappfuse/tests/FuseBridgeLoopTest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libappfuse/tests/FuseBridgeLoopTest.cc b/libappfuse/tests/FuseBridgeLoopTest.cc index b4c1efb01..51d605136 100644 --- a/libappfuse/tests/FuseBridgeLoopTest.cc +++ b/libappfuse/tests/FuseBridgeLoopTest.cc | |||
@@ -32,10 +32,12 @@ namespace { | |||
32 | class Callback : public FuseBridgeLoopCallback { | 32 | class Callback : public FuseBridgeLoopCallback { |
33 | public: | 33 | public: |
34 | bool mounted; | 34 | bool mounted; |
35 | Callback() : mounted(false) {} | 35 | bool closed; |
36 | void OnMount() override { | 36 | Callback() : mounted(false), closed(false) {} |
37 | mounted = true; | 37 | |
38 | } | 38 | void OnMount(int /*mount_id*/) override { mounted = true; } |
39 | |||
40 | void OnClosed(int /* mount_id */) override { closed = true; } | ||
39 | }; | 41 | }; |
40 | 42 | ||
41 | class FuseBridgeLoopTest : public ::testing::Test { | 43 | class FuseBridgeLoopTest : public ::testing::Test { |
@@ -53,8 +55,9 @@ class FuseBridgeLoopTest : public ::testing::Test { | |||
53 | ASSERT_TRUE(SetupMessageSockets(&dev_sockets_)); | 55 | ASSERT_TRUE(SetupMessageSockets(&dev_sockets_)); |
54 | ASSERT_TRUE(SetupMessageSockets(&proxy_sockets_)); | 56 | ASSERT_TRUE(SetupMessageSockets(&proxy_sockets_)); |
55 | thread_ = std::thread([this] { | 57 | thread_ = std::thread([this] { |
56 | StartFuseBridgeLoop( | 58 | FuseBridgeLoop loop; |
57 | dev_sockets_[1].release(), proxy_sockets_[0].release(), &callback_); | 59 | loop.AddBridge(1, std::move(dev_sockets_[1]), std::move(proxy_sockets_[0])); |
60 | loop.Start(&callback_); | ||
58 | }); | 61 | }); |
59 | } | 62 | } |
60 | 63 | ||
@@ -115,6 +118,7 @@ class FuseBridgeLoopTest : public ::testing::Test { | |||
115 | if (thread_.joinable()) { | 118 | if (thread_.joinable()) { |
116 | thread_.join(); | 119 | thread_.join(); |
117 | } | 120 | } |
121 | ASSERT_TRUE(callback_.closed); | ||
118 | } | 122 | } |
119 | 123 | ||
120 | void TearDown() override { | 124 | void TearDown() override { |