Change copy constructor and operator=

Change copy constructor and operator= in order to exclude problem
with removing value state during copying integer object

3 files changed, 70 insertions, 3 deletions

diff --git a/src/components/policy/policy_external/test/generated_code_test.cc b/src/components/policy/policy_external/test/generated_code_test.cc
index 1158b16fdb..2704f03c6a 100644
--- a/src/components/policy/policy_external/test/generated_code_test.cc
+++ b/src/components/policy/policy_external/test/generated_code_test.cc
@@ -38,7 +38,9 @@
 #include "policy/policy_table/enums.h"
 #include "policy/policy_table/types.h"
 #include "rpc_base/gtest_support.h"
+#include "rpc_base/rpc_base.h"
 
+using rpc::Integer;
 using rpc::policy_table_interface_base::Table;
 
 namespace test {
@@ -67,6 +69,72 @@ TEST(PolicyGeneratedCodeTest, TestValidPTUpdateJsonIsValid) {
   ASSERT_RPCTYPE_VALID(table);
 }
 
+TEST(PolicyGeneratedCodeTest, IntegerLimitsTest) {
+  const int32_t min_value = -5;
+  const int32_t max_value = 5;
+
+  Integer<int32_t, min_value, max_value> value;
+  EXPECT_FALSE(value.is_valid());
+
+  value = min_value;
+  EXPECT_TRUE(value.is_valid());
+
+  value = max_value;
+  EXPECT_TRUE(value.is_valid());
+
+  value = min_value + max_value;
+  EXPECT_TRUE(value.is_valid());
+
+  value = min_value - 1;
+  EXPECT_FALSE(value.is_valid());
+
+  value = max_value + 1;
+  EXPECT_FALSE(value.is_valid());
+}
+
+TEST(PolicyGeneratedCodeTest, IntegerConstructionAndAssignmentTest) {
+  const int32_t min_value = -5;
+  const int32_t max_value = 5;
+
+  const Json::Value json_null = Json::Value(Json::nullValue);
+  Integer<int32_t, min_value, max_value> value_from_json_null(&json_null);
+  EXPECT_FALSE(value_from_json_null.is_valid());
+
+  const Json::Value json_string = Json::Value("string");
+  Integer<int32_t, min_value, max_value> value_from_json_string(&json_string);
+  EXPECT_FALSE(value_from_json_string.is_valid());
+
+  const Json::Value json_float = Json::Value(10.5);
+  Integer<int32_t, min_value, max_value> value_from_json_float(&json_float);
+  EXPECT_FALSE(value_from_json_float.is_valid());
+
+  const Json::Value json_int_in_range = Json::Value(4);
+  Integer<int32_t, min_value, max_value> value_from_json_int_in_range(
+      &json_int_in_range);
+  EXPECT_TRUE(value_from_json_int_in_range.is_valid());
+
+  const Json::Value json_int_out_of_range = Json::Value(9);
+  Integer<int32_t, min_value, max_value> value_from_json_int_out_of_range(
+      &json_int_out_of_range);
+  EXPECT_FALSE(value_from_json_int_out_of_range.is_valid());
+
+  const Json::Value json_zero = Json::Value(0);
+  Integer<int32_t, min_value, max_value> value_from_json_zero(&json_zero);
+  EXPECT_TRUE(value_from_json_zero.is_valid());
+
+  Integer<int32_t, min_value, max_value> invalid_value(&json_string);
+  EXPECT_FALSE(invalid_value.is_valid());
+  Integer<int32_t, min_value, max_value> reassigned_value = invalid_value;
+  EXPECT_FALSE(reassigned_value.is_valid());
+
+  Integer<int32_t, min_value, max_value> another_invalid_value(&json_string);
+  EXPECT_FALSE(another_invalid_value.is_valid());
+  Integer<int32_t, min_value, max_value> valid_value(0);
+  EXPECT_TRUE(valid_value.is_valid());
+  valid_value = another_invalid_value;
+  EXPECT_FALSE(valid_value.is_valid());
+}
+
 }  // namespace policy_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
index a9ff484eb0..6dad1b82f5 100644
--- a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
+++ b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
@@ -177,7 +177,7 @@ Integer<T, minval, maxval>& Integer<T, minval, maxval>::operator=(
     const Integer& new_val) {
   this->value_ = new_val.value_;
   if (new_val.is_initialized()) {
-    this->value_state_ = range_.Includes(new_val.value_) ? kValid : kInvalid;
+    this->value_state_ = new_val.value_state_;
   }
 
   return *this;
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
index b9fcac4b6a..8d07b4e600 100644
--- a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
+++ b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
@@ -140,8 +140,7 @@ Integer<T, minval, maxval>::Integer(const Json::Value* value)
 
 template <typename T, T minval, T maxval>
 Integer<T, minval, maxval>::Integer(const Integer& val)
-    : PrimitiveType(range_.Includes(val.value_) ? kValid : kInvalid)
-    , value_(val.value_) {}
+    : PrimitiveType(val.value_state_), value_(val.value_) {}
 
 template <typename T, T minval, T maxval>
 Integer<T, minval, maxval>::Integer(const Json::Value* value, IntType def_value)