Skip to content

Commit c6ffa14

Browse files
committed
integrating clang-mirror generated ids.
1 parent 849ad1b commit c6ffa14

5 files changed

Lines changed: 7 additions & 11 deletions

File tree

CxxTestUtils/inc/TestUtilsDate.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ namespace test_utils
1515
{
1616
struct event
1717
{
18-
static constexpr std::string_view struct_ = "nsdate::Event";
19-
static constexpr std::string_view str_getDate = "getDate";
20-
static constexpr std::string_view str_reset = "reset";
21-
2218
static const bool assert_zero_instance_count();
2319
static const std::size_t get_instance_count();
2420
};

RTLTestRunApp/src/CxxMirrorTests/CxxMirrorThreadingTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ namespace rtl_tests
3232
{
3333
auto _ = rtl::CxxMirror({
3434

35-
rtl::type().record<nsdate::Event>(event::struct_).build(),
35+
rtl::type().record<nsdate::Event>(cxx::type::nsdate::Event::id).build(),
3636

37-
rtl::type().member<nsdate::Event>().method(event::str_reset).build(&nsdate::Event::reset),
37+
rtl::type().member<nsdate::Event>().method(cxx::type::nsdate::Event::fn::reset::id).build(&nsdate::Event::reset),
3838
});
3939

4040
std::cout << "\n [t2]\trtl_tests::InitMirror::reflectingEvent() ==> Done.\n";

RTLTestRunApp/src/FunctionalityTests/MoveConstructorTests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ namespace rtl_tests
157157
EXPECT_TRUE(err0 == error::None);
158158
ASSERT_FALSE(event0.isEmpty());
159159

160-
optional<Record> classEvent = cxx::mirror().getRecord(event::struct_);
160+
optional<Record> classEvent = cxx::mirror().getRecord(cxx::type::nsdate::Event::id);
161161
ASSERT_TRUE(classEvent);
162162

163-
optional<Method> oEventReset = classEvent->getMethod(event::str_reset);
163+
optional<Method> oEventReset = classEvent->getMethod(cxx::type::nsdate::Event::fn::reset::id);
164164
ASSERT_TRUE(oEventReset);
165165

166166
method<RObject, Return()> eventReset = oEventReset->targetT().argsT().returnT();

RTLTestRunApp/src/FunctionalityTests/ReflectionOpErrorCodeTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace rtl_tests
7676

7777
TEST(ReflectionOpErrorCodeTests, error_TypeNotDefaultConstructible)
7878
{
79-
optional<Record> classEvent = cxx::mirror().getRecord(event::struct_);
79+
optional<Record> classEvent = cxx::mirror().getRecord(cxx::type::nsdate::Event::id);
8080
ASSERT_TRUE(classEvent);
8181

8282
auto [err0, robj0] = classEvent->ctorT()(alloc::Stack);

RTLTestRunApp/src/FunctionalityTests/ReturnValueReflectionTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace rtl_tests
1313
TEST(ReflecetdReturnValues, on_registered_return_type__test_cloning)
1414
{
1515
//I don't know if the 'Event' is class or struct..Reflection YaY!. :P
16-
auto classEvent = cxx::mirror().getRecord(cxx::reflected_id(event::struct_));
16+
auto classEvent = cxx::mirror().getRecord(cxx::reflected_id(cxx::type::nsdate::Event::id));
1717
ASSERT_TRUE(classEvent);
1818

1919
auto [err0, robj0] = classEvent->ctorT()(rtl::alloc::Stack);
@@ -46,7 +46,7 @@ namespace rtl_tests
4646

4747
EXPECT_TRUE(err2 == rtl::error::None);
4848
ASSERT_FALSE(event.isEmpty());
49-
EXPECT_TRUE(event.getTypeId() == cxx::reflected_id(event::struct_));
49+
EXPECT_TRUE(event.getTypeId() == cxx::reflected_id(cxx::type::nsdate::Event::id));
5050
{
5151
auto [err, robj] = event.clone<rtl::alloc::Heap>();
5252
//Event's copy-constructor private or deleted.

0 commit comments

Comments
 (0)