revert to count_ test

Signed-off-by: Yuchen Dai <silentdai@gmail.com>
envoyproxy · Nov 15, 2019 · fb6569b · fb6569b
1 parent 9cddbda
commit fb6569b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/test/common/init/target_impl_test.cc b/test/common/init/target_impl_test.cc
@@ -63,26 +63,20 @@ TEST(InitTargetImplTest, ReadyWhenWatcherUnavailable) {
 }
 
 TEST(SharedTargetImplTest, InitializeTwiceBeforeReady) {
-  InSequence s;
   ManagerImpl m1("m1");
   ManagerImpl m2("m2");
   ExpectableWatcherImpl w1;
   ExpectableWatcherImpl w2;
   ExpectableSharedTargetImpl t;
-  //t.expectInitialize();
   m1.add(t);
-  // @mergeconflit: I want to verify Initalize invoked after m2.add(t). 
-  // But if I swap the below lines the test is also passing.
-  // 
-  // t.expectInitialize();
-  // m2.add(t);
+  EXPECT_EQ(0, t.count_);
   m2.add(t);
-  t.expectInitialize();
-  //t.expectInitialize().Times();
+  EXPECT_EQ(0, t.count_);
   EXPECT_EQ(Manager::State::Uninitialized, m1.state());
   EXPECT_EQ(Manager::State::Uninitialized, m2.state());
   m1.initialize(w1);
   m2.initialize(w2);
+  EXPECT_EQ(1, t.count_);
   EXPECT_EQ(Manager::State::Initializing, m1.state());
   EXPECT_EQ(Manager::State::Initializing, m2.state());
   w1.expectReady().Times(1);
@@ -91,7 +85,7 @@ TEST(SharedTargetImplTest, InitializeTwiceBeforeReady) {
   EXPECT_EQ(Manager::State::Initialized, m1.state());
   EXPECT_EQ(Manager::State::Initialized, m2.state());
 }
-/*
+
 // Two managers initialize the same target at their own interests.
 TEST(SharedTargetImplTest, ConcurrentManagerInitialization) {
   ManagerImpl m1("m1");
@@ -187,7 +181,6 @@ TEST(SharedTargetImplTest, DetroyedSharedTargetIsConsideredReadyTarget) {
   m.initialize(w);
   EXPECT_EQ(Manager::State::Initialized, m.state());
 }
-*/
 } // namespace
 } // namespace Init
 } // namespace Envoy
diff --git a/test/mocks/init/mocks.cc b/test/mocks/init/mocks.cc
@@ -22,11 +22,8 @@ ExpectableTargetImpl::expectInitializeWillCallReady() {
 }
 
 ExpectableSharedTargetImpl::ExpectableSharedTargetImpl(absl::string_view name)
-    : SharedTargetImpl(name, [this]() { initialize(); }) {}
+    : ExpectableSharedTargetImpl(name, [this]() { ++count_; }) {}
 ExpectableSharedTargetImpl::ExpectableSharedTargetImpl(absl::string_view name, InitializeFn fn)
     : SharedTargetImpl(name, fn) {}
-::testing::internal::TypedExpectation<void()>& ExpectableSharedTargetImpl::expectInitialize() {
-  return EXPECT_CALL(*this, initialize());
-}
 } // namespace Init
 } // namespace Envoy
diff --git a/test/mocks/init/mocks.h b/test/mocks/init/mocks.h
@@ -50,16 +50,11 @@ class ExpectableTargetImpl : public TargetImpl {
   ::testing::internal::TypedExpectation<void()>& expectInitializeWillCallReady();
 };
 
-/**
- * Borrow the idea from ExpectableTargetImpl. ExpectableSharedTargetImpl is a real SharedTargetImpl.
- */
 class ExpectableSharedTargetImpl : public SharedTargetImpl {
 public:
   ExpectableSharedTargetImpl(absl::string_view name = "test");
   ExpectableSharedTargetImpl(absl::string_view name, InitializeFn fn);
-  MOCK_METHOD0(initialize, void());
-
-  ::testing::internal::TypedExpectation<void()>& expectInitialize();
+  int count_{0};
 };
 
 /**