Skip to content

Commit

Permalink
[test] replace some u8 array with literal string to reduce file size
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathanpoelen
jonathanpoelen committed Mar 4, 2024
1 parent ef8bdcb commit 5bc07c2
Show file tree
Hide file tree
Showing 14 changed files with 54,949 additions and 54,952 deletions.
34 changes: 17 additions & 17 deletions tests/core/RDP/mppc/test_mppc_40.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,34 +29,34 @@ RED_AUTO_TEST_CASE(TestRDP40BlukCompression4)

rdp_mppc_40_enc mppc_enc;

static_assert(sizeof(historyBuffer) == RDP_40_HIST_BUF_LEN);
static_assert(sizeof(outputBufferPlus) == RDP_40_HIST_BUF_LEN + 64);
static_assert(sizeof(hash_table) == rdp_mppc_40_enc::hash_table_manager::get_table_size());
static_assert(sizeof(uncompressed_data) == 204);
static_assert(sizeof(compressed_data) == 18);
static_assert(historyBuffer.size() == RDP_40_HIST_BUF_LEN);
static_assert(outputBufferPlus.size() == RDP_40_HIST_BUF_LEN + 64);
static_assert(hash_table.size() == rdp_mppc_40_enc::hash_table_manager::get_table_size());
static_assert(uncompressed_data.size() == 204);
static_assert(compressed_data.size() == 18);


memcpy(mppc_enc.historyBuffer, historyBuffer, RDP_40_HIST_BUF_LEN);
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus, RDP_40_HIST_BUF_LEN + 64);
memcpy(mppc_enc.historyBuffer, historyBuffer.data(), historyBuffer.size());
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus.data(), outputBufferPlus.size());
mppc_enc.historyOffset = 2974;
mppc_enc.bytes_in_opb = 21;
mppc_enc.flags = 0x20;
mppc_enc.flagsHold = 0;
mppc_enc.first_pkt = false;
mppc_enc.hash_tab_mgr.initialize_hash_table(hash_table);
mppc_enc.hash_tab_mgr.initialize_hash_table(byte_ptr_cast(hash_table.data()));

uint8_t compressionFlags;
uint16_t datalen;

mppc_enc.compress(uncompressed_data, sizeof(uncompressed_data), compressionFlags, datalen,
rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);
mppc_enc.compress(
byte_ptr_cast(uncompressed_data.data()), uncompressed_data.size(),
compressionFlags, datalen, rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);

int flags = PACKET_COMPRESSED;

RED_CHECK_EQUAL(flags, (compressionFlags & PACKET_COMPRESSED));
RED_CHECK_EQUAL(18, datalen);
RED_CHECK(make_array_view(compressed_data) ==
array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
RED_CHECK(compressed_data == array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
}

RED_AUTO_TEST_CASE(TestRDP50BlukDecompression6)
Expand All @@ -65,15 +65,15 @@ RED_AUTO_TEST_CASE(TestRDP50BlukDecompression6)

rdp_mppc_40_dec mppc_dec;

static_assert(sizeof(compressed_data) == 2241);
static_assert(sizeof(uncompressed_data) == 4312);
static_assert(compressed_data.size() == 2241);
static_assert(uncompressed_data.size() == 4312);
static_assert(historyBuffer.size() == RDP_40_HIST_BUF_LEN);

memcpy(mppc_dec.history_buf, historyBuffer, RDP_40_HIST_BUF_LEN);
memcpy(mppc_dec.history_buf, historyBuffer.data(), historyBuffer.size());
mppc_dec.history_buf_end = mppc_dec.history_buf + 8191;
mppc_dec.history_ptr = mppc_dec.history_buf + 4314;

uint8_t compressionFlags = 0x60;

RED_CHECK(make_array_view(uncompressed_data) ==
mppc_dec.decompress(make_array_view(compressed_data), compressionFlags));
RED_CHECK(uncompressed_data == mppc_dec.decompress(compressed_data, compressionFlags));
}
60 changes: 30 additions & 30 deletions tests/core/RDP/mppc/test_mppc_50.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,33 @@ RED_AUTO_TEST_CASE(TestRDP50BlukCompression2)

rdp_mppc_50_enc mppc_enc;

static_assert(sizeof(historyBuffer) == RDP_50_HIST_BUF_LEN);
static_assert(sizeof(outputBufferPlus) == RDP_50_HIST_BUF_LEN + 64);
static_assert(sizeof(hash_table) == rdp_mppc_50_enc::hash_table_manager::get_table_size());
static_assert(sizeof(uncompressed_data) == 4037);
static_assert(sizeof(compressed_data) == 3015);

