json for SelectSimple

Author: stanislav-shchetinin

tests/integration/basic_example_it/CMakeLists.txt

@@ -9,6 +9,7 @@ add_ydb_test(NAME basic-example_it
   library-getopt
   YDB-CPP-SDK::Table
   GTest::gtest_main
+  public-lib-json_value
   LABELS
   integration
 )

tests/integration/basic_example_it/basic_example.cpp

@@ -440,10 +440,11 @@ std::string SelectSimple(TTableClient client, const std::string& path) {
     }));
     TResultSetParser parser(*resultSet);
     if (parser.TryNextRow()) {
-        return std::format("> SelectSimple:\nSeries, Id: {}, Title: {}, Release date: {}\n"
+        std::cout << std::format("> SelectSimple:\nSeries, Id: {}, Title: {}, Release date: {}\n"
                             , ToString(parser.ColumnParser("series_id").GetOptionalUint64())
                             , ToString(parser.ColumnParser("title").GetOptionalUtf8())
                             , ToString(parser.ColumnParser("release_date").GetOptionalString()));
+        return FormatResultSetJson(resultSet.value(), EBinaryStringEncoding::Unicode);                    
     }
     return "";
 }
@@ -577,9 +578,8 @@ std::string ScanQuerySelect(TTableClient client, const std::string& path) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-std::unique_ptr<Response> Run(const TDriver& driver, const std::string& path) {
+bool Run(const TDriver& driver, const std::string& path) {
     TTableClient client(driver);
-    auto response = std::make_unique<Response>();
     try {
         CreateTables(client, path);
 
@@ -589,28 +589,27 @@ std::unique_ptr<Response> Run(const TDriver& driver, const std::string& path) {
             return FillTableDataTransaction(session, path);
         }));
 
-        response->result += SelectSimple(client, path);
+        std::string expectedResultSelectSimple = "{\"series_id\":1,\"title\":\"IT Crowd\",\"release_date\":\"2006-02-03\"}";
+        std::string resultSelectSimple = SelectSimple(client, path);
         UpsertSimple(client, path);
 
-        response->result += SelectWithParams(client, path);
+        SelectWithParams(client, path);
 
-        response->result += PreparedSelect(client, path, 2, 3, 7);
-        response->result += PreparedSelect(client, path, 2, 3, 8);
+        PreparedSelect(client, path, 2, 3, 7);
+        PreparedSelect(client, path, 2, 3, 8);
 
-        response->result += MultiStep(client, path);
+        MultiStep(client, path);
 
         ExplicitTcl(client, path);
 
-        response->result += PreparedSelect(client, path, 2, 6, 1);
+        PreparedSelect(client, path, 2, 6, 1);
 
-        response->result += ScanQuerySelect(client, path);
+        ScanQuerySelect(client, path);
     }
     catch (const TYdbErrorException& e) {
-        response->success = false;
         std::cerr << "Execution failed due to fatal error:" << std::endl;
         PrintStatus(e.Status);
-        return response;
+        return false;
     }
-    response->success = true;
-    return response;
+    return true;
 }

tests/integration/basic_example_it/basic_example.h

@@ -3,11 +3,6 @@
 #include <ydb-cpp-sdk/client/driver/driver.h>
 #include <ydb-cpp-sdk/client/table/table.h>
 
-struct Response {
-    bool success;
-    std::string result;
-};
-
 NYdb::TParams GetTablesDataParams();
 
-std::unique_ptr<Response> Run(const NYdb::TDriver& driver, const std::string& path);
+bool Run(const NYdb::TDriver& driver, const std::string& path);

tests/integration/basic_example_it/main.cpp

@@ -39,16 +39,11 @@ TEST(Integration, BasicExample) {
     }
 
     TDriver driver(driverConfig);
-    std::unique_ptr<Response> response = ::Run(driver, path);
 
-    if (!response->success) {
-        std::cerr << std::format("The driver could not be started (path = {})", path) << std::endl;
+    if (!::Run(driver, path)) {
         FAIL();
         driver.Stop(true);
     }
 
-    std::string correct_output = "> Describe table: series\nColumn, name: series_id, type: Uint64?\nColumn, name: title, type: Utf8?\nColumn, name: series_info, type: Utf8?\nColumn, name: release_date, type: Uint64?\n> SelectSimple:\nSeries, Id: 1, Title: IT Crowd, Release date: 2006-02-03\n> SelectWithParams:\nSeason, Title: Season 3, Series title: Silicon Valley\n> PreparedSelect:\nEpisode 7, Title: To Build a Better Beta, Air date: Sun Jun 05, 2016\n> PreparedSelect:\nEpisode 8, Title: Bachman's Earnings Over-Ride, Air date: Sun Jun 12, 2016\n> MultiStep:\nEpisode 1, Season: 5, Title: Grow Fast or Die Slow, Air date: Sun Mar 25, 2018\nEpisode 2, Season: 5, Title: Reorientation, Air date: Sun Apr 01, 2018\nEpisode 3, Season: 5, Title: Chief Operating Officer, Air date: Sun Apr 08, 2018\n> PreparedSelect:\nEpisode 1, Title: TBD, Air date: Thu Jan 01, 1970\n> ScanQuerySelect:\nSeason, SeriesId: 1, SeasonId: 1, Title: Season 1, Air date: 2006-02-03\nSeason, SeriesId: 1, SeasonId: 2, Title: Season 2, Air date: 2007-08-24\nSeason, SeriesId: 1, SeasonId: 3, Title: Season 3, Air date: 2008-11-21\nSeason, SeriesId: 1, SeasonId: 4, Title: Season 4, Air date: 2010-06-25\n";
-    ASSERT_EQ(response->result, correct_output);
-
     driver.Stop(true);
 }