Skip to content

Commit 6e7c098

Browse files
silvakidsilvakid
committed
remove usage of temporary std::string on UT
1 parent dedfc6e commit 6e7c098

File tree

2 files changed

+50
-50
lines changed

2 files changed

+50
-50
lines changed

‎devapi/tests/session-t.cc

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3101,98 +3101,98 @@ TEST_F(Sess, compression_algorithms)
31013101

31023102
check_compress_alg(
31033103
mysqlx::Session(
3104-
std::string(uri) + "compression-algorithms=" + d.name
3104+
uri + "compression-algorithms=" + d.name
31053105
), d.expected, __LINE__);
31063106

31073107
check_compress_alg(
31083108
mysqlx::Session(
3109-
std::string(uri) + "compression-algorithms=" + d.alias
3109+
uri + "compression-algorithms=" + d.alias
31103110
), d.expected, __LINE__);
31113111

31123112
check_compress_alg(
31133113
mysqlx::Session(
3114-
std::string(uri) + "compression-algorithms=[" + d.name + "]"
3114+
uri + "compression-algorithms=[" + d.name + "]"
31153115
), d.expected, __LINE__);
31163116

31173117

31183118
check_compress_alg(
31193119
mysqlx::Session(
3120-
std::string(uri) + "compression-algorithms=[" + d.name + "," + d.second + "," + d.name + "]"
3120+
uri + "compression-algorithms=[" + d.name + "," + d.second + "," + d.name + "]"
31213121
), d.expected, __LINE__);
31223122

31233123

31243124
check_compress_alg(
31253125
mysqlx::Session(
3126-
std::string(uri) + "compression-algorithms=[" + d.name + "," + d.second + "," + d.third + "]"
3126+
uri + "compression-algorithms=[" + d.name + "," + d.second + "," + d.third + "]"
31273127
), d.expected, __LINE__);
31283128

31293129
check_compress_alg(
31303130
mysqlx::Session(
3131-
std::string(uri) + "compression-algorithms=[" + d.alias + "]"
3131+
uri + "compression-algorithms=[" + d.alias + "]"
31323132
), d.expected, __LINE__);
31333133

31343134
check_compress_alg(
31353135
mysqlx::Session(
3136-
std::string(uri) + "compression-algorithms=[" + d.alias + "," + d.second + "," + d.name + "]"
3136+
uri + "compression-algorithms=[" + d.alias + "," + d.second + "," + d.name + "]"
31373137
), d.expected, __LINE__);
31383138

31393139

31403140
check_compress_alg(
31413141
mysqlx::Session(
3142-
std::string(uri) + "compression-algorithms=[MyALGORITHM," + d.name + "]"
3142+
uri + "compression-algorithms=[MyALGORITHM," + d.name + "]"
31433143
), d.expected, __LINE__);
31443144

31453145
//Even if a valid algorithm is selected, if compression is disabled,
31463146
//no compression should be used
31473147
check_compress_alg(
31483148
mysqlx::Session(
3149-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=" + d.name
3149+
uri + "Compression=Disabled&Compression-Algorithms=" + d.name
31503150
), std::string(), __LINE__);
31513151

31523152
check_compress_alg(
31533153
mysqlx::Session(
3154-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=" + d.alias
3154+
uri + "Compression=Disabled&Compression-Algorithms=" + d.alias
31553155
), std::string(), __LINE__);
31563156

31573157
check_compress_alg(
31583158
mysqlx::Session(
3159-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.name + "]"
3159+
uri + "Compression=Disabled&Compression-Algorithms=[" + d.name + "]"
31603160
), std::string(), __LINE__);
31613161

31623162
check_compress_alg(
31633163
mysqlx::Session(
3164-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.name + "," + d.name + "]"
3164+
uri + "Compression=Disabled&Compression-Algorithms=[" + d.name + "," + d.name + "]"
31653165
), std::string(), __LINE__);
31663166

31673167
check_compress_alg(
31683168
mysqlx::Session(
3169-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "]"
3169+
uri + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "]"
31703170
), std::string(), __LINE__);
31713171

31723172
check_compress_alg(
31733173
mysqlx::Session(
3174-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "," + d.name + "]"
3174+
uri + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "," + d.name + "]"
31753175
), std::string(), __LINE__);
31763176