memcpy(mppc_enc.historyBuffer, historyBuffer, RDP_50_HIST_BUF_LEN);
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus, RDP_50_HIST_BUF_LEN + 64);
static_assert(historyBuffer.size() == RDP_50_HIST_BUF_LEN);
static_assert(outputBufferPlus.size() == RDP_50_HIST_BUF_LEN + 64);
static_assert(hash_table.size() == rdp_mppc_50_enc::hash_table_manager::get_table_size());
static_assert(uncompressed_data.size() == 4037);
static_assert(compressed_data.size() == 3015);

memcpy(mppc_enc.historyBuffer, historyBuffer.data(), historyBuffer.size());
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus.data(), outputBufferPlus.size());
mppc_enc.historyOffset = 61499;
mppc_enc.bytes_in_opb = 2834;
mppc_enc.flags = 33;
mppc_enc.flagsHold = 0;
mppc_enc.first_pkt = false;
mppc_enc.hash_tab_mgr.initialize_hash_table(hash_table);
mppc_enc.hash_tab_mgr.initialize_hash_table(byte_ptr_cast(hash_table.data()));

uint8_t compressionFlags;
uint16_t datalen;

mppc_enc.compress(uncompressed_data, sizeof(uncompressed_data), compressionFlags, datalen,
rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);
mppc_enc.compress(
byte_ptr_cast(uncompressed_data.data()), uncompressed_data.size(),
compressionFlags, datalen, rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);

int flags = PACKET_COMPRESSED;

RED_CHECK_EQUAL(flags, (compressionFlags & PACKET_COMPRESSED));
RED_CHECK_EQUAL(3015, datalen);
RED_CHECK(make_array_view(compressed_data) ==
array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
RED_CHECK(compressed_data == array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
}

RED_AUTO_TEST_CASE(TestRDP50BlukCompression3)
Expand All @@ -64,34 +64,34 @@ RED_AUTO_TEST_CASE(TestRDP50BlukCompression3)

rdp_mppc_50_enc mppc_enc;

static_assert(sizeof(historyBuffer) == RDP_50_HIST_BUF_LEN);
static_assert(sizeof(outputBufferPlus) == RDP_50_HIST_BUF_LEN + 64);
static_assert(sizeof(hash_table) == rdp_mppc_50_enc::hash_table_manager::get_table_size());
static_assert(sizeof(uncompressed_data) == 12851);
static_assert(sizeof(compressed_data) == 8893);
static_assert(historyBuffer.size() == RDP_50_HIST_BUF_LEN);
static_assert(outputBufferPlus.size() == RDP_50_HIST_BUF_LEN + 64);
static_assert(hash_table.size() == rdp_mppc_50_enc::hash_table_manager::get_table_size());
static_assert(uncompressed_data.size() == 12851);
static_assert(compressed_data.size() == 8893);


memcpy(mppc_enc.historyBuffer, historyBuffer, RDP_50_HIST_BUF_LEN);
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus, RDP_50_HIST_BUF_LEN + 64);
memcpy(mppc_enc.historyBuffer, historyBuffer.data(), historyBuffer.size());
memcpy(mppc_enc.outputBufferPlus, outputBufferPlus.data(), outputBufferPlus.size());
mppc_enc.historyOffset = 0;
mppc_enc.bytes_in_opb = 0;
mppc_enc.flags = 0;
mppc_enc.flagsHold = 0;
mppc_enc.first_pkt = true;
mppc_enc.hash_tab_mgr.initialize_hash_table(hash_table);
mppc_enc.hash_tab_mgr.initialize_hash_table(byte_ptr_cast(hash_table.data()));

uint8_t compressionFlags;
uint16_t datalen;

mppc_enc.compress(uncompressed_data, sizeof(uncompressed_data), compressionFlags, datalen,
rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);
mppc_enc.compress(
byte_ptr_cast(uncompressed_data.data()), uncompressed_data.size(),
compressionFlags, datalen, rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);

int flags = PACKET_COMPRESSED;

RED_CHECK_EQUAL(flags, (compressionFlags & PACKET_COMPRESSED));
RED_CHECK_EQUAL(8893, datalen);
RED_CHECK(make_array_view(compressed_data) ==
array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
RED_CHECK(compressed_data == array_view(mppc_enc.outputBuffer, mppc_enc.bytes_in_opb));
}

