Fix copyright lines

[folly.git] / folly / io / async / test / EventBaseThreadTest.cpp

diff --git a/folly/io/async/test/EventBaseThreadTest.cpp b/folly/io/async/test/EventBaseThreadTest.cpp
index 7cedfd8e913a278beb45f4a5478ba691e6afa235..3f0125f8c64fb68332833438b34f0c56b901bfd4 100644 (file)
--- a/folly/io/async/test/EventBaseThreadTest.cpp
+++ b/folly/io/async/test/EventBaseThreadTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Facebook, Inc.
+ * Copyright 2016-present Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,10 @@
 
 #include <chrono>
 
-#include <folly/Baton.h>
 #include <folly/io/async/EventBaseManager.h>
 #include <folly/portability/GTest.h>
+#include <folly/synchronization/Baton.h>
+#include <folly/system/ThreadName.h>
 
 using namespace std;
 using namespace std::chrono;
@@ -29,11 +30,14 @@ using namespace folly;
 class EventBaseThreadTest : public testing::Test {};
 
 TEST_F(EventBaseThreadTest, example) {
-  EventBaseThread ebt;
+  EventBaseThread ebt(true, nullptr, "monkey");
 
   Baton<> done;
-  ebt.getEventBase()->runInEventBaseThread([&] { done.post(); });
-  ASSERT_TRUE(done.timed_wait(seconds(1)));
+  ebt.getEventBase()->runInEventBaseThread([&] {
+    EXPECT_EQ(getCurrentThreadName().value(), "monkey");
+    done.post();
+  });
+  ASSERT_TRUE(done.try_wait_for(seconds(1)));
 }
 
 TEST_F(EventBaseThreadTest, start_stop) {
@@ -46,7 +50,7 @@ TEST_F(EventBaseThreadTest, start_stop) {
 
     Baton<> done;
     ebt.getEventBase()->runInEventBaseThread([&] { done.post(); });
-    ASSERT_TRUE(done.timed_wait(seconds(1)));
+    ASSERT_TRUE(done.try_wait_for(seconds(1)));
 
     EXPECT_NE(nullptr, ebt.getEventBase());
     ebt.stop();
@@ -65,7 +69,7 @@ TEST_F(EventBaseThreadTest, move) {
 
   Baton<> done;
   ebt2.getEventBase()->runInEventBaseThread([&] { done.post(); });
-  ASSERT_TRUE(done.timed_wait(seconds(1)));
+  ASSERT_TRUE(done.try_wait_for(seconds(1)));
 }
 
 TEST_F(EventBaseThreadTest, self_move) {
@@ -76,7 +80,7 @@ TEST_F(EventBaseThreadTest, self_move) {
 
   Baton<> done;
   ebt.getEventBase()->runInEventBaseThread([&] { done.post(); });
-  ASSERT_TRUE(done.timed_wait(seconds(1)));
+  ASSERT_TRUE(done.try_wait_for(seconds(1)));
 }
 
 TEST_F(EventBaseThreadTest, default_manager) {