Import wiredtiger: 5840fabbd5510b3f188ca7dbd35b694378a34650 from branch mongodb-master

ref: 64200147ce..5840fabbd5
for: 6.0.0-rc0

WT-9056       Update the cppsuite source file extensions from cxx to cpp and rename tests

39 files changed, 73 insertions, 72 deletions

diff --git a/src/third_party/wiredtiger/dist/s_style b/src/third_party/wiredtiger/dist/s_style
index d76a78bfb68..c24a569e3c1 100755
--- a/src/third_party/wiredtiger/dist/s_style
+++ b/src/third_party/wiredtiger/dist/s_style
@@ -137,6 +137,7 @@ else
 
 	if ! expr "$f" : 'examples/c/*' > /dev/null &&
 	   ! expr "$f" : '.*cxx' > /dev/null &&
+	   ! expr "$f" : '.*cpp' > /dev/null &&
 	   ! expr "$f" : 'ext/*' > /dev/null &&
 	   ! expr "$f" : 'src/os_posix/os_snprintf.c' > /dev/null &&
 	    egrep '[^a-z_]snprintf\(|[^a-z_]vsnprintf\(' $f > $t; then
diff --git a/src/third_party/wiredtiger/dist/test_data.py b/src/third_party/wiredtiger/dist/test_data.py
index 3fb2b035148..7ba05e9cc37 100644
--- a/src/third_party/wiredtiger/dist/test_data.py
+++ b/src/third_party/wiredtiger/dist/test_data.py
@@ -218,15 +218,15 @@ test_config = [
 ]
 
 methods = {
-    'base_test' : Method(test_config),
     'burst_inserts' : Method(test_config + [
                         Config("burst_duration", 90, r'''
                             How long the insertions will occur for.''')]),
-    'example_test' : Method(test_config),
     'hs_cleanup' : Method(test_config),
+    'operations_test' : Method(test_config),
     'search_near_01' : Method(test_config + [
                         Config("search_near_threads", 10, r'''
                             Number of threads that execute search near calls.''')]),
     'search_near_02' : Method(test_config),
     'search_near_03' : Method(test_config),
+    'test_template' : Method(test_config),
 }
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index d5636c8a1f8..e530cacfb7a 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "64200147ceb744a7854f3278589b589b4a4e774f"
+    "commit": "5840fabbd5510b3f188ca7dbd35b694378a34650"
 }