31773177
check_compress_alg(
31783178
mysqlx::Session(
3179-
std::string(uri) + "Compression=Disabled&Compression-Algorithms=[MyALGORITHM," + d.name + "]"
3179+
uri + "Compression=Disabled&Compression-Algorithms=[MyALGORITHM," + d.name + "]"
31803180
), std::string(), __LINE__);
31813181

31823182
// In this cases, no algorithm should be used, since algorithm value
31833183
// is empty or not valid
3184-
check_compress_alg(mysqlx::Session(std::string(uri) + "compression-algorithms="), "", __LINE__);
3185-
check_compress_alg(mysqlx::Session(std::string(uri) + "compression-algorithms=[]"), "", __LINE__);
3186-
check_compress_alg(mysqlx::Session(std::string(uri) + "compression-algorithms=BAD_Algorithm"), "", __LINE__);
3187-
check_compress_alg(mysqlx::Session(std::string(uri) + "compression-algorithms=[BAD_Algorithm]"), "", __LINE__);
3188-
check_compress_alg(mysqlx::Session(std::string(uri) + "compression-algorithms=[BAD_Algorithm,BAD_Algorithm]"), "", __LINE__);
3184+
check_compress_alg(mysqlx::Session(uri + "compression-algorithms="), "", __LINE__);
3185+
check_compress_alg(mysqlx::Session(uri + "compression-algorithms=[]"), "", __LINE__);
3186+
check_compress_alg(mysqlx::Session(uri + "compression-algorithms=BAD_Algorithm"), "", __LINE__);
3187+
check_compress_alg(mysqlx::Session(uri + "compression-algorithms=[BAD_Algorithm]"), "", __LINE__);
3188+
check_compress_alg(mysqlx::Session(uri + "compression-algorithms=[BAD_Algorithm,BAD_Algorithm]"), "", __LINE__);
31893189

31903190
//If compression=REQUIRED and no valid algorithm selected, an error should be thrown
3191-
EXPECT_THROW(mysqlx::Session(std::string(uri) + "compression=required&compression-algorithms="), Error);
3192-
EXPECT_THROW(mysqlx::Session(std::string(uri) + "compression=required&compression-algorithms=[]"), Error);
3193-
EXPECT_THROW(mysqlx::Session(std::string(uri) + "compression=required&compression-algorithms=BAD_Algorithm"), Error);
3194-
EXPECT_THROW(mysqlx::Session(std::string(uri) + "compression=required&compression-algorithms=[BAD_Algorithm]"), Error);
3195-
EXPECT_THROW(mysqlx::Session(std::string(uri) + "compression=required&compression-algorithms=[BAD_Algorithm,BAD_Algorithm]"), Error);
3191+
EXPECT_THROW(mysqlx::Session(uri + "compression=required&compression-algorithms="), Error);
3192+
EXPECT_THROW(mysqlx::Session(uri + "compression=required&compression-algorithms=[]"), Error);
3193+
EXPECT_THROW(mysqlx::Session(uri + "compression=required&compression-algorithms=BAD_Algorithm"), Error);
3194+
EXPECT_THROW(mysqlx::Session(uri + "compression=required&compression-algorithms=[BAD_Algorithm]"), Error);
3195+
EXPECT_THROW(mysqlx::Session(uri + "compression=required&compression-algorithms=[BAD_Algorithm,BAD_Algorithm]"), Error);
31963196

31973197

31983198
//Using text only, used algorithm should be LZ4_MESSAGE

‎xapi/tests/xapi-t.cc

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3032,55 +3032,55 @@ TEST_F(xapi, compression_algorithms)
30323032
std::chrono::time_point<std::chrono::system_clock> start_time
30333033
= std::chrono::system_clock::now();
30343034

3035-
tmp = std::string(uri) + "compression-algorithms=" + d.name;
3035+
tmp = uri + "compression-algorithms=" + d.name;
30363036
check_compress_alg(
30373037
mysqlx_get_session_from_url(
30383038
tmp.c_str(),
30393039
&error),
30403040
d.expected, __LINE__);
30413041

