Skip to content

Commit 00b4637

Browse files
ajorajor
committed
Unit tests: Remove unnecessary make_unique calls
This was a purely mechanical change made with some find-and-replace macros.
1 parent 3105073 commit 00b4637

File tree

6 files changed

+464
-472
lines changed

6 files changed

+464
-472
lines changed

‎test/test_add_padding.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
using namespace type_graph;
88

99
TEST(AddPaddingTest, BetweenMembers) {
10-
auto myclass = std::make_unique<Class>(Class::Kind::Class, "MyClass", 16);
11-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
12-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
13-
myclass->members.push_back(Member(myint8.get(), "n1", 0));
14-
myclass->members.push_back(Member(myint64.get(), "n2", 8));
10+
auto myclass = Class{Class::Kind::Class, "MyClass", 16};
11+
auto myint8 = Primitive{Primitive::Kind::Int8};
12+
auto myint64 = Primitive{Primitive::Kind::Int64};
13+
myclass.members.push_back(Member(&myint8, "n1", 0));
14+
myclass.members.push_back(Member(&myint64, "n2", 8));
1515

16-
test(AddPadding::createPass(), {*myclass}, R"(
16+
test(AddPadding::createPass(), {myclass}, R"(
1717
[0] Class: MyClass (size: 16)
1818
Member: n1 (offset: 0)
1919
Primitive: int8_t
@@ -26,13 +26,13 @@ TEST(AddPaddingTest, BetweenMembers) {
2626
}
2727

2828
TEST(AddPaddingTest, AtEnd) {
29-
auto myclass = std::make_unique<Class>(Class::Kind::Struct, "MyStruct", 16);
30-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
31-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
32-
myclass->members.push_back(Member(myint64.get(), "n1", 0));
33-
myclass->members.push_back(Member(myint8.get(), "n2", 8));
29+
auto myclass = Class{Class::Kind::Struct, "MyStruct", 16};
30+
auto myint8 = Primitive{Primitive::Kind::Int8};
31+
auto myint64 = Primitive{Primitive::Kind::Int64};
32+
myclass.members.push_back(Member(&myint64, "n1", 0));
33+
myclass.members.push_back(Member(&myint8, "n2", 8));
3434

35-
test(AddPadding::createPass(), {*myclass}, R"(
35+
test(AddPadding::createPass(), {myclass}, R"(
3636
[0] Struct: MyStruct (size: 16)
3737
Member: n1 (offset: 0)
3838
Primitive: int64_t
@@ -45,13 +45,13 @@ TEST(AddPaddingTest, AtEnd) {
4545
}
4646

4747
TEST(AddPaddingTest, UnionNotPadded) {
48-
auto myclass = std::make_unique<Class>(Class::Kind::Union, "MyUnion", 8);
49-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
50-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
51-
myclass->members.push_back(Member(myint64.get(), "n1", 0));
52-
myclass->members.push_back(Member(myint8.get(), "n2", 0));
48+
auto myclass = Class{Class::Kind::Union, "MyUnion", 8};
49+
auto myint8 = Primitive{Primitive::Kind::Int8};
50+
auto myint64 = Primitive{Primitive::Kind::Int64};
51+
myclass.members.push_back(Member(&myint64, "n1", 0));
52+
myclass.members.push_back(Member(&myint8, "n2", 0));
5353

54-
test(AddPadding::createPass(), {*myclass}, R"(
54+
test(AddPadding::createPass(), {myclass}, R"(
5555
[0] Union: MyUnion (size: 8)
5656
Member: n1 (offset: 0)
5757
Primitive: int64_t

‎test/test_alignment_calc.cpp‎

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ void test(Pass pass,
1010
std::string_view expected);
1111

1212
TEST(AlignmentCalcTest, PrimitiveMembers) {
13-
auto myclass = std::make_unique<Class>(Class::Kind::Class, "MyClass", 16);
14-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
15-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
16-
myclass->members.push_back(Member(myint8.get(), "n", 0));
17-
myclass->members.push_back(Member(myint64.get(), "n", 8));
13+
auto myclass = Class{Class::Kind::Class, "MyClass", 16};
14+
auto myint8 = Primitive{Primitive::Kind::Int8};
15+
auto myint64 = Primitive{Primitive::Kind::Int64};
16+
myclass.members.push_back(Member(&myint8, "n", 0));
17+
myclass.members.push_back(Member(&myint64, "n", 8));
1818

19-
test(AlignmentCalc::createPass(), {*myclass}, R"(
19+
test(AlignmentCalc::createPass(), {myclass}, R"(
2020
[0] Class: MyClass (size: 16, align: 8)
2121
Member: n (offset: 0, align: 1)
2222
Primitive: int8_t
@@ -26,17 +26,17 @@ TEST(AlignmentCalcTest, PrimitiveMembers) {
2626
}
2727

2828
TEST(AlignmentCalcTest, StructMembers) {
29-
auto mystruct = std::make_unique<Class>(Class::Kind::Struct, "MyStruct", 8);
30-
auto myint32 = std::make_unique<Primitive>(Primitive::Kind::Int32);
31-
mystruct->members.push_back(Member(myint32.get(), "n1", 0));
32-
mystruct->members.push_back(Member(myint32.get(), "n2", 4));
29+
auto mystruct = Class{Class::Kind::Struct, "MyStruct", 8};
30+
auto myint32 = Primitive{Primitive::Kind::Int32};
31+
mystruct.members.push_back(Member(&myint32, "n1", 0));
32+
mystruct.members.push_back(Member(&myint32, "n2", 4));
3333

34-
auto myclass = std::make_unique<Class>(Class::Kind::Class, "MyClass", 12);
35-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
36-
myclass->members.push_back(Member(myint8.get(), "n", 0));
37-
myclass->members.push_back(Member(mystruct.get(), "s", 4));
34+
auto myclass = Class{Class::Kind::Class, "MyClass", 12};
35+
auto myint8 = Primitive{Primitive::Kind::Int8};
36+
myclass.members.push_back(Member(&myint8, "n", 0));
37+
myclass.members.push_back(Member(&mystruct, "s", 4));
3838

39-
test(AlignmentCalc::createPass(), {*myclass}, R"(
39+
test(AlignmentCalc::createPass(), {myclass}, R"(
4040
[0] Class: MyClass (size: 12, align: 4)
4141
Member: n (offset: 0, align: 1)
4242
Primitive: int8_t
@@ -50,21 +50,16 @@ TEST(AlignmentCalcTest, StructMembers) {
5050
}
5151

5252
TEST(AlignmentCalcTest, StructInContainer) {
53-
auto myclass = std::make_unique<Class>(Class::Kind::Class, "MyClass", 16);
54-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
55-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
56-
myclass->members.push_back(Member(myint8.get(), "n", 0));
57-
myclass->members.push_back(Member(myint64.get(), "n", 8));
53+
auto myclass = Class{Class::Kind::Class, "MyClass", 16};
54+
auto myint8 = Primitive{Primitive::Kind::Int8};
55+
auto myint64 = Primitive{Primitive::Kind::Int64};
56+
myclass.members.push_back(Member(&myint8, "n", 0));
57+
myclass.members.push_back(Member(&myint64, "n", 8));
5858

59-
auto mycontainer = std::make_unique<Container>(ContainerInfo{}, 8);
60-
mycontainer->templateParams.push_back(myclass.get());
59+
auto mycontainer = Container{ContainerInfo{}, 8};
60+
mycontainer.templateParams.push_back(&myclass);
6161

62-
AlignmentCalc calc;
63-
calc.calculateAlignments({*mycontainer});
64-
65-
EXPECT_EQ(myclass->align(), 8);
66-
67-
test(AlignmentCalc::createPass(), {*mycontainer}, R"(
62+
test(AlignmentCalc::createPass(), {mycontainer}, R"(
6863
[0] Container: (size: 8)
6964
Param
7065
[1] Class: MyClass (size: 16, align: 8)
@@ -76,13 +71,13 @@ TEST(AlignmentCalcTest, StructInContainer) {
7671
}
7772

7873
TEST(AlignmentCalcTest, Packed) {
79-
auto mystruct = std::make_unique<Class>(Class::Kind::Struct, "MyStruct", 9);
80-
auto myint8 = std::make_unique<Primitive>(Primitive::Kind::Int8);
81-
auto myint64 = std::make_unique<Primitive>(Primitive::Kind::Int64);
82-
mystruct->members.push_back(Member(myint8.get(), "n1", 0));
83-
mystruct->members.push_back(Member(myint64.get(), "n2", 1));
74+
auto mystruct = Class{Class::Kind::Struct, "MyStruct", 9};
75+
auto myint8 = Primitive{Primitive::Kind::Int8};
76+
auto myint64 = Primitive{Primitive::Kind::Int64};
77+
mystruct.members.push_back(Member(&myint8, "n1", 0));
78+
mystruct.members.push_back(Member(&myint64, "n2", 1));
8479

85-
test(AlignmentCalc::createPass(), {*mystruct}, R"(
80+
test(AlignmentCalc::createPass(), {mystruct}, R"(
8681
[0] Struct: MyStruct (size: 9, align: 8, packed)
8782
Member: n1 (offset: 0, align: 1)
8883
Primitive: int8_t

0 commit comments

Comments
 (0)