Adjusted tests to account for new sampling interface

3 files changed, 15 insertions, 0 deletions

diff --git a/tests/memisam_tests.cpp b/tests/memisam_tests.cpp
index 8f4c842..ef0bd8e 100644
--- a/tests/memisam_tests.cpp
+++ b/tests/memisam_tests.cpp
@@ -188,6 +188,7 @@ START_TEST(t_irs_query)
 
     for (size_t i=0; i<1000; i++) {
         auto state = IRSQuery<Rec, false>::get_query_state(&isam, &parms);
+        ((IRSState<WRec> *) state)->sample_size = k;
         auto result = IRSQuery<Rec, false>::query(&isam, state, &parms);
 
         ck_assert_int_eq(result.size(), k);
@@ -226,9 +227,11 @@ START_TEST(t_irs_query_merge)
 
     for (size_t i=0; i<1000; i++) {
         auto state1 = IRSQuery<Rec>::get_query_state(&shard, &parms);
+        ((IRSState<WRec> *) state1)->sample_size = k;
         results[0] = strip_wrapping(IRSQuery<Rec>::query(&shard, state1, &parms));
 
         auto state2 = IRSQuery<Rec>::get_query_state(&shard, &parms);
+        ((IRSState<WRec> *) state2)->sample_size = k;
         results[1] = strip_wrapping(IRSQuery<Rec>::query(&shard, state2, &parms));
 
         IRSQuery<Rec>::delete_query_state(state1);
@@ -267,6 +270,7 @@ START_TEST(t_irs_buffer_query_scan)
 
     for (size_t i=0; i<1000; i++) {
         auto state = IRSQuery<Rec, false>::get_buffer_query_state(buffer, &parms);
+        ((IRSBufferState<WRec> *) state)->sample_size = k;
         auto result = IRSQuery<Rec, false>::buffer_query(buffer, state, &parms);
 
         ck_assert_int_eq(result.size(), k);
@@ -303,6 +307,7 @@ START_TEST(t_irs_buffer_query_rejection)
 
     for (size_t i=0; i<1000; i++) {
         auto state = IRSQuery<Rec>::get_buffer_query_state(buffer, &parms);
+        ((IRSBufferState<WRec> *) state)->sample_size = k;
         auto result = IRSQuery<Rec>::buffer_query(buffer, state, &parms);
 
         ck_assert_int_gt(result.size(), 0);
diff --git a/tests/wirs_tests.cpp b/tests/wirs_tests.cpp
index 60537e5..ddf9764 100644
--- a/tests/wirs_tests.cpp
+++ b/tests/wirs_tests.cpp
@@ -190,6 +190,7 @@ START_TEST(t_wirs_query)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WIRSQuery<WRec>::get_query_state(shard, &parms);
+        ((WIRSState<WRec> *) state)->sample_size = k;
         auto result = WIRSQuery<WRec>::query(shard, state, &parms);
 
         total_samples += result.size();
@@ -232,9 +233,11 @@ START_TEST(t_wirs_query_merge)
 
     for (size_t i=0; i<1000; i++) {
         auto state1 = WIRSQuery<WRec>::get_query_state(shard, &parms);
+        ((WIRSState<WRec> *) state1)->sample_size = k;
         results[0] = strip_wrapping(WIRSQuery<WRec>::query(shard, state1, &parms));
 
         auto state2 = WIRSQuery<WRec>::get_query_state(shard, &parms);
+        ((WIRSState<WRec> *) state2)->sample_size = k;
         results[1] = strip_wrapping(WIRSQuery<WRec>::query(shard, state2, &parms));
 
         WIRSQuery<WRec>::delete_query_state(state1);
@@ -274,6 +277,7 @@ START_TEST(t_wirs_buffer_query_scan)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WIRSQuery<WRec, false>::get_buffer_query_state(buffer, &parms);
+        ((WIRSBufferState<WRec> *) state)->sample_size = k;
         auto result = WIRSQuery<WRec, false>::buffer_query(buffer, state, &parms);
 
         total_samples += result.size();
@@ -313,6 +317,7 @@ START_TEST(t_wirs_buffer_query_rejection)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WIRSQuery<WRec>::get_buffer_query_state(buffer, &parms);
+        ((WIRSBufferState<WRec> *) state)->sample_size = k;
         auto result = WIRSQuery<WRec>::buffer_query(buffer, state, &parms);
 
         total_samples += result.size();
diff --git a/tests/wss_tests.cpp b/tests/wss_tests.cpp
index d138cfe..7dad5b9 100644
--- a/tests/wss_tests.cpp
+++ b/tests/wss_tests.cpp
@@ -186,6 +186,7 @@ START_TEST(t_wss_query)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WSSQuery<WRec>::get_query_state(shard, &parms);
+        ((WSSState<WRec> *) state)->sample_size = k;
         auto result = WSSQuery<WRec>::query(shard, state, &parms);
 
         total_samples += result.size();
@@ -228,9 +229,11 @@ START_TEST(t_wss_query_merge)
 
     for (size_t i=0; i<1000; i++) {
         auto state1 = WSSQuery<WRec>::get_query_state(shard, &parms);
+        ((WSSState<WRec> *) state1)->sample_size = k;
         results[0] = strip_wrapping(WSSQuery<WRec>::query(shard, state1, &parms));
 
         auto state2 = WSSQuery<WRec>::get_query_state(shard, &parms);
+        ((WSSState<WRec> *) state2)->sample_size = k;
         results[1] = strip_wrapping(WSSQuery<WRec>::query(shard, state2, &parms));
 
         WSSQuery<WRec>::delete_query_state(state1);
@@ -270,6 +273,7 @@ START_TEST(t_wss_buffer_query_scan)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WSSQuery<WRec, false>::get_buffer_query_state(buffer, &parms);
+        ((WSSBufferState<WRec> *) state)->sample_size = k;
         auto result = WSSQuery<WRec, false>::buffer_query(buffer, state, &parms);
         total_samples += result.size();
 
@@ -308,6 +312,7 @@ START_TEST(t_wss_buffer_query_rejection)
 
     for (size_t i=0; i<1000; i++) {
         auto state = WSSQuery<WRec>::get_buffer_query_state(buffer, &parms);
+        ((WSSBufferState<WRec> *) state)->sample_size = k;
         auto result = WSSQuery<WRec>::buffer_query(buffer, state, &parms);
 
         total_samples += result.size();