cpp impl: Add Errorcode InvalidArgument

Add InvalidArgument errorcode, if dir argument is invalid

Author: joshualicht

src/cpp/inc/kvs.hpp

@@ -90,7 +90,10 @@ enum class MyErrorCode : score::result::ErrorCode {
     MutexLockFailed,
 
     /* Invalid value type*/
-    InvalidValueType
+    InvalidValueType,
+
+    /* Invalid argument*/
+    InvalidArgument
 };
 
 class MyErrorDomain final : public score::result::ErrorDomain
@@ -579,6 +582,9 @@ class KvsBuilder final {
     /**
      * @brief Specify the directory where KVS files are stored.
      * @param dir The directory path as a string.
+     * Important: The directory path must end with a '/' to be valid.
+     * Use "./" for the current directory.
+     *   
      * @return Reference to this builder (for chaining).
      */
     KvsBuilder& dir(std::string&& dir_path);

src/cpp/src/kvs.cpp

@@ -435,12 +435,20 @@ KvsBuilder& KvsBuilder::dir(std::string&& dir_path) {
 
 
 score::Result<Kvs> KvsBuilder::build() const {
-    auto result = Kvs::open(
-        instance_id,
-        need_defaults ? OpenNeedDefaults::Required : OpenNeedDefaults::Optional,
-        need_kvs      ? OpenNeedKvs::Required      : OpenNeedKvs::Optional,
-        std::move(directory)
-    );
+    score::Result<Kvs> result = score::MakeUnexpected(MyErrorCode::UnmappedError);
+
+    /* Check if directory argument is valid */
+    if (directory.empty() || directory.back() != '/') {
+        result = score::MakeUnexpected(MyErrorCode::InvalidArgument);
+    } else {
+        result = Kvs::open(
+            instance_id,
+            need_defaults ? OpenNeedDefaults::Required : OpenNeedDefaults::Optional,
+            need_kvs      ? OpenNeedKvs::Required      : OpenNeedKvs::Optional,
+            std::move(directory)
+        );
+    }
+    
     return result;
 }
 

src/cpp/tests/bm_kvs.cpp

@@ -1,3 +1,16 @@
+/********************************************************************************
+* Copyright (c) 2025 Contributors to the Eclipse Foundation
+*
+* See the NOTICE file(s) distributed with this work for additional
+* information regarding copyright ownership.
+*
+* This program and the accompanying materials are made available under the
+* terms of the Apache License Version 2.0 which is available at
+* https://www.apache.org/licenses/LICENSE-2.0
+*
+* SPDX-License-Identifier: Apache-2.0
+********************************************************************************/
+
 #include <benchmark/benchmark.h>
 #include <string>
 

src/cpp/tests/test_kvs.cpp

@@ -666,7 +666,7 @@ TEST(kvs_MessageFor, MessageFor) {
 
 }
 
-TEST(kvs_kvsbuilder, kvsbuilder) {
+TEST(kvs_kvsbuilder, kvsbuilder_success) {
     /* This test also checks the kvs open function with the KvsBuilder */
 
     /* Test the KvsBuilder constructor */
@@ -699,7 +699,22 @@ TEST(kvs_kvsbuilder, kvsbuilder) {
     result_build.value().flush_on_exit = false;
     std::string expected_filename_prefix = "./kvsbuilder/kvs_"+std::to_string(instance_id.id);
     EXPECT_EQ(result_build.value().filename_prefix, expected_filename_prefix);
+}
+
+TEST(kvs_kvsbuilder, kvsbuilder_directory_invalid) {
+
+    /* Test the KvsBuilder with an empty directory */
+    KvsBuilder builder(instance_id);
+    builder.dir("");
+    auto result_build = builder.build();
+    EXPECT_FALSE(result_build);
+    EXPECT_EQ(static_cast<MyErrorCode>(*result_build.error()), MyErrorCode::InvalidArgument);
 
+    /* Test the KvsBuilder with an string which doesnt end with / */
+    builder.dir("./kvsbuilder");
+    result_build = builder.build();
+    EXPECT_FALSE(result_build);
+    EXPECT_EQ(static_cast<MyErrorCode>(*result_build.error()), MyErrorCode::InvalidArgument);
 }
 
 TEST(kvs_constructor, move_constructor) {