RED_AUTO_TEST_CASE(TestRDP50BlukDecompression5)
Expand All @@ -100,16 +100,16 @@ RED_AUTO_TEST_CASE(TestRDP50BlukDecompression5)

rdp_mppc_50_dec mppc_dec;

static_assert(sizeof(compressed_data) == 2053);
static_assert(sizeof(uncompressed_data) == 3790);
static_assert(compressed_data.size() == 2053);
static_assert(uncompressed_data.size() == 3790);
static_assert(historyBuffer.size() == RDP_50_HIST_BUF_LEN);


memcpy(mppc_dec.history_buf, historyBuffer, RDP_50_HIST_BUF_LEN);
memcpy(mppc_dec.history_buf, historyBuffer.data(), historyBuffer.size());
mppc_dec.history_buf_end = mppc_dec.history_buf + 65535;
mppc_dec.history_ptr = mppc_dec.history_buf + 54626;

uint8_t compressionFlags = 0x21;

RED_CHECK(make_array_view(uncompressed_data) ==
mppc_dec.decompress(make_array_view(compressed_data), compressionFlags));
RED_CHECK(uncompressed_data == mppc_dec.decompress(compressed_data, compressionFlags));
}
9 changes: 4 additions & 5 deletions tests/core/RDP/mppc/test_mppc_60.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,14 +345,13 @@ RED_AUTO_TEST_CASE(TestRDP60BlukDecompression4)

rdp_mppc_60_dec mppc_dec;

memcpy(mppc_dec.history_buf, _historyBuffer, sizeof(_historyBuffer));
memcpy(mppc_dec.offset_cache, _offsetCache, sizeof(_offsetCache));
mppc_dec.history_ptr = mppc_dec.history_buf + _historyOffset;
memcpy(mppc_dec.history_buf, historyBuffer.data(), historyBuffer.size());
memcpy(mppc_dec.offset_cache, offsetCache.data(), offsetCache.size());
mppc_dec.history_ptr = mppc_dec.history_buf + historyOffset;

uint8_t compressionFlags = 0x22;

RED_CHECK(make_array_view(_srcData) ==
mppc_dec.decompress(make_array_view(_outputBuffer), compressionFlags));
RED_CHECK(srcData == mppc_dec.decompress(outputBuffer, compressionFlags));
}

RED_AUTO_TEST_CASE(TestCacheAdd) {
Expand Down
20 changes: 8 additions & 12 deletions tests/core/RDP/test_mppc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,11 @@ RED_AUTO_TEST_CASE(TestMPPC)
// Load compressed_rd5 and decompressed_rd5
#include "fixtures/test_mppc_TestMPPC.hpp"

for (int x = 0; x < 1000 ; x++){
rdp_mppc_unified_dec rmppc_d;
rdp_mppc_dec & rmppc = rmppc_d;
rdp_mppc_unified_dec rmppc_d;
rdp_mppc_dec & rmppc = rmppc_d;

/* uncompress data */
RED_CHECK(make_array_view(decompressed_rd5) == rmppc.decompress(
make_array_view(compressed_rd5), int(PACKET_COMPRESSED) | int(PACKET_COMPR_TYPE_64K)));
}
/* uncompress data */
RED_CHECK(decompressed_rd5 == rmppc.decompress(compressed_rd5, int(PACKET_COMPRESSED) | int(PACKET_COMPR_TYPE_64K)));
}

RED_AUTO_TEST_CASE(TestMPPC_enc)
Expand All @@ -55,16 +52,15 @@ RED_AUTO_TEST_CASE(TestMPPC_enc)
/* setup encoder for RDP 5.0 */
rdp_mppc_50_enc enc;

int data_len = sizeof(decompressed_rd5_data);

uint8_t compressionFlags = 0;
uint16_t datalen = 0;

enc.compress(decompressed_rd5_data, data_len, compressionFlags, datalen,
rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);
enc.compress(
byte_ptr_cast(decompressed_rd5_data.data()), decompressed_rd5_data.size(),
compressionFlags, datalen, rdp_mppc_enc::MAX_COMPRESSED_DATA_SIZE_UNUSED);

RED_CHECK(0 != (compressionFlags & PACKET_COMPRESSED));
RED_CHECK(make_array_view(decompressed_rd5_data) ==
RED_CHECK(decompressed_rd5_data ==
rmppc.decompress({enc.outputBuffer, enc.bytes_in_opb}, enc.flags));
}

Expand Down
Loading

0 comments on commit 5bc07c2

Please sign in to comment.