3042-
tmp = std::string(uri) + "compression-algorithms=" + d.alias;
3042+
tmp = uri + "compression-algorithms=" + d.alias;
30433043
check_compress_alg(
30443044
mysqlx_get_session_from_url(
30453045
tmp.c_str(),
30463046
&error),
30473047
d.expected, __LINE__);
30483048

3049-
tmp = std::string(uri) + "compression-algorithms=[" + d.name + "]";
3049+
tmp = uri + "compression-algorithms=[" + d.name + "]";
30503050
check_compress_alg(
30513051
mysqlx_get_session_from_url(
30523052
tmp.c_str(),
30533053
&error),
30543054
d.expected, __LINE__);
30553055

3056-
tmp = std::string(uri) + "compression-algorithms=[" + d.name + "," + d.second + ","+ d.name + "]";
3056+
tmp = uri + "compression-algorithms=[" + d.name + "," + d.second + ","+ d.name + "]";
30573057
check_compress_alg(
30583058
mysqlx_get_session_from_url(
30593059
tmp.c_str(),
30603060
&error),
30613061
d.expected, __LINE__);
30623062

3063-
tmp = std::string(uri) + "compression-algorithms=[" + d.name + "," + d.second + ","+ d.third + "]";
3063+
tmp = uri + "compression-algorithms=[" + d.name + "," + d.second + ","+ d.third + "]";
30643064
check_compress_alg(
30653065
mysqlx_get_session_from_url(
30663066
tmp.c_str(),
30673067
&error), d.expected, __LINE__);
30683068

3069-
tmp = std::string(uri) + "compression-algorithms=[" + d.alias + "]";
3069+
tmp = uri + "compression-algorithms=[" + d.alias + "]";
30703070
check_compress_alg(
30713071
mysqlx_get_session_from_url(
30723072
tmp.c_str(),
30733073
&error),
30743074
d.expected, __LINE__);
30753075

3076-
tmp = std::string(uri) + "compression-algorithms=[" + d.alias + "," + d.second + "," + d.name + "]";
3076+
tmp = uri + "compression-algorithms=[" + d.alias + "," + d.second + "," + d.name + "]";
30773077
check_compress_alg(
30783078
mysqlx_get_session_from_url(
30793079
tmp.c_str(),
30803080
&error),
30813081
d.expected, __LINE__);
30823082

