Skip to content

Commit c40fbe3

Browse files
shewitt-aushewitt-au
committed
Work on unit tests
1 parent 093a4e1 commit c40fbe3

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

‎tests/include/test_patterns/test_pattern_bitfields.hpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@ namespace pl::test {
1313

1414
std::vector<std::shared_ptr<Pattern>> bitfieldFields;
1515
{
16-
bitfieldFields.push_back(create<PatternBitfieldField>("", "a", 0x25, 0, 2, 0, testBitfield.get()));
17-
bitfieldFields.push_back(create<PatternBitfieldField>("", "b", 0x25, 2, 3, 0, testBitfield.get()));
16+
bitfieldFields.push_back(create<PatternBitfieldField>("", "a", 0x25, 0, 2, 0, testBitfield.reference()));
17+
bitfieldFields.push_back(create<PatternBitfieldField>("", "b", 0x25, 2, 3, 0, testBitfield.reference()));
1818

1919
auto nestedBitfield = create<PatternBitfield>("NestedBitfield", "c", 0x25, 5, 4 * 2, 0);
2020
std::vector<std::shared_ptr<Pattern>> nestedFields;
2121
{
22-
nestedFields.push_back(create<PatternBitfieldField>("", "nestedA", 0x25, 5, 4, 0, testBitfield.get()));
23-
nestedFields.push_back(create<PatternBitfieldField>("", "nestedB", 0x26, 1, 4, 0, testBitfield.get()));
22+
nestedFields.push_back(create<PatternBitfieldField>("", "nestedA", 0x25, 5, 4, 0, testBitfield.reference()));
23+
nestedFields.push_back(create<PatternBitfieldField>("", "nestedB", 0x26, 1, 4, 0, testBitfield.reference()));
2424
}
25-
nestedBitfield->setParent(testBitfield.get());
25+
nestedBitfield->setParent(testBitfield.reference());
2626
nestedBitfield->setFields(std::move(nestedFields));
2727
nestedBitfield->setEndian(std::endian::big);
2828
bitfieldFields.push_back(std::move(nestedBitfield));
2929

30-
bitfieldFields.push_back(create<PatternBitfieldField>("", "d", 0x26, 5, 4, 0, testBitfield.get()));
31-
bitfieldFields.push_back(create<PatternBitfieldField>("", "e", 0x27, 1, 4, 0, testBitfield.get()));
30+
bitfieldFields.push_back(create<PatternBitfieldField>("", "d", 0x26, 5, 4, 0, testBitfield.reference()));
31+
bitfieldFields.push_back(create<PatternBitfieldField>("", "e", 0x27, 1, 4, 0, testBitfield.reference()));
3232

3333
auto array = create<PatternBitfieldArray>("NestedBitfield", "f", 0x27, 5, 4 * 4, 0);
3434
std::vector<std::shared_ptr<Pattern>> arrayEntries;
3535
{
3636
auto array0Bitfield = create<PatternBitfield>("NestedBitfield", "[0]", 0x27, 5, 4 * 2, 0);
3737
std::vector<std::shared_ptr<Pattern>> array0Fields;
3838
{
39-
array0Fields.push_back(create<PatternBitfieldField>("", "nestedA", 0x27, 5, 4, 0, array0Bitfield.get()));
40-
array0Fields.push_back(create<PatternBitfieldField>("", "nestedB", 0x28, 1, 4, 0, array0Bitfield.get()));
39+
array0Fields.push_back(create<PatternBitfieldField>("", "nestedA", 0x27, 5, 4, 0, array0Bitfield.reference()));
40+
array0Fields.push_back(create<PatternBitfieldField>("", "nestedB", 0x28, 1, 4, 0, array0Bitfield.reference()));
4141
}
42-
array0Bitfield->setParent(array.get());
42+
array0Bitfield->setParent(array.reference());
4343
array0Bitfield->setFields(std::move(array0Fields));
4444
array0Bitfield->setEndian(std::endian::big);
4545
arrayEntries.push_back(std::move(array0Bitfield));
4646

4747
auto array1Bitfield = create<PatternBitfield>("NestedBitfield", "[1]", 0x28, 5, 4 * 2, 0);
4848
std::vector<std::shared_ptr<Pattern>> array1Fields;
4949
{
50-
array1Fields.push_back(create<PatternBitfieldField>("", "nestedA", 0x28, 5, 4, 0, array1Bitfield.get()));
51-
array1Fields.push_back(create<PatternBitfieldField>("", "nestedB", 0x29, 1, 4, 0, array1Bitfield.get()));
50+
array1Fields.push_back(create<PatternBitfieldField>("", "nestedA", 0x28, 5, 4, 0, array1Bitfield.reference()));
51+
array1Fields.push_back(create<PatternBitfieldField>("", "nestedB", 0x29, 1, 4, 0, array1Bitfield.reference()));
5252
}
53-
array1Bitfield->setParent(array.get());
53+
array1Bitfield->setParent(array.reference());
5454
array1Bitfield->setFields(std::move(array1Fields));
5555
array1Bitfield->setEndian(std::endian::big);
5656
arrayEntries.push_back(std::move(array1Bitfield));
5757
}
58-
array->setParent(testBitfield.get());
58+
array->setParent(testBitfield.reference());
5959
array->setEntries(arrayEntries);
6060
array->setEndian(std::endian::big);
6161
bitfieldFields.push_back(std::move(array));
@@ -107,14 +107,14 @@ namespace pl::test {
107107

108108
std::vector<std::shared_ptr<Pattern>> bitfieldFields;
109109
{
110-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag0", 0x03, 7, 1, 0, testBitfield.get()));
111-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag1", 0x03, 6, 1, 0, testBitfield.get()));
112-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag2", 0x03, 5, 1, 0, testBitfield.get()));
113-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag3", 0x03, 4, 1, 0, testBitfield.get()));
114-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag4", 0x03, 3, 1, 0, testBitfield.get()));
115-
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag5", 0x03, 2, 1, 0, testBitfield.get()));
116-
117-
auto enumField = create<PatternBitfieldFieldEnum>("Enum", "enumerated", 0x02, 4, 6, 0, testBitfield.get());
110+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag0", 0x03, 7, 1, 0, testBitfield.reference()));
111+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag1", 0x03, 6, 1, 0, testBitfield.reference()));
112+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag2", 0x03, 5, 1, 0, testBitfield.reference()));
113+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag3", 0x03, 4, 1, 0, testBitfield.reference()));
114+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag4", 0x03, 3, 1, 0, testBitfield.reference()));
115+
bitfieldFields.push_back(create<PatternBitfieldField>("", "flag5", 0x03, 2, 1, 0, testBitfield.reference()));
116+
117+
auto enumField = create<PatternBitfieldFieldEnum>("Enum", "enumerated", 0x02, 4, 6, 0, testBitfield.reference());
118118
std::map<std::string, PatternEnum::EnumValue> values;
119119
{
120120
values.insert({ "A", { 0x39, 0x39 } });

0 commit comments

Comments
 (0)