1 files changed, 16 insertions, 11 deletions

diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
index 455a47644b5..5109d994f61 100644
--- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp
@@ -19,12 +19,17 @@ namespace
 bool
 assertThreadObserver(uint32_t masterExecuteCnt,
                      uint32_t indexExecuteCnt,
+                     uint32_t summaryExecuteCnt,
                      const test::ThreadingServiceObserver &observer)
 {
     if (!EXPECT_EQUAL(masterExecuteCnt,
                       observer.masterObserver().getExecuteCnt())) {
         return false;
     }
+    if (!EXPECT_EQUAL(summaryExecuteCnt,
+                      observer.summaryObserver().getExecuteCnt())) {
+        return false;
+    }
     if (!EXPECT_EQUAL(indexExecuteCnt,
                       observer.indexObserver().getExecuteCnt())) {
         return false;
@@ -238,7 +243,7 @@ TEST_F("require that nothing happens before free list is active", Fixture)
     EXPECT_FALSE(f.delayReuse(4));
     EXPECT_FALSE(f.delayReuse({ 5, 6}));
     EXPECT_TRUE(f._store.assertWork(0, 0, 0));
-    EXPECT_TRUE(assertThreadObserver(3, 0, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(3, 0, 0, f._writeService));
 }
 
 
@@ -249,7 +254,7 @@ TEST_F("require that single lid is delayed", Fixture)
     EXPECT_TRUE(f.delayReuse(4));
     f.scheduleDelayReuseLid(4);
     EXPECT_TRUE(f._store.assertWork(1, 0, 1));
-    EXPECT_TRUE(assertThreadObserver(4, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(4, 1, 1, f._writeService));
 }
 
 
@@ -260,7 +265,7 @@ TEST_F("require that lid vector is delayed", Fixture)
     EXPECT_TRUE(f.delayReuse({ 5, 6, 7}));
     f.scheduleDelayReuseLids({ 5, 6, 7});
     EXPECT_TRUE(f._store.assertWork(0, 1, 3));
-    EXPECT_TRUE(assertThreadObserver(4, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(4, 1, 1, f._writeService));
 }
 
 
@@ -272,14 +277,14 @@ TEST_F("require that reuse can be batched", Fixture)
     EXPECT_FALSE(f.delayReuse(4));
     EXPECT_FALSE(f.delayReuse({ 5, 6, 7}));
     EXPECT_TRUE(f._store.assertWork(0, 0, 0));
-    EXPECT_TRUE(assertThreadObserver(4, 0, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(4, 0, 0, f._writeService));
     f.commit();
     EXPECT_TRUE(f._store.assertWork(0, 1, 4));
-    EXPECT_TRUE(assertThreadObserver(6, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(6, 1, 1, f._writeService));
     EXPECT_FALSE(f.delayReuse(8));
     EXPECT_FALSE(f.delayReuse({ 9, 10}));
     EXPECT_TRUE(f._store.assertWork(0, 1, 4));
-    EXPECT_TRUE(assertThreadObserver(8, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(8, 1, 1, f._writeService));
 }
 
 
@@ -290,15 +295,15 @@ TEST_F("require that single element array is optimized", Fixture)
     f.setImmediateCommit(false);
     EXPECT_FALSE(f.delayReuse({ 4}));
     EXPECT_TRUE(f._store.assertWork(0, 0, 0));
-    EXPECT_TRUE(assertThreadObserver(3, 0, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(3, 0, 0, f._writeService));
     f.commit();
     f.setImmediateCommit(true);
     EXPECT_TRUE(f._store.assertWork(1, 0, 1));
-    EXPECT_TRUE(assertThreadObserver(6, 1, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(6, 1, 1, f._writeService));
     EXPECT_TRUE(f.delayReuse({ 8}));
     f.scheduleDelayReuseLids({ 8});
     EXPECT_TRUE(f._store.assertWork(2, 0, 2));
-    EXPECT_TRUE(assertThreadObserver(9, 2, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(9, 2, 2, f._writeService));
 }
 
 
@@ -308,10 +313,10 @@ TEST_F("require that lids are reused faster with no indexed fields", Fixture)
     f.setHasIndexedOrAttributeFields(false);
     EXPECT_FALSE(f.delayReuse(4));
     EXPECT_TRUE(f._store.assertWork(1, 0, 1));
-    EXPECT_TRUE(assertThreadObserver(2, 0, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(2, 0, 0, f._writeService));
     EXPECT_FALSE(f.delayReuse({ 5, 6, 7}));
     EXPECT_TRUE(f._store.assertWork(1, 1, 4));
-    EXPECT_TRUE(assertThreadObserver(3, 0, f._writeService));
+    EXPECT_TRUE(assertThreadObserver(3, 0, 0, f._writeService));
 }
 
 }