IGNIETFERRO-1984 Prepare for protobuf enum inheritance from int in ydb/core

ref:e1dd64b17a5463e481756af6a2673cd1ddad3692

6 files changed, 16 insertions, 16 deletions

diff --git a/ydb/core/cms/cms_ut.cpp b/ydb/core/cms/cms_ut.cpp
index 9842fb71567..7be5390fdeb 100644
--- a/ydb/core/cms/cms_ut.cpp
+++ b/ydb/core/cms/cms_ut.cpp
@@ -30,8 +30,8 @@ void CheckLoadLogRecord(const NKikimrCms::TLogRecord &rec,
                         const TString &version)
 {
 
-    UNIT_ASSERT_VALUES_EQUAL(rec.GetRecordType(), TLogRecordData::CMS_LOADED);
-    UNIT_ASSERT_VALUES_EQUAL(rec.GetData().GetRecordType(), TLogRecordData::CMS_LOADED);
+    UNIT_ASSERT_VALUES_EQUAL(static_cast<TLogRecordData::EType>(rec.GetRecordType()), TLogRecordData::CMS_LOADED);
+    UNIT_ASSERT_VALUES_EQUAL(static_cast<TLogRecordData::EType>(rec.GetData().GetRecordType()), TLogRecordData::CMS_LOADED);
     auto &data = rec.GetData().GetCmsLoaded();
     UNIT_ASSERT_VALUES_EQUAL(data.GetHost(), host);
     UNIT_ASSERT_VALUES_EQUAL(data.GetNodeId(), nodeId);
diff --git a/ydb/core/mind/hive/hive_ut.cpp b/ydb/core/mind/hive/hive_ut.cpp
index 0383d49a123..27d654014ec 100644
--- a/ydb/core/mind/hive/hive_ut.cpp
+++ b/ydb/core/mind/hive/hive_ut.cpp
@@ -949,7 +949,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
             auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
             if (reply) {
                 subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                 break;
             }
         } while (true);
@@ -1011,7 +1011,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
             auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
             if (reply) {
                 subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                 break;
             }
         } while (true);
@@ -1123,7 +1123,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
             auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
             if (reply) {
                 subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                 break;
             }
         } while (true);
@@ -1234,7 +1234,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
             auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
             if (reply) {
                 subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                 break;
             }
         } while (true);
@@ -1352,7 +1352,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
             auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
             if (reply) {
                 subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                 break;
             }
         } while (true);
@@ -1445,7 +1445,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
                 auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
                 if (reply) {
                     subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                    UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                    UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                     break;
                 }
             } while (true);
@@ -1546,7 +1546,7 @@ Y_UNIT_TEST_SUITE(THiveTest) {
                 auto reply = runtime.GrabEdgeEventRethrow<NSchemeShard::TEvSchemeShard::TEvModifySchemeTransactionResult>(handle, TDuration::MilliSeconds(100));
                 if (reply) {
                     subdomainKey = TSubDomainKey(reply->Record.GetSchemeshardId(), reply->Record.GetPathId());
-                    UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), (ui32)NKikimrScheme::EStatus::StatusAccepted);
+                    UNIT_ASSERT_VALUES_EQUAL(reply->Record.GetStatus(), NKikimrScheme::EStatus::StatusAccepted);
                     break;
                 }
             } while (true);
