Merge pull request #226 from Ahmed-Elsaka-JC/afe_fix_snapshot_count

Author: vinodreddy-g

src/cpp/src/kvs.cpp

@@ -589,7 +589,7 @@ score::Result<size_t> Kvs::snapshot_count() const
     score::Result<size_t> result = score::MakeUnexpected(ErrorCode::UnmappedError);
     size_t count = 0;
     bool error = false;
-    for (size_t idx = 1; idx <= KVS_MAX_SNAPSHOTS; ++idx)
+    for (size_t idx = 0; idx < KVS_MAX_SNAPSHOTS; ++idx)
     {
         const score::filesystem::Path fname = filename_prefix.Native() + "_" + to_string(idx) + ".json";
         const auto fname_exists_res = filesystem->standard->Exists(fname);
@@ -605,7 +605,7 @@ score::Result<size_t> Kvs::snapshot_count() const
             error = true;
             break;
         }
-        count = idx;
+        count = idx+1;
     }
     if (error)
     {

src/cpp/tests/test_kvs.cpp

@@ -714,11 +714,11 @@ TEST(kvs_snapshot_rotate, snapshot_rotate_success)
     ASSERT_TRUE(result);
 
     /* Create empty Test-Snapshot Files */
-    for (size_t i = 1; i < KVS_MAX_SNAPSHOTS; i++)
+    for (size_t i = 0; i < KVS_MAX_SNAPSHOTS; i++)
     {
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".json") << "{}";
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".hash") << "{}";
-        EXPECT_EQ(result.value().snapshot_count().value(), i);
+        EXPECT_EQ(result.value().snapshot_count().value(), i+1);
     }
     ASSERT_FALSE(std::filesystem::exists(filename_prefix + "_" + std::to_string(KVS_MAX_SNAPSHOTS) + ".json"));
     ASSERT_FALSE(std::filesystem::exists(filename_prefix + "_" + std::to_string(KVS_MAX_SNAPSHOTS) + ".hash"));
@@ -744,11 +744,11 @@ TEST(kvs_snapshot_rotate, snapshot_rotate_max_snapshots)
     ASSERT_TRUE(result);
 
     /* Create empty Test-Snapshot Files */
-    for (size_t i = 1; i < KVS_MAX_SNAPSHOTS; i++)
+    for (size_t i = 0; i < KVS_MAX_SNAPSHOTS; i++)
     {
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".json") << "{}";
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".hash") << "{}";
-        EXPECT_EQ(result.value().snapshot_count().value(), i);
+        EXPECT_EQ(result.value().snapshot_count().value(), i+1);
     }
     ASSERT_FALSE(std::filesystem::exists(filename_prefix + "_" + std::to_string(KVS_MAX_SNAPSHOTS) + ".json"));
     ASSERT_FALSE(std::filesystem::exists(filename_prefix + "_" + std::to_string(KVS_MAX_SNAPSHOTS) + ".hash"));
@@ -770,11 +770,11 @@ TEST(kvs_snapshot_rotate, snapshot_rotate_failure_renaming_json)
     ASSERT_TRUE(result);
 
     /* Create empty Test-Snapshot Files */
-    for (size_t i = 1; i < KVS_MAX_SNAPSHOTS; i++)
+    for (size_t i = 0; i < KVS_MAX_SNAPSHOTS; i++)
     {
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".json") << "{}";
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".hash") << "{}";
-        EXPECT_EQ(result.value().snapshot_count().value(), i);
+        EXPECT_EQ(result.value().snapshot_count().value(), i+1);
     }
 
     /* Snapshot (JSON) Renaming failed (Create directorys instead of json files to trigger rename
@@ -795,11 +795,11 @@ TEST(kvs_snapshot_rotate, snapshot_rotate_failure_renaming_hash)
     ASSERT_TRUE(result);
 
     /* Create empty Test-Snapshot Files */
-    for (size_t i = 1; i < KVS_MAX_SNAPSHOTS; i++)
+    for (size_t i = 0; i < KVS_MAX_SNAPSHOTS; i++)
     {
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".json") << "{}";
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".hash") << "{}";
-        EXPECT_EQ(result.value().snapshot_count().value(), i);
+        EXPECT_EQ(result.value().snapshot_count().value(), i+1);
     }
 
     /* Hash Renaming failed (Create directorys instead of json files to trigger rename error)*/
@@ -957,12 +957,12 @@ TEST(kvs_snapshot_count, snapshot_count_success)
     ASSERT_TRUE(result);
 
     /* Create empty Test-Snapshot Files */
-    for (size_t i = 1; i <= KVS_MAX_SNAPSHOTS; i++)
+    for (size_t i = 0; i < KVS_MAX_SNAPSHOTS; i++)
     {
         std::ofstream(filename_prefix + "_" + std::to_string(i) + ".json") << "{}";
         auto count = result.value().snapshot_count();
         EXPECT_TRUE(count);
-        EXPECT_EQ(count.value(), i);
+        EXPECT_EQ(count.value(), i+1);
     }
     /* Test maximum capacity */
     std::ofstream(filename_prefix + "_" + std::to_string(KVS_MAX_SNAPSHOTS + 1) + ".json") << "{}";

tests/test_cases/tests/test_cit_snapshots.py

@@ -71,9 +71,9 @@ def test_ok(
         snapshot_max_count: int,
         version: str,
     ):
-        if version == "cpp" and snapshot_max_count in [1, 3, 10]:
+        if version == "cpp" and snapshot_max_count in [0, 1, 3, 10]:
             pytest.xfail(
-                reason="https://github.com/eclipse-score/persistency/issues/192 , https://github.com/eclipse-score/persistency/issues/108",
+                reason="https://github.com/eclipse-score/persistency/issues/108",
             )
         assert results.return_code == ResultCode.SUCCESS
 

tests/test_scenarios/cpp/src/cit/snapshots.cpp

@@ -85,7 +85,6 @@ class SnapshotCount : public Scenario
      * only after flush when MAX<3.
      *
      * Raised bugs: https://github.com/eclipse-score/persistency/issues/108
-     *              https://github.com/eclipse-score/persistency/issues/192
      */
     void run(const std::string& input) const final
     {