Skip to content

Commit bcb60be

Browse files
committed
improve C++ namespacs in tests
1 parent ec02203 commit bcb60be

File tree

4 files changed

+57
-40
lines changed

4 files changed

+57
-40
lines changed

worker/src/RTC/Serializable.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
namespace RTC
1010
{
11+
Serializable::Serializable(const uint8_t* buffer, size_t bufferLength)
12+
: buffer(const_cast<uint8_t*>(buffer)), bufferLength(bufferLength)
13+
{
14+
MS_TRACE();
15+
}
16+
1117
void Serializable::Serialize(uint8_t* buffer, size_t bufferLength)
1218
{
1319
MS_TRACE();

worker/test/include/RTC/SCTP/common.hpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515

1616
using namespace RTC::SCTP;
1717

18-
// NOTE: We need to declare them here with `extern` and then define them in
19-
// helpers.cpp.
20-
extern thread_local uint8_t FactoryBuffer[66661];
21-
extern thread_local uint8_t SerializeBuffer[66662];
22-
extern thread_local uint8_t CloneBuffer[66663];
23-
extern thread_local uint8_t DataBuffer[66664];
24-
extern thread_local uint8_t ThrowBuffer[66665];
18+
namespace RTC
19+
{
20+
namespace SCTP
21+
{
22+
// NOTE: We need to declare them here with `extern` and then define them in
23+
// common.cpp.
24+
extern thread_local uint8_t FactoryBuffer[66661];
25+
extern thread_local uint8_t SerializeBuffer[66662];
26+
extern thread_local uint8_t CloneBuffer[66663];
27+
extern thread_local uint8_t DataBuffer[66664];
28+
extern thread_local uint8_t ThrowBuffer[66665];
2529

26-
void ResetBuffers();
30+
void ResetBuffers();
31+
} // namespace SCTP
32+
} // namespace RTC
2733

2834
// clang-format off
2935
// NOLINTNEXTLINE (cppcoreguidelines-macro-usage)
@@ -37,7 +43,7 @@ void ResetBuffers();
3743
/*uint16_t*/ destinationPort, \
3844
/*uint32_t*/ verificationTag, \
3945
/*uint32_t*/ checksum, \
40-
/*hasValidCrc32cChecksum*/ hasValidCrc32cChecksum, \
46+
/*bool*/ hasValidCrc32cChecksum, \
4147
/*size_t*/ chunksCount) \
4248
do \
4349
{ \

worker/test/include/helpers.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace helpers
2626
size_t* len);
2727

2828
bool AreBuffersEqual(const uint8_t* data1, size_t size1, const uint8_t* data2, size_t size2);
29+
2930
std::unique_ptr<RTC::RtpPacket> CreateRtpPacket(uint8_t* payload, size_t len);
3031
} // namespace helpers
3132

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,40 @@
11
#include "RTC/SCTP/common.hpp" // in worker/test/include/
22
#include <cstring> // std::memset
33

4-
using namespace RTC::SCTP;
5-
6-
thread_local uint8_t FactoryBuffer[];
7-
thread_local uint8_t SerializeBuffer[];
8-
thread_local uint8_t CloneBuffer[];
9-
thread_local uint8_t DataBuffer[];
10-
thread_local uint8_t ThrowBuffer[];
11-
12-
void ResetBuffers()
4+
namespace RTC
135
{
14-
std::memset(FactoryBuffer, 0xAA, sizeof(FactoryBuffer));
15-
std::memset(SerializeBuffer, 0xBB, sizeof(SerializeBuffer));
16-
std::memset(CloneBuffer, 0xCC, sizeof(CloneBuffer));
17-
std::memset(DataBuffer, 0xDD, sizeof(DataBuffer));
18-
std::memset(ThrowBuffer, 0xEE, sizeof(ThrowBuffer));
6+
namespace SCTP
7+
{
8+
thread_local uint8_t FactoryBuffer[];
9+
thread_local uint8_t SerializeBuffer[];
10+
thread_local uint8_t CloneBuffer[];
11+
thread_local uint8_t DataBuffer[];
12+
thread_local uint8_t ThrowBuffer[];
13+
14+
void ResetBuffers()
15+
{
16+
std::memset(FactoryBuffer, 0xAA, sizeof(FactoryBuffer));
17+
std::memset(SerializeBuffer, 0xBB, sizeof(SerializeBuffer));
18+
std::memset(CloneBuffer, 0xCC, sizeof(CloneBuffer));
19+
std::memset(DataBuffer, 0xDD, sizeof(DataBuffer));
20+
std::memset(ThrowBuffer, 0xEE, sizeof(ThrowBuffer));
1921

20-
DataBuffer[0] = 0x00;
21-
DataBuffer[1] = 0x01;
22-
DataBuffer[2] = 0x02;
23-
DataBuffer[3] = 0x03;
24-
DataBuffer[4] = 0x04;
25-
DataBuffer[5] = 0x05;
26-
DataBuffer[6] = 0x06;
27-
DataBuffer[7] = 0x07;
28-
DataBuffer[8] = 0x08;
29-
DataBuffer[9] = 0x09;
30-
DataBuffer[10] = 0x0A;
31-
DataBuffer[11] = 0x0B;
32-
DataBuffer[12] = 0x0C;
33-
DataBuffer[13] = 0x0D;
34-
DataBuffer[14] = 0x0E;
35-
DataBuffer[15] = 0x0F;
36-
}
22+
DataBuffer[0] = 0x00;
23+
DataBuffer[1] = 0x01;
24+
DataBuffer[2] = 0x02;
25+
DataBuffer[3] = 0x03;
26+
DataBuffer[4] = 0x04;
27+
DataBuffer[5] = 0x05;
28+
DataBuffer[6] = 0x06;
29+
DataBuffer[7] = 0x07;
30+
DataBuffer[8] = 0x08;
31+
DataBuffer[9] = 0x09;
32+
DataBuffer[10] = 0x0A;
33+
DataBuffer[11] = 0x0B;
34+
DataBuffer[12] = 0x0C;
35+
DataBuffer[13] = 0x0D;
36+
DataBuffer[14] = 0x0E;
37+
DataBuffer[15] = 0x0F;
38+
}
39+
} // namespace SCTP
40+
} // namespace RTC

0 commit comments

Comments
 (0)