diff --git a/ydb/core/tx/datashard/datashard_ut_erase_rows.cpp b/ydb/core/tx/datashard/datashard_ut_erase_rows.cpp
index 87a51ef80ab..09dc2d8bf0c 100644
--- a/ydb/core/tx/datashard/datashard_ut_erase_rows.cpp
+++ b/ydb/core/tx/datashard/datashard_ut_erase_rows.cpp
@@ -213,7 +213,7 @@ void EraseRows(
     server->GetRuntime()->Register(new TEraser(sender, tabletIDs[0], tableId, std::move(keyTags), std::move(keys)));
 
     auto ev = server->GetRuntime()->GrabEdgeEventRethrow<TEvResponse>(sender);
-    UNIT_ASSERT_VALUES_EQUAL(ev->Get()->Record.GetStatus(), status);
+    UNIT_ASSERT_VALUES_EQUAL(static_cast<ui32>(ev->Get()->Record.GetStatus()), status);
     if (error) {
         UNIT_ASSERT_STRING_CONTAINS(ev->Get()->Record.GetErrorDescription(), error);
     }
@@ -305,7 +305,7 @@ void ConditionalEraseRows(
     server->GetRuntime()->Register(new TEraser(sender, tabletIDs[0], tableId, columnId, threshold, unit, limits, indexes));
 
     auto ev = server->GetRuntime()->GrabEdgeEventRethrow<TEvResponse>(sender);
-    UNIT_ASSERT_VALUES_EQUAL(ev->Get()->Record.GetStatus(), status);
+    UNIT_ASSERT_VALUES_EQUAL(static_cast<ui32>(ev->Get()->Record.GetStatus()), status);
     if (error) {
         UNIT_ASSERT_STRING_CONTAINS(ev->Get()->Record.GetErrorDescription(), error);
     }
@@ -345,7 +345,7 @@ void DistributedEraseTx(
     server->GetRuntime()->Register(new TEraser(sender, tabletIds[0], txId, tx));
 
     auto ev = server->GetRuntime()->GrabEdgeEventRethrow<TEvResponse>(sender);
-    UNIT_ASSERT_VALUES_EQUAL(ev->Get()->Record.GetStatus(), status);
+    UNIT_ASSERT_VALUES_EQUAL(static_cast<ui32>(ev->Get()->Record.GetStatus()), status);
     if (error) {
         UNIT_ASSERT(ev->Get()->Record.ErrorSize());
         UNIT_ASSERT_STRING_CONTAINS(ev->Get()->Record.GetError(0).GetReason(), error);
diff --git a/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp b/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp
index 543d52895de..fb1c5a571a0 100644
--- a/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp
+++ b/ydb/core/tx/schemeshard/ut_index_build_reboots.cpp
@@ -127,7 +127,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) {
                 )
                 )", result, err);
 
-                UNIT_ASSERT_VALUES_EQUAL_C(status, NKikimrProto::OK, err);
+                UNIT_ASSERT_VALUES_EQUAL_C(status, static_cast<ui32>(NKikimrProto::OK), err);
                 UNIT_ASSERT_VALUES_EQUAL(err, "");
 
                 NKqp::CompareYson(R"([[[[[["100000"];["1000"]];[["100001"];["1001"]];[["100002"];["1002"]];[["100003"];["1003"]];[["100004"];["1004"]];[["100005"];["1005"]];[["100006"];["1006"]];[["100007"];["1007"]];[["100008"];["1008"]];[["100009"];["1009"]];[["101000"];["2000"]];[["101001"];["2001"]];[["101002"];["2002"]];[["101003"];["2003"]];[["101004"];["2004"]];[["101005"];["2005"]];[["101006"];["2006"]];[["101007"];["2007"]];[["101008"];["2008"]];[["101009"];["2009"]]];%false]]])", result);
@@ -197,7 +197,7 @@ Y_UNIT_TEST_SUITE(IndexBuildTestReboots) {
                 )
                 )", result, err);
 
-                UNIT_ASSERT_VALUES_EQUAL_C(status, NKikimrProto::OK, err);
+                UNIT_ASSERT_VALUES_EQUAL_C(status, static_cast<ui32>(NKikimrProto::OK), err);
                 UNIT_ASSERT_VALUES_EQUAL(err, "");
 
                 NKqp::CompareYson(R"([[[[[["100000"];["1000"];["aaaa"]];[["100001"];["1001"];["aaaa"]];[["100002"];["1002"];["aaaa"]];[["100003"];["1003"];["aaaa"]];[["100004"];["1004"];["aaaa"]];[["100005"];["1005"];["aaaa"]];[["100006"];["1006"];["aaaa"]];[["100007"];["1007"];["aaaa"]];[["100008"];["1008"];["aaaa"]];[["100009"];["1009"];["aaaa"]];[["101000"];["2000"];["aaaa"]];[["101001"];["2001"];["aaaa"]];[["101002"];["2002"];["aaaa"]];[["101003"];["2003"];["aaaa"]];[["101004"];["2004"];["aaaa"]];[["101005"];["2005"];["aaaa"]];[["101006"];["2006"];["aaaa"]];[["101007"];["2007"];["aaaa"]];[["101008"];["2008"];["aaaa"]];[["101009"];["2009"];["aaaa"]]];%false]]])", result);
diff --git a/ydb/core/tx/schemeshard/ut_move.cpp b/ydb/core/tx/schemeshard/ut_move.cpp
index bb20b599583..2213faf4e4a 100644
--- a/ydb/core/tx/schemeshard/ut_move.cpp
+++ b/ydb/core/tx/schemeshard/ut_move.cpp
@@ -845,7 +845,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardMoveTest) {
             )
             )", result, err);
 
-            UNIT_ASSERT_VALUES_EQUAL_C(status, NKikimrProto::OK, err);
+            UNIT_ASSERT_VALUES_EQUAL_C(static_cast<NKikimrProto::EReplyStatus>(status), NKikimrProto::OK, err);
             UNIT_ASSERT_VALUES_EQUAL(err, "");
 
             NKqp::CompareYson(R"([[[[[["111"];["1"]]];%false]]])", result);
diff --git a/ydb/core/tx/schemeshard/ut_upgradesubdomain.cpp b/ydb/core/tx/schemeshard/ut_upgradesubdomain.cpp
index 1ee6456acb1..972eb3b7751 100644
--- a/ydb/core/tx/schemeshard/ut_upgradesubdomain.cpp
+++ b/ydb/core/tx/schemeshard/ut_upgradesubdomain.cpp
@@ -855,7 +855,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardUpgradeSubDomainTest) {
                         (return (AsList (SetResult 'Data result) ))
                     )
                 )", result, err);
-            UNIT_ASSERT_VALUES_EQUAL(status, NKikimrProto::OK);
+            UNIT_ASSERT_VALUES_EQUAL(static_cast<NKikimrProto::EReplyStatus>(status), NKikimrProto::OK);
             UNIT_ASSERT_VALUES_EQUAL(err, "");
             // Cerr << result << Endl;
             // { Type { Kind: Struct Struct { Member { Name: "Data" Type { Kind: Optional Optional { Item { Kind: Struct Struct { Member { Name: "List" Type { Kind: List List { Item { Kind: Struct Struct { Member { Name: "Id" Type { Kind: Optional Optional { Item { Kind: Data Data { Scheme: 4 } } } } } Member { Name: "Uint64" Type { Kind: Optional Optional { Item { Kind: Data Data { Scheme: 4 } } } } } } } } } } Member { Name: "Truncated" Type { Kind: Data Data { Scheme: 6 } } } } } } } } } } Value { Struct { Optional { Struct { List { Struct { Optional { Uint64: 33 } } Struct { Optional { Uint64: 9437199 } } } List { Struct { Optional { Uint64: 34 } } Struct { Optional { Uint64: 1 } } } } Struct { Bool: false } } } } }