3083-
tmp = std::string(uri) + "compression-algorithms=[MyALGORITHM," + d.name + "]";
3083+
tmp = uri + "compression-algorithms=[MyALGORITHM," + d.name + "]";
30843084
check_compress_alg(
30853085
mysqlx_get_session_from_url(
30863086
tmp.c_str(),
@@ -3089,49 +3089,49 @@ TEST_F(xapi, compression_algorithms)
30893089

30903090
//Even if a valid algorithm is selected, if compression is disabled,
30913091
//no compression should be used
3092-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=" + d.name;
3092+
tmp = uri + "Compression=Disabled&Compression-Algorithms=" + d.name;
30933093
check_compress_alg(
30943094
mysqlx_get_session_from_url(
30953095
tmp.c_str(),
30963096
&error),
30973097
std::string(), __LINE__);
30983098

3099-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=" + d.alias;
3099+
tmp = uri + "Compression=Disabled&Compression-Algorithms=" + d.alias;
31003100
check_compress_alg(
31013101
mysqlx_get_session_from_url(
31023102
tmp.c_str(),
31033103
&error),
31043104
std::string(), __LINE__);
31053105

3106-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.name + "]";
3106+
tmp = uri + "Compression=Disabled&Compression-Algorithms=[" + d.name + "]";
31073107
check_compress_alg(
31083108
mysqlx_get_session_from_url(
31093109
tmp.c_str(),
31103110
&error),
31113111
std::string(), __LINE__);
31123112

3113-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.name + "," + d.name + "]";
3113+
tmp = uri + "Compression=Disabled&Compression-Algorithms=[" + d.name + "," + d.name + "]";
31143114
check_compress_alg(
31153115
mysqlx_get_session_from_url(
31163116
tmp.c_str(),
31173117
&error),
31183118
std::string(), __LINE__);
31193119

3120-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "]";
3120+
tmp = uri + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "]";
31213121
check_compress_alg(
31223122
mysqlx_get_session_from_url(
31233123
tmp.c_str(),
31243124
&error),
31253125
std::string(), __LINE__);
31263126

3127-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "," + d.name + "]";
3127+
tmp = uri + "Compression=Disabled&Compression-Algorithms=[" + d.alias + "," + d.name + "]";
31283128
check_compress_alg(
31293129
mysqlx_get_session_from_url(
31303130
tmp.c_str(),
31313131
&error),
31323132
std::string(), __LINE__);
31333133

3134-
tmp = std::string(uri) + "Compression=Disabled&Compression-Algorithms=[MyALGORITHM," + d.name + "]";
3134+
tmp = uri + "Compression=Disabled&Compression-Algorithms=[MyALGORITHM," + d.name + "]";
31353135
check_compress_alg(
31363136
mysqlx_get_session_from_url(
31373137
tmp.c_str(),
@@ -3140,27 +3140,27 @@ TEST_F(xapi, compression_algorithms)
31403140

31413141
// In this cases, no algorithm should be used, since algorithm value
31423142
// is empty or not valid
3143-
tmp = std::string(uri) + "compression-algorithms=";
3143+
tmp = uri + "compression-algorithms=";
31443144
check_compress_alg(mysqlx_get_session_from_url(tmp.c_str(), &error), "", __LINE__);
3145-
tmp = std::string(uri) + "compression-algorithms=[]";
3145+
tmp = uri + "compression-algorithms=[]";
31463146
check_compress_alg(mysqlx_get_session_from_url(tmp.c_str(), &error), "", __LINE__);
3147-
tmp = std::string(uri) + "compression-algorithms=BAD_Algorithm";
3147+
tmp = uri + "compression-algorithms=BAD_Algorithm";
31483148
check_compress_alg(mysqlx_get_session_from_url(tmp.c_str(), &error), "", __LINE__);
3149-
tmp = std::string(uri) + "compression-algorithms=[BAD_Algorithm]";
3149+
tmp = uri + "compression-algorithms=[BAD_Algorithm]";
31503150
check_compress_alg(mysqlx_get_session_from_url(tmp.c_str(), &error), "", __LINE__);
3151-
tmp = std::string(uri) + "compression-algorithms=[BAD_Algorithm,BAD_Algorithm]";
3151+
tmp = uri + "compression-algorithms=[BAD_Algorithm,BAD_Algorithm]";
31523152
check_compress_alg(mysqlx_get_session_from_url(tmp.c_str(), &error), "", __LINE__);
31533153

31543154
//If compression=REQUIRED and no valid algorithm selected, no session should be created
3155-
tmp = std::string(uri) + "compression=required&compression-algorithms=";
3155+
tmp = uri + "compression=required&compression-algorithms=";
31563156
EXPECT_EQ(nullptr, mysqlx_get_session_from_url(tmp.c_str(), &error));
3157-
tmp = std::string(uri) + "compression=required&compression-algorithms=[]";
3157+
tmp = uri + "compression=required&compression-algorithms=[]";
31583158
EXPECT_EQ(nullptr, mysqlx_get_session_from_url(tmp.c_str(), &error));
3159-
tmp = std::string(uri) + "compression=required&compression-algorithms=BAD_Algorithm";
3159+
tmp = uri + "compression=required&compression-algorithms=BAD_Algorithm";
31603160
EXPECT_EQ(nullptr, mysqlx_get_session_from_url(tmp.c_str(), &error));
3161-
tmp = std::string(uri) + "compression=required&compression-algorithms=[BAD_Algorithm]";
3161+
tmp = uri + "compression=required&compression-algorithms=[BAD_Algorithm]";
31623162
EXPECT_EQ(nullptr, mysqlx_get_session_from_url(tmp.c_str(), &error));
3163-
tmp = std::string(uri) + "compression=required&compression-algorithms=[BAD_Algorithm,BAD_Algorithm]";
3163+
tmp = uri + "compression=required&compression-algorithms=[BAD_Algorithm,BAD_Algorithm]";
31643164
EXPECT_EQ(nullptr, mysqlx_get_session_from_url(tmp.c_str(), &error));
31653165

31663166

0 commit comments

Comments
 (0)