diff --git a/src/third_party/wiredtiger/src/config/test_config.c b/src/third_party/wiredtiger/src/config/test_config.c
index 230e7c904c9..84cc35d8b70 100644
--- a/src/third_party/wiredtiger/src/config/test_config.c
+++ b/src/third_party/wiredtiger/src/config/test_config.c
@@ -86,7 +86,8 @@ static const WT_CONFIG_CHECK confchk_workload_tracking_subconfigs[] = {
   {"enabled", "boolean", NULL, NULL, NULL, 0}, {"op_rate", "string", NULL, NULL, NULL, 0},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_base_test[] = {
+static const WT_CONFIG_CHECK confchk_burst_inserts[] = {
+  {"burst_duration", "string", NULL, NULL, NULL, 0},
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
@@ -99,8 +100,7 @@ static const WT_CONFIG_CHECK confchk_base_test[] = {
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_burst_inserts[] = {
-  {"burst_duration", "string", NULL, NULL, NULL, 0},
+static const WT_CONFIG_CHECK confchk_hs_cleanup[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
@@ -113,7 +113,7 @@ static const WT_CONFIG_CHECK confchk_burst_inserts[] = {
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_example_test[] = {
+static const WT_CONFIG_CHECK confchk_operations_test[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
@@ -126,34 +126,34 @@ static const WT_CONFIG_CHECK confchk_example_test[] = {
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_hs_cleanup[] = {
+static const WT_CONFIG_CHECK confchk_search_near_01[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
   {"duration_seconds", "int", NULL, "min=0,max=1000000", NULL, 0},
   {"enable_logging", "boolean", NULL, NULL, NULL, 0},
   {"runtime_monitor", "category", NULL, NULL, confchk_runtime_monitor_subconfigs, 6},
+  {"search_near_threads", "string", NULL, NULL, NULL, 0},
   {"statistics_config", "category", NULL, NULL, confchk_statistics_config_subconfigs, 2},
   {"timestamp_manager", "category", NULL, NULL, confchk_timestamp_manager_subconfigs, 4},
   {"workload_generator", "category", NULL, NULL, confchk_workload_generator_subconfigs, 6},
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_search_near_01[] = {
+static const WT_CONFIG_CHECK confchk_search_near_02[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
   {"duration_seconds", "int", NULL, "min=0,max=1000000", NULL, 0},
   {"enable_logging", "boolean", NULL, NULL, NULL, 0},
   {"runtime_monitor", "category", NULL, NULL, confchk_runtime_monitor_subconfigs, 6},
-  {"search_near_threads", "string", NULL, NULL, NULL, 0},
   {"statistics_config", "category", NULL, NULL, confchk_statistics_config_subconfigs, 2},
   {"timestamp_manager", "category", NULL, NULL, confchk_timestamp_manager_subconfigs, 4},
   {"workload_generator", "category", NULL, NULL, confchk_workload_generator_subconfigs, 6},
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_search_near_02[] = {
+static const WT_CONFIG_CHECK confchk_search_near_03[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
@@ -166,7 +166,7 @@ static const WT_CONFIG_CHECK confchk_search_near_02[] = {
   {"workload_tracking", "category", NULL, NULL, confchk_workload_tracking_subconfigs, 2},
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
-static const WT_CONFIG_CHECK confchk_search_near_03[] = {
+static const WT_CONFIG_CHECK confchk_test_template[] = {
   {"cache_size_mb", "int", NULL, "min=0,max=100000000000", NULL, 0},
   {"checkpoint_manager", "category", NULL, NULL, confchk_checkpoint_manager_subconfigs, 2},
   {"compression_enabled", "boolean", NULL, NULL, NULL, 0},
@@ -180,8 +180,9 @@ static const WT_CONFIG_CHECK confchk_search_near_03[] = {
   {NULL, NULL, NULL, NULL, NULL, 0}};
 
 static const WT_CONFIG_ENTRY config_entries[] = {
-  {"base_test",
-    "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
+  {"burst_inserts",
+    "burst_duration=90,cache_size_mb=0,"
+    "checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
     "min=0,postrun=false,runtime=false,save=false),"
@@ -200,10 +201,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_base_test, 10},
-  {"burst_inserts",
-    "burst_duration=90,cache_size_mb=0,"
-    "checkpoint_manager=(enabled=false,op_rate=1s),"
+    confchk_burst_inserts, 11},
+  {"hs_cleanup",
+    "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
     "min=0,postrun=false,runtime=false,save=false),"
@@ -222,8 +222,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_burst_inserts, 11},
-  {"example_test",
+    confchk_hs_cleanup, 10},
+  {"operations_test",
     "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
@@ -243,8 +243,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_example_test, 10},
-  {"hs_cleanup",
+    confchk_operations_test, 10},
+  {"search_near_01",
     "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
@@ -253,9 +253,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "save=false),enabled=true,op_rate=1s,stat_cache_size=(max=1,min=0"
     ",postrun=false,runtime=false,save=false),stat_db_size=(max=1,"
     "min=0,postrun=false,runtime=false,save=false)),"
-    "statistics_config=(enable_logging=true,type=all),"
-    "timestamp_manager=(enabled=true,oldest_lag=1,op_rate=1s,"
-    "stable_lag=1),workload_generator=(enabled=true,"
+    "search_near_threads=10,statistics_config=(enable_logging=true,"
+    "type=all),timestamp_manager=(enabled=true,oldest_lag=1,"
+    "op_rate=1s,stable_lag=1),workload_generator=(enabled=true,"
     "insert_config=(key_size=5,op_rate=1s,ops_per_transaction=(max=1,"
     "min=0),thread_count=0,value_size=5),op_rate=1s,"
     "populate_config=(collection_count=1,key_count_per_collection=0,"
@@ -264,8 +264,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_hs_cleanup, 10},
-  {"search_near_01",
+    confchk_search_near_01, 11},
+  {"search_near_02",
     "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
@@ -274,9 +274,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "save=false),enabled=true,op_rate=1s,stat_cache_size=(max=1,min=0"
     ",postrun=false,runtime=false,save=false),stat_db_size=(max=1,"
     "min=0,postrun=false,runtime=false,save=false)),"
-    "search_near_threads=10,statistics_config=(enable_logging=true,"
-    "type=all),timestamp_manager=(enabled=true,oldest_lag=1,"
-    "op_rate=1s,stable_lag=1),workload_generator=(enabled=true,"
+    "statistics_config=(enable_logging=true,type=all),"
+    "timestamp_manager=(enabled=true,oldest_lag=1,op_rate=1s,"
+    "stable_lag=1),workload_generator=(enabled=true,"
     "insert_config=(key_size=5,op_rate=1s,ops_per_transaction=(max=1,"
     "min=0),thread_count=0,value_size=5),op_rate=1s,"
     "populate_config=(collection_count=1,key_count_per_collection=0,"
@@ -285,8 +285,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_search_near_01, 11},
-  {"search_near_02",
+    confchk_search_near_02, 10},
+  {"search_near_03",
     "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
@@ -306,8 +306,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_search_near_02, 10},
-  {"search_near_03",
+    confchk_search_near_03, 10},
+  {"test_template",
     "cache_size_mb=0,checkpoint_manager=(enabled=false,op_rate=1s),"
     "compression_enabled=false,duration_seconds=0,"
     "enable_logging=false,runtime_monitor=(cache_hs_insert=(max=1,"
@@ -327,7 +327,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
     "value_size=5),update_config=(key_size=5,op_rate=1s,"
     "ops_per_transaction=(max=1,min=0),thread_count=0,value_size=5)),"
     "workload_tracking=(enabled=true,op_rate=1s)",
-    confchk_search_near_03, 10},
+    confchk_test_template, 10},
   {NULL, NULL, NULL, 0}};
 
 /*
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_insert_heavy.txt b/src/third_party/wiredtiger/test/cppsuite/configs/operations_insert_heavy.txt
index 0e75643336a..0e75643336a 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_insert_heavy.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/operations_insert_heavy.txt
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_default.txt b/src/third_party/wiredtiger/test/cppsuite/configs/operations_test_default.txt
index 11151e977a4..11151e977a4 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_default.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/operations_test_default.txt
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_stress.txt b/src/third_party/wiredtiger/test/cppsuite/configs/operations_test_stress.txt
index 19cf70bfeae..19cf70bfeae 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/base_test_stress.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/operations_test_stress.txt
diff --git a/src/third_party/wiredtiger/test/cppsuite/configs/example_test_default.txt b/src/third_party/wiredtiger/test/cppsuite/configs/test_template_default.txt
index f5d5c916bdc..f5d5c916bdc 100644
--- a/src/third_party/wiredtiger/test/cppsuite/configs/example_test_default.txt
+++ b/src/third_party/wiredtiger/test/cppsuite/configs/test_template_default.txt
diff --git a/src/third_party/wiredtiger/test/cppsuite/create_test.sh b/src/third_party/wiredtiger/test/cppsuite/create_test.sh
index 00941911629..82f7008dcdd 100755
--- a/src/third_party/wiredtiger/test/cppsuite/create_test.sh
+++ b/src/third_party/wiredtiger/test/cppsuite/create_test.sh
@@ -16,7 +16,7 @@ else
 fi
 
 # Check if the test already exists.
-FILE=tests/$1.cxx
+FILE=tests/$1.cpp
 if test -f "$FILE"; then
     echo "$FILE cannot be created as it already exists."
     exit 1
@@ -30,13 +30,13 @@ if test -f "$CONFIG"; then
 fi
 
 # Copy the default template.
-cp tests/example_test.cxx "$FILE"
+cp tests/test_template.cpp "$FILE"
 echo "Created $FILE."
-cp configs/example_test_default.txt "$CONFIG"
+cp configs/test_template_default.txt "$CONFIG"
 echo "Created $CONFIG."
 
-# Replace example_test with the new test name.
-SEARCH="example_test"
+# Replace test_template with the new test name.
+SEARCH="test_template"
 sed -i "s/$SEARCH/$1/" "$FILE"
 echo "Updated $FILE."
 
@@ -45,14 +45,14 @@ REPLACE="# Configuration for $1."
 sed -i "1s/.*/$REPLACE/" "$CONFIG"
 echo "Updated $CONFIG."
 
-# Include the new test in run.cxx
-FILE=tests/run.cxx
-SEARCH="#include \"example_test.cxx\""
-VALUE="#include \"$1.cxx\""
+# Include the new test in run.cpp
+FILE=tests/run.cpp
+SEARCH="#include \"test_template.cpp\""
+VALUE="#include \"$1.cpp\""
 sed -i "/$SEARCH/a $VALUE" $FILE
 
 # Add the new test to the run_test() method
-SEARCH="example_test("
+SEARCH="test_template("
 LINE_1="\else if (test_name == \"$1\")\n"
 LINE_2="\ $1(test_harness::test_args{config, test_name, wt_open_config}).run();"
 sed -i "/$SEARCH/a $LINE_1$LINE_2" $FILE
@@ -65,7 +65,7 @@ echo "Updated $FILE."
 
 # Add the new test to test_data.py
 FILE=../../dist/test_data.py
-SEARCH="example_test"
+SEARCH="test_template"
 LINE_1="\    '$1' : Method(test_config),"
 sed -i "/$SEARCH/a $LINE_1" $FILE
 echo "Updated $FILE."
@@ -77,5 +77,5 @@ cd ../../dist || exit 1
 
 # Last changes to be done manually
 echo "Follow the next steps to execute your new test:"
-echo "1. Start editing $1.cxx"
+echo "1. Start editing $1.cpp"
 echo "2. Compile your changes, go to <build_dir>/test/cppsuite and run your test with ./run -t $1"
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/checkpoint_manager.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/checkpoint_manager.cpp
index 66836325acf..66836325acf 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/checkpoint_manager.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/checkpoint_manager.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.cpp
index 292cfbbfeab..292cfbbfeab 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/component.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/component.cpp
index 05d6976ec4b..05d6976ec4b 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/component.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/component.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/configuration.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/configuration.cpp
index f508dc76bea..f508dc76bea 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/configuration.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/configuration.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/throttle.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/throttle.cpp
index af7b94e8f98..af7b94e8f98 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/core/throttle.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/core/throttle.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/runtime_monitor.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/runtime_monitor.cpp
index 1229634166c..1229634166c 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/runtime_monitor.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/runtime_monitor.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/test.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/test.cpp
index 1b15b5e63dc..1b15b5e63dc 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/test.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/test.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/thread_manager.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/thread_manager.cpp
index 29d1e547151..29d1e547151 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/thread_manager.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/thread_manager.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cpp
index ecb06ea93d8..ecb06ea93d8 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/timestamp_manager.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/api_const.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/api_const.cpp
index 72aeaf7c2ad..72aeaf7c2ad 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/api_const.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/api_const.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.cpp
index 67b72eac172..67b72eac172 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_connection.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_connection.cpp
index 39a8fede916..39a8fede916 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_connection.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_connection.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.cpp
index b0b20ccc0f8..b0b20ccc0f8 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_model.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_model.cpp
index 3e373f5c1bc..3e373f5c1bc 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_model.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_model.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_operation.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_operation.cpp
index 1b9b12d689c..1b9b12d689c 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_operation.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/database_operation.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.cpp
index 3973af7242c..3973af7242c 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/thread_context.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/thread_context.cpp
index ab005e99d43..ab005e99d43 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/thread_context.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/thread_context.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cpp
index 68709d63f6f..68709d63f6f 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_validation.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_validation.cpp
index fc741c7d7e2..fc741c7d7e2 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_validation.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_validation.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload_generator.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload_generator.cpp
index 32676a59a6f..32676a59a6f 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload_generator.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload_generator.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/burst_inserts.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/burst_inserts.cpp
index 81e0f717d6d..81e0f717d6d 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/burst_inserts.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/burst_inserts.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/csuite_style_example_test.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/csuite_style_example_test.cpp
index 50ca6f0da82..0b5a2966b2f 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/csuite_style_example_test.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/csuite_style_example_test.cpp
@@ -30,7 +30,7 @@
  * This file provides an example of how to create a test in C++ using a few features from the
  * framework if any. This file can be used as a template for quick testing and/or when stress
  * testing is not required. For any stress testing, it is encouraged to use the framework, see
- * example_test.cxx and create_script.sh.
+ * test_template.cpp and create_script.sh.
  */
 
 #include "test_harness/connection_manager.h"
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/hs_cleanup.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/hs_cleanup.cpp
index e3ead2e3818..e3ead2e3818 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/hs_cleanup.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/hs_cleanup.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/base_test.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/operations_test.cpp
index 7bb6e23205e..1554bbad58c 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/base_test.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/operations_test.cpp
@@ -34,7 +34,7 @@
  *
  * Can be used to create stress tests in various ways.
  */
-class base_test : public test_harness::test {
+class operations_test : public test_harness::test {
     public:
-    base_test(const test_harness::test_args &args) : test(args) {}
+    operations_test(const test_harness::test_args &args) : test(args) {}
 };
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/run.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/run.cpp
index 150f8e0505a..09bc9b0a7df 100755
--- a/src/third_party/wiredtiger/test/cppsuite/tests/run.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/run.cpp
@@ -33,13 +33,13 @@
 #include "test_harness/util/logger.h"
 #include "test_harness/test.h"
 
-#include "base_test.cxx"
-#include "burst_inserts.cxx"
-#include "example_test.cxx"
-#include "hs_cleanup.cxx"
-#include "search_near_01.cxx"
-#include "search_near_02.cxx"
-#include "search_near_03.cxx"
+#include "burst_inserts.cpp"
+#include "hs_cleanup.cpp"
+#include "operations_test.cpp"
+#include "search_near_01.cpp"
+#include "search_near_02.cpp"
+#include "search_near_03.cpp"
+#include "test_template.cpp"
 
 /* Declarations to avoid the error raised by -Werror=missing-prototypes. */
 const std::string parse_configuration_from_file(const std::string &filename);
@@ -118,20 +118,20 @@ run_test(const std::string &test_name, const std::string &config, const std::str
 
     test_harness::logger::log_msg(LOG_TRACE, "Configuration\t:" + config);
 
-    if (test_name == "base_test")
-        base_test(test_harness::test_args{config, test_name, wt_open_config}).run();
-    else if (test_name == "example_test")
-        example_test(test_harness::test_args{config, test_name, wt_open_config}).run();
-    else if (test_name == "hs_cleanup")
+    if (test_name == "hs_cleanup")
         hs_cleanup(test_harness::test_args{config, test_name, wt_open_config}).run();
     else if (test_name == "burst_inserts")
         burst_inserts(test_harness::test_args{config, test_name, wt_open_config}).run();
+    else if (test_name == "operations_test")
+        operations_test(test_harness::test_args{config, test_name, wt_open_config}).run();
     else if (test_name == "search_near_01")
         search_near_01(test_harness::test_args{config, test_name, wt_open_config}).run();
     else if (test_name == "search_near_02")
         search_near_02(test_harness::test_args{config, test_name, wt_open_config}).run();
     else if (test_name == "search_near_03")
         search_near_03(test_harness::test_args{config, test_name, wt_open_config}).run();
+    else if (test_name == "test_template")
+        test_template(test_harness::test_args{config, test_name, wt_open_config}).run();
     else {
         test_harness::logger::log_msg(LOG_ERROR, "Test not found: " + test_name);
         error_code = -1;
@@ -154,8 +154,8 @@ main(int argc, char *argv[])
 {
     std::string cfg, config_filename, current_cfg, current_test_name, test_name, wt_open_config;
     int64_t error_code = 0;
-    const std::vector<std::string> all_tests = {"base_test", "burst_inserts", "example_test",
-      "hs_cleanup", "search_near_01", "search_near_02", "search_near_03"};
+    const std::vector<std::string> all_tests = {"burst_inserts", "hs_cleanup", "operations_test",
+      "search_near_01", "search_near_02", "search_near_03", "test_template"};
 
     /* Set the program name for error messages. */
     (void)testutil_set_progname(argv);
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cpp
index b9620c9d050..b9620c9d050 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_01.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cpp
index ec9ec6edbbb..ec9ec6edbbb 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_02.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cpp
index eac6216b351..eac6216b351 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/search_near_03.cpp
diff --git a/src/third_party/wiredtiger/test/cppsuite/tests/example_test.cxx b/src/third_party/wiredtiger/test/cppsuite/tests/test_template.cpp
index d33b75c8174..d56be78d1c3 100644
--- a/src/third_party/wiredtiger/test/cppsuite/tests/example_test.cxx
+++ b/src/third_party/wiredtiger/test/cppsuite/tests/test_template.cpp
@@ -32,9 +32,9 @@
  * Class that defines operations that do nothing as an example. This shows how database operations
  * can be overridden and customized.
  */
-class example_test : public test_harness::test {
+class test_template : public test_harness::test {
     public:
-    example_test(const test_harness::test_args &args) : test(args) {}
+    test_template(const test_harness::test_args &args) : test(args) {}
 
     void
     run() override final
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index eee19575088..f7ceb1ae574 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -1001,11 +1001,11 @@ tasks:
       - func: "cppsuite test"
         vars:
           test_config: debug_mode=(cursor_copy=true)
-          test_config_filename: configs/base_test_default.txt
-          test_name: base_test
+          test_config_filename: configs/operations_test_default.txt
+          test_name: operations_test
       - func: "upload test stats"
         vars:
-          test_path: test/cppsuite/base_test
+          test_path: test/cppsuite/operations_test
 
   - name: cppsuite-hs-cleanup-default
     tags: ["pull_request"]
@@ -1071,11 +1071,11 @@ tasks:
       - func: "fetch artifacts"
       - func: "cppsuite test"
         vars:
-          test_config_filename: configs/base_test_stress.txt
-          test_name: base_test
+          test_config_filename: configs/operations_test_stress.txt
+          test_name: operations_test
       - func: "upload test stats"
         vars:
-          test_path: test/cppsuite/base_test
+          test_path: test/cppsuite/operations_test
 
   - name: cppsuite-hs-cleanup-stress
     depends_on: