Skip to content

Commit 869d8e5

Browse files
OzanCanselOzanCansel
authored
Tests fix. (#1155)
1 parent 90942e3 commit 869d8e5

13 files changed

+70
-58
lines changed

‎hazelcast/test/src/compact/compact_generic_record_builder_test.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CompactGenericRecordBuilderTest : public compact_test_base
3131
protected:
3232
SerializationService& serialization_service()
3333
{
34-
return spi::ClientContext{ client }.get_serialization_service();
34+
return spi::ClientContext{ *client }.get_serialization_service();
3535
}
3636
};
3737

@@ -129,7 +129,7 @@ TEST_F(CompactGenericRecordBuilderTest,
129129
}
130130

131131
// Ensure that schema is distributed
132-
client.get_map(random_string())
132+
client->get_map(random_string())
133133
.get()
134134
->put(random_string(), list.front())
135135
.get();

‎hazelcast/test/src/compact/compact_generic_record_integration_test.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CompactGenericRecordIntegrationTest : public compact_test_base
3939

4040
remote_controller_client().executeOnController(
4141
response,
42-
factory_.get_cluster_id(),
42+
factory_->get_cluster_id(),
4343
(boost::format(
4444
R"(
4545
var clusterMap = instance_0.getMap("%1%");
@@ -71,7 +71,7 @@ class CompactGenericRecordIntegrationTest : public compact_test_base
7171

7272
remote_controller_client().executeOnController(
7373
response,
74-
factory_.get_cluster_id(),
74+
factory_->get_cluster_id(),
7575
(boost::format(
7676
R"(
7777
var map = instance_0.getMap("%1%");
@@ -143,9 +143,9 @@ class CompactGenericRecordIntegrationTest : public compact_test_base
143143
record.getFieldKind("date") === com.hazelcast.nio.serialization.FieldKind.DATE &&
144144
record.getDate("date").getYear() == 2023 &&
145145
record.getDate("date").getMonthValue() == 2 &&)"
146-
// Splitted into two chunks
147-
// Because MSVC complains about it !!!
148-
R"(
146+
// Splitted into two chunks
147+
// Because MSVC complains about it !!!
148+
R"(
149149
record.getDate("date").getDayOfMonth() == 6 &&
150150
record.getFieldKind("date_null") === com.hazelcast.nio.serialization.FieldKind.DATE &&
151151
record.getDate("date_null") === null &&
@@ -302,7 +302,7 @@ TEST_F(CompactGenericRecordIntegrationTest, test_put_generic_record_back)
302302
// Counterpart is 'test' but using random string is
303303
// better to prevent name clashes.
304304
auto map_name = random_string();
305-
auto map = client.get_map(map_name).get();
305+
auto map = client->get_map(map_name).get();
306306

307307
named_compact expected{ "foo", 900 };
308308

@@ -319,7 +319,7 @@ TEST_F(CompactGenericRecordIntegrationTest, test_put_generic_record_back)
319319

320320
TEST_F(CompactGenericRecordIntegrationTest, test_put_get)
321321
{
322-
auto map = client.get_map(random_string()).get();
322+
auto map = client->get_map(random_string()).get();
323323

324324
map->put(1, create_generic_record()).get();
325325
boost::optional<generic_record> record =
@@ -618,7 +618,7 @@ TEST_F(CompactGenericRecordIntegrationTest,
618618
auto record = create_generic_record();
619619

620620
auto map_name = random_string();
621-
client.get_map(map_name).get()->put(1, record).get();
621+
client->get_map(map_name).get()->put(1, record).get();
622622

623623
validate_record(map_name);
624624
}
@@ -629,9 +629,9 @@ TEST_F(CompactGenericRecordIntegrationTest, test_put_and_read_with_sql)
629629
auto record = create_generic_record(type_name);
630630

631631
auto map_name = random_string();
632-
client.get_map(map_name).get()->put(1, record).get();
632+
client->get_map(map_name).get()->put(1, record).get();
633633

634-
(void)client.get_sql()
634+
(void)client->get_sql()
635635
.execute(boost::str(boost::format(
636636
R"(
637637
CREATE MAPPING "%1%" (
@@ -649,7 +649,7 @@ TEST_F(CompactGenericRecordIntegrationTest, test_put_and_read_with_sql)
649649
.get();
650650

651651
auto result =
652-
client.get_sql()
652+
client->get_sql()
653653
.execute(boost::str(boost::format("SELECT * FROM %1%") % map_name))
654654
.get();
655655

‎hazelcast/test/src/compact/compact_generic_record_test.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class CompactGenericRecordTest : public compact_test_base
3737

3838
SerializationService& serialization_service()
3939
{
40-
return spi::ClientContext{ client }.get_serialization_service();
40+
return spi::ClientContext{ *client }.get_serialization_service();
4141
}
4242

4343
void assert_setter_throws(generic_record_builder& builder,
@@ -113,7 +113,7 @@ TEST_F(CompactGenericRecordTest, test_get_field_kind)
113113
auto data = service.to_data(record);
114114

115115
// Ensure that schema is distributed
116-
client.get_map(random_string()).get()->put(random_string(), record).get();
116+
client->get_map(random_string()).get()->put(random_string(), record).get();
117117
auto internal_generic_record = service.to_object<generic_record>(data);
118118

119119
ASSERT_TRUE(internal_generic_record.has_value());
@@ -150,7 +150,7 @@ TEST_F(CompactGenericRecordTest,
150150
auto data = ss.to_data(record);
151151

152152
// Ensure that schema is distributed
153-
client.get_map(random_string()).get()->put(random_string(), record).get();
153+
client->get_map(random_string()).get()->put(random_string(), record).get();
154154
boost::optional<generic_record> internal_generic_record =
155155
ss.to_object<generic_record>(data);
156156

@@ -183,7 +183,7 @@ TEST_F(CompactGenericRecordTest,
183183
auto data = ss.to_data(record);
184184

185185
// Ensure that schema is distributed
186-
client.get_map(random_string()).get()->put(random_string(), record).get();
186+
client->get_map(random_string()).get()->put(random_string(), record).get();
187187
boost::optional<generic_record> internal_generic_record =
188188
ss.to_object<generic_record>(data);
189189

‎hazelcast/test/src/compact/compact_nullable_primitive_interoperability_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class CompactNullablePrimitiveInteroperabilityTest : public compact_test_base
5454
protected:
5555
SerializationService& serialization_service()
5656
{
57-
return spi::ClientContext{ client }.get_serialization_service();
57+
return spi::ClientContext{ *client }.get_serialization_service();
5858
}
5959
};
6060

‎hazelcast/test/src/compact/compact_read_write_integration_test.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ TEST_F(CompactReadWriteIntegrationTest, map_put_get)
4141
auto map_name = random_string();
4242
auto key = random_string();
4343

44-
auto map = client.get_map(map_name).get();
44+
auto map = client->get_map(map_name).get();
4545

4646
map->put(key, dto).get();
4747
auto actual = map->get<std::string, main_dto>(key).get();
@@ -57,7 +57,7 @@ TEST_F(CompactReadWriteIntegrationTest, write_read_sql)
5757
auto key = random_string();
5858
auto type_name = serialization::hz_serializer<sample_compact_type>::type_name();
5959

60-
auto map = client.get_map(map_name).get();
60+
auto map = client->get_map(map_name).get();
6161

6262
map->put(key, value).get();
6363

@@ -74,9 +74,9 @@ TEST_F(CompactReadWriteIntegrationTest, write_read_sql)
7474
map_name % type_name)
7575
.str();
7676

77-
(void)client.get_sql().execute(query).get();
77+
(void)client->get_sql().execute(query).get();
7878

79-
auto result = client.get_sql()
79+
auto result = client->get_sql()
8080
.execute(str(boost::format("SELECT * FROM %1%") % map_name))
8181
.get();
8282

‎hazelcast/test/src/compact/compact_schema_fetch_on_read.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CompactSchemaFetchOnRead : public compact_test_base
4040

4141
serialization::pimpl::default_schema_service& schema_service()
4242
{
43-
return spi::ClientContext{ client }.get_schema_service();
43+
return spi::ClientContext{ *client }.get_schema_service();
4444
}
4545

4646
void put_record_with_rc()
@@ -49,7 +49,7 @@ class CompactSchemaFetchOnRead : public compact_test_base
4949

5050
remote_controller_client().executeOnController(
5151
response,
52-
factory_.get_cluster_id(),
52+
factory_->get_cluster_id(),
5353
(boost::format(
5454
R"(
5555
var nested_type = com.hazelcast.nio.serialization.genericrecord.GenericRecordBuilder.compact("%1%").setInt32("y", 101).build();
@@ -64,7 +64,8 @@ class CompactSchemaFetchOnRead : public compact_test_base
6464
result = "true";
6565
)") %
6666
serialization::hz_serializer<nested_type>::type_name() %
67-
serialization::hz_serializer<sample_compact_type>::type_name() % map_name_ % key_)
67+
serialization::hz_serializer<sample_compact_type>::type_name() %
68+
map_name_ % key_)
6869
.str(),
6970
Lang::JAVASCRIPT);
7071

@@ -78,7 +79,7 @@ class CompactSchemaFetchOnRead : public compact_test_base
7879

7980
remote_controller_client().executeOnController(
8081
response,
81-
factory_.get_cluster_id(),
82+
factory_->get_cluster_id(),
8283
(boost::format(
8384
R"(
8485
var value = com.hazelcast.nio.serialization.genericrecord.GenericRecordBuilder.compact("wrong_type_name").build();
@@ -104,7 +105,7 @@ TEST_F(CompactSchemaFetchOnRead, imap_get)
104105
{
105106
put_record_with_rc();
106107

107-
auto map = client.get_map(map_name_).get();
108+
auto map = client->get_map(map_name_).get();
108109
auto a_t = map->get<std::string, sample_compact_type>(key_).get();
109110

110111
EXPECT_EQ(a_t->x, 100);
@@ -115,7 +116,7 @@ TEST_F(CompactSchemaFetchOnRead, ensure_schema_is_cached)
115116
{
116117
put_record_with_rc();
117118

118-
auto map = client.get_map(map_name_).get();
119+
auto map = client->get_map(map_name_).get();
119120

120121
ASSERT_FALSE(schema_service().has_any_schemas());
121122

@@ -128,7 +129,7 @@ TEST_F(CompactSchemaFetchOnRead, throw_exception_on_typename_mismatch)
128129
{
129130
put_record_with_different_name();
130131

131-
auto map = client.get_map(map_name_).get();
132+
auto map = client->get_map(map_name_).get();
132133

133134
auto fn = [=]() { map->get<std::string, sample_compact_type>(key_).get(); };
134135

@@ -153,10 +154,10 @@ TEST_F(CompactSchemaFetchOnRead, sql_read)
153154
map_name_ % serialization::hz_serializer<sample_compact_type>::type_name())
154155
.str();
155156

156-
(void)client.get_sql().execute(query).get();
157+
(void)client->get_sql().execute(query).get();
157158

158159
auto result =
159-
client.get_sql()
160+
client->get_sql()
160161
.execute(str(boost::format("SELECT * FROM %1%") % map_name_))
161162
.get();
162163

‎hazelcast/test/src/compact/compact_schema_replication_on_cluster_restart_test.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class CompactSchemaReplicationOnClusterRestart : public compact_test_base
4343

4444
remote_controller_client().executeOnController(
4545
response,
46-
factory_.get_cluster_id(),
46+
factory_->get_cluster_id(),
4747
R"(
4848
var length = instance_0.getOriginal().node.getSchemaService().getAllSchemas().size();
4949
result = "" + length;
@@ -63,18 +63,18 @@ TEST_F(CompactSchemaReplicationOnClusterRestart, on_cluster_restart)
6363
auto schema_parent = get_schema<sample_compact_type>();
6464
auto schema_child = get_schema<nested_type>();
6565

66-
auto map = client.get_map(random_string()).get();
66+
auto map = client->get_map(random_string()).get();
6767

6868
map->put(random_string(), sample_compact_type{}).get();
6969

70-
member_.shutdown();
70+
member_->shutdown();
7171

7272
boost::latch connected_latch(1);
7373

74-
client.add_lifecycle_listener(lifecycle_listener().on_connected(
74+
client->add_lifecycle_listener(lifecycle_listener().on_connected(
7575
[&connected_latch]() { connected_latch.try_count_down(); }));
7676

77-
HazelcastServer another_member{ factory_ };
77+
HazelcastServer another_member{ *factory_ };
7878

7979
ASSERT_OPEN_EVENTUALLY(connected_latch);
8080
ASSERT_TRUE_EVENTUALLY(check_schema_on_backend(schema_parent) &&
@@ -88,14 +88,14 @@ TEST_F(CompactSchemaReplicationOnClusterRestart,
8888

8989
ASSERT_TRUE_EVENTUALLY(condition());
9090

91-
member_.shutdown();
91+
member_->shutdown();
9292

9393
boost::latch connected_latch(1);
9494

95-
client.add_lifecycle_listener(lifecycle_listener().on_connected(
95+
client->add_lifecycle_listener(lifecycle_listener().on_connected(
9696
[&connected_latch]() { connected_latch.try_count_down(); }));
9797

98-
HazelcastServer another_member{ factory_ };
98+
HazelcastServer another_member{ *factory_ };
9999

100100
ASSERT_OPEN_EVENTUALLY(connected_latch);
101101
ASSERT_TRUE_ALL_THE_TIME(condition(), 1);

‎hazelcast/test/src/compact/compact_schema_replication_on_write_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ TEST_F(CompactSchemaReplicationOnWrite, imap_put)
4545
ASSERT_EQ(check_schema_on_backend(schema_parent), false);
4646
ASSERT_EQ(check_schema_on_backend(schema_child), false);
4747

48-
auto map = client.get_map(random_string()).get();
48+
auto map = client->get_map(random_string()).get();
4949

5050
map->put(random_string(), sample_compact_type{}).get();
5151

‎hazelcast/test/src/compact/compact_schema_replication_stress_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ TEST_F(CompactSchemaReplicationStress, test)
6868
{
6969
using replication_work_t =
7070
boost::future<std::vector<serialization::pimpl::schema>>;
71-
auto map = client.get_map(random_string()).get();
71+
auto map = client->get_map(random_string()).get();
7272

7373
replication_work_t replication_works[] = {
7474
boost::async(boost::launch::async, replicate_schemas<0, 10>, map),

‎hazelcast/test/src/compact/compact_schema_validation_test.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CompactSchemaValidation : public compact_test_base
4949

5050
remote_controller_client().executeOnController(
5151
response,
52-
factory_.get_cluster_id(),
52+
factory_->get_cluster_id(),
5353
(boost::format(
5454
R"(
5555
var schemas = instance_0.getOriginal().node.getSchemaService().getAllSchemas();

0 commit comments

Comments
 (0)