fix

Author: Gazizonoki

ydb/services/persqueue_v1/persqueue_ut.cpp

@@ -3033,30 +3033,30 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) {
     class TTestCredentialsProvider : public NYdb::ICredentialsProvider {
         public:
 
-        TTestCredentialsProvider(const NYdb::TStringType& token)
+        TTestCredentialsProvider(const std::string& token)
         : Token(token)
         {}
 
         virtual ~TTestCredentialsProvider()
         {}
 
-        NYdb::TStringType GetAuthInfo() const override {
+        std::string GetAuthInfo() const override {
             return Token;
         }
 
-        void SetToken(const NYdb::TStringType& token) {
+        void SetToken(const std::string& token) {
             Token = token;
         }
         bool IsValid() const override {
             return true;
         }
 
-        NYdb::TStringType Token;
+        std::string Token;
     };
 
     class TTestCredentialsProviderFactory : public NYdb::ICredentialsProviderFactory {
     public:
-        TTestCredentialsProviderFactory(const NYdb::TStringType& token)
+        TTestCredentialsProviderFactory(const std::string& token)
         : CredentialsProvider(new TTestCredentialsProvider(token))
         {}
 
@@ -3070,11 +3070,11 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) {
             return CredentialsProvider;
         }
 
-        NYdb::TStringType GetClientIdentity() const override {
+        std::string GetClientIdentity() const override {
             return CreateGuidAsString();
         }
 
-        void SetToken(const NYdb::TStringType& token) {
+        void SetToken(const std::string& token) {
             CredentialsProvider->SetToken(token);
         }
     private:
@@ -3108,8 +3108,8 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) {
 
 
         for (ui32 i = 0; i < 2; ++i) {
-            std::shared_ptr<NYdb::ICredentialsProviderFactory> creds = std::make_shared<TTestCredentialsProviderFactory>(NYdb::TStringType("topic1@" BUILTIN_ACL_DOMAIN));
-            dynamic_cast<TTestCredentialsProviderFactory*>(creds.get())->SetToken(NYdb::TStringType("topic1@" BUILTIN_ACL_DOMAIN));
+            std::shared_ptr<NYdb::ICredentialsProviderFactory> creds = std::make_shared<TTestCredentialsProviderFactory>("topic1@" BUILTIN_ACL_DOMAIN);
+            dynamic_cast<TTestCredentialsProviderFactory*>(creds.get())->SetToken("topic1@" BUILTIN_ACL_DOMAIN);
 
             auto writer = CreateWriter(*driver, SHORT_TOPIC_NAME, "123", {}, {}, {}, creds);
 
@@ -3135,7 +3135,7 @@ Y_UNIT_TEST_SUITE(TPersQueueTest) {
             auto ack = std::get_if<NYdb::NPersQueue::TWriteSessionEvent::TAcksEvent>(&*msg);
             UNIT_ASSERT(ack);
 
-            NYdb::TStringType token = i == 0 ? "user_without_rights@" BUILTIN_ACL_DOMAIN : "invalid_ticket";
+            std::string token = i == 0 ? "user_without_rights@" BUILTIN_ACL_DOMAIN : "invalid_ticket";
             Cerr << "Set token " << token << "\n";
 
             dynamic_cast<TTestCredentialsProviderFactory*>(creds.get())->SetToken(token);

ydb/services/ydb/backup_ut/ydb_backup_ut.cpp

@@ -1306,7 +1306,7 @@ Y_UNIT_TEST_SUITE(BackupRestore) {
         }
 
         auto opts = NDump::TRestoreSettings().Mode(NDump::TRestoreSettings::EMode::ImportData);
-        using TYdbErrorException = Dev::NStatusHelpers::TYdbErrorException;
+        using TYdbErrorException = ::NYdb::Dev::NStatusHelpers::TYdbErrorException;
 
         ExecuteDataDefinitionQuery(session, Sprintf(R"(
                 DROP TABLE `%s`;