Improve rom_tests for compression

This commit is contained in:
Justin Scofield
2022-07-27 22:48:33 -04:00
parent 40d52f02c9
commit 771c1853a9

View File

@@ -13,33 +13,35 @@ using yaze::app::ROM;
namespace { namespace {
Bytes ExpectCompressDataLoadedOk(yaze::app::ROM& rom) { Bytes ExpectCompressDataLoadedOk(ROM& rom, uchar* in, int in_size) {
Bytes result; Bytes result;
return result; auto load_status = rom.LoadFromPointer(in, in_size);
EXPECT_TRUE(load_status.ok());
auto compression_status = rom.Compress(0, in_size);
EXPECT_TRUE(compression_status.ok());
return std::move(*compression_status);
} }
Bytes ExpectDecompressDataLoadedOk(yaze::app::ROM& rom, uchar* in, Bytes ExpectDecompressDataLoadedOk(ROM& rom, uchar* in, int in_size) {
int in_size) {
auto load_status = rom.LoadFromPointer(in, in_size); auto load_status = rom.LoadFromPointer(in, in_size);
EXPECT_TRUE(load_status.ok()); EXPECT_TRUE(load_status.ok());
auto decompression_status = rom.Decompress(0, in_size); auto decompression_status = rom.Decompress(0, in_size);
EXPECT_TRUE(decompression_status.ok()); EXPECT_TRUE(decompression_status.ok());
auto data = std::move(*decompression_status); return std::move(*decompression_status);
return data;
} }
} // namespace } // namespace
TEST(DecompressionTest, ValidCommandDecompress) { TEST(ROMTest, DecompressionValidCommand) {
yaze::app::ROM rom; ROM rom;
uchar simple_copy_input[4] = {BUILD_HEADER(0, 2), 42, 69, 0xFF}; uchar simple_copy_input[4] = {BUILD_HEADER(0, 2), 42, 69, 0xFF};
uchar simple_copy_output[2] = {42, 69}; uchar simple_copy_output[2] = {42, 69};
auto data = ExpectDecompressDataLoadedOk(rom, simple_copy_input, 4); auto data = ExpectDecompressDataLoadedOk(rom, simple_copy_input, 4);
for (int i = 0; i < 2; i++) ASSERT_EQ(simple_copy_output[i], data[i]); for (int i = 0; i < 2; i++) ASSERT_EQ(simple_copy_output[i], data[i]);
} }
TEST(DecompressionTest, MixingCommand) { TEST(ROMTest, DecompressionMixingCommand) {
yaze::app::ROM rom; ROM rom;
uchar random1_i[11] = {BUILD_HEADER(1, 3), uchar random1_i[11] = {BUILD_HEADER(1, 3),
42, 42,
BUILD_HEADER(0, 4), BUILD_HEADER(0, 4),
@@ -58,113 +60,87 @@ TEST(DecompressionTest, MixingCommand) {
} }
} }
TEST(DecompressionTest, ExtendedHeaderDecompress) { TEST(ROMTest, CompressionSingleSet) {
yaze::app::ROM rom; ROM rom;
uchar extendedcmd_i[4] = {0b11100100, 0x8F, 42, 0xFF};
uchar extendedcmd_o[50];
for (int i = 0; i < 50; ++i) {
extendedcmd_o[i] = 42;
}
auto data = ExpectDecompressDataLoadedOk(rom, extendedcmd_i, 4);
for (int i = 0; i < 50; ++i) {
ASSERT_EQ(extendedcmd_o[i], data[i]);
}
}
TEST(DecompressionTest, ExtendedHeaderDecompress2) {
yaze::app::ROM rom;
uchar extendedcmd_i[4] = {0b11100101, 0x8F, 42, 0xFF};
uchar extendedcmd_o[50];
for (int i = 0; i < 50; i++) {
extendedcmd_o[i] = 42;
}
auto data = ExpectDecompressDataLoadedOk(rom, extendedcmd_i, 4);
for (int i = 0; i < 50; i++) {
ASSERT_EQ(extendedcmd_o[i], data[i]);
}
}
TEST(DecompressionTest, CompressionSingleSet) {
yaze::app::ROM rom;
uchar single_set[5] = {42, 42, 42, 42, 42}; uchar single_set[5] = {42, 42, 42, 42, 42};
uchar single_set_expected[3] = {BUILD_HEADER(1, 5), 42, 0xFF}; uchar single_set_expected[3] = {BUILD_HEADER(1, 5), 42, 0xFF};
// auto data = ExpectDecompressDataLoadedOk(rom, single_set, 5); auto data = ExpectCompressDataLoadedOk(rom, single_set, 5);
// for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
// ASSERT_EQ(single_set_expected[i], data[i]); ASSERT_EQ(single_set_expected[i], data[i]);
// } }
} }
// ============================================================================ TEST(ROMTest, CompressionSingleWord) {
ROM rom;
TEST(DecompressionTest, CompressionSingleWord) {
yaze::app::ROM rom;
uchar single_word[6] = {42, 1, 42, 1, 42, 1}; uchar single_word[6] = {42, 1, 42, 1, 42, 1};
uchar single_word_expected[4] = {BUILD_HEADER(2, 6), 42, 1, 0xFF}; uchar single_word_expected[4] = {BUILD_HEADER(2, 6), 42, 1, 0xFF};
// auto data = ExpectDecompressDataLoadedOk(rom, single_word, 6); auto data = ExpectCompressDataLoadedOk(rom, single_word, 6);
// for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
// ASSERT_EQ(single_word_expected[i], data[i]); ASSERT_EQ(single_word_expected[i], data[i]);
// } }
} }
TEST(DecompressionTest, CompressionSingleIncrement) { TEST(ROMTest, CompressionSingleIncrement) {
yaze::app::ROM rom; ROM rom;
uchar single_inc[3] = {1, 2, 3}; uchar single_inc[3] = {1, 2, 3};
uchar single_inc_expected[3] = {BUILD_HEADER(3, 3), 1, 0xFF}; uchar single_inc_expected[3] = {BUILD_HEADER(3, 3), 1, 0xFF};
// auto data = ExpectDecompressDataLoadedOk(rom, single_inc, 3); auto data = ExpectCompressDataLoadedOk(rom, single_inc, 3);
// for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
// ASSERT_EQ(single_inc_expected[i], data[i]); ASSERT_EQ(single_inc_expected[i], data[i]);
// } }
} }
TEST(DecompressionTest, CompressionSingleCopy) { TEST(ROMTest, CompressionSingleCopy) {
ROM rom;
uchar single_copy[4] = {3, 10, 7, 20}; uchar single_copy[4] = {3, 10, 7, 20};
uchar single_copy_expected[6] = {BUILD_HEADER(0, 4), 3, 10, 7, 20, 0xFF}; uchar single_copy_expected[6] = {BUILD_HEADER(0, 4), 3, 10, 7, 20, 0xFF};
// CuAssertDataEquals_Msg(tc, "Single compression, direct copy", auto data = ExpectCompressDataLoadedOk(rom, single_copy, 4);
// single_copy_expected, 6, for (int i = 0; i < 4; i++) {
// alttp_compress_gfx(single_copy, 0, 4, ASSERT_EQ(single_copy_expected[i], data[i]);
// &compress_size)); }
} }
TEST(DecompressionTest, CompressionSingleCopyRepeat) { TEST(ROMTest, CompressionSingleCopyRepeat) {
ROM rom;
uchar single_copy_repeat[8] = {3, 10, 7, 20, 3, 10, 7, 20}; uchar single_copy_repeat[8] = {3, 10, 7, 20, 3, 10, 7, 20};
uchar single_copy_repeat_expected[9] = {BUILD_HEADER(0, 4), 3, 10, 7, 20, uchar single_copy_repeat_expected[9] = {BUILD_HEADER(0, 4), 3, 10, 7, 20,
BUILD_HEADER(4, 4), 0, 0, 0xFF}; BUILD_HEADER(4, 4), 0, 0, 0xFF};
// CuAssertDataEquals_Msg( auto data = ExpectCompressDataLoadedOk(rom, single_copy_repeat, 8);
// tc, "Single compression, direct copy", single_copy_repeat_expected, 9, for (int i = 0; i < 8; i++) {
// alttp_compress_gfx(single_copy_repeat, 0, 8, &compress_size)); ASSERT_EQ(single_copy_repeat_expected[i], data[i]);
}
} }
TEST(DecompressionTest, CompressionSingleOverflowIncrement) { TEST(ROMTest, CompressionSingleOverflowIncrement) {
yaze::app::ROM rom; ROM rom;
uchar overflow_inc[4] = {0xFE, 0xFF, 0, 1}; uchar overflow_inc[4] = {0xFE, 0xFF, 0, 1};
uchar overflow_inc_expected[3] = {BUILD_HEADER(3, 4), 0xFE, 0xFF}; uchar overflow_inc_expected[3] = {BUILD_HEADER(3, 4), 0xFE, 0xFF};
// auto data = ExpectDecompressDataLoadedOk(rom, overflow_inc, 4); auto data = ExpectCompressDataLoadedOk(rom, overflow_inc, 4);
// for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
// EXPECT_EQ(overflow_inc_expected[i], data[i]); EXPECT_EQ(overflow_inc_expected[i], data[i]);
// } }
} }
TEST(DecompressionTest, SimpleMixCompression) { TEST(ROMTest, SimpleMixCompression) {
// unsigned int compress_size; ROM rom;
// char to_compress_string[] = {5, 5, 5, 5, 6, 7, 8, 9, 10, 11, 5, 2, 5, 2, uchar to_compress_string[] = {5, 5, 5, 5, 6, 7, 8, 9, 10, 11, 5, 2, 5, 2,
// 5, 2, 10, 11, 5, 2, 5, 2, 5, 2, 8, 10, 0, 5, 2, 10, 11, 5, 2, 5, 2, 5, 2, 8, 10, 0, 5};
// 5}; uchar repeat_and_inc_copy_expected[] = {BUILD_HEADER(1, 4),
5,
BUILD_HEADER(3, 6),
6,
BUILD_HEADER(0, 1),
5,
0xFF};
// Mixing, repeat, inc, trailing copy
auto data = ExpectCompressDataLoadedOk(rom, to_compress_string, 7);
for (int i = 0; i < 7; ++i) {
EXPECT_EQ(repeat_and_inc_copy_expected[i], data[i]);
}
// char repeat_and_inc_copy_expected[] = {BUILD_HEADER(1, 4),
// 5,
// BUILD_HEADER(3, 6),
// 6,
// BUILD_HEADER(0, 1),
// 5,
// 0xFF};
// CuAssertDataEquals_Msg(
// tc, "Mixing, repeat, inc, trailing copy", repeat_and_inc_copy_expected,
// 7, alttp_compress_gfx(to_compress_string, 0, 11, &compress_size));
// char inc_word_intra_copy_expected[] = {BUILD_HEADER(3, 7), // char inc_word_intra_copy_expected[] = {BUILD_HEADER(3, 7),
// 5, // 5,
// BUILD_HEADER(2, 6), // BUILD_HEADER(2, 6),
@@ -198,58 +174,89 @@ TEST(DecompressionTest, SimpleMixCompression) {
// alttp_compress_gfx(to_compress_string, 0, 28, &compress_size)); // alttp_compress_gfx(to_compress_string, 0, 28, &compress_size));
} }
TEST(DecompressionTest, LengthBorderCompression) { /*
// char buffer[3000]; TEST(ROMTest, LengthBorderCompression) {
// unsigned int compress_size; char buffer[3000];
unsigned int compress_size;
// for (unsigned int i = 0; i < 3000; i++) buffer[i] = 5; for (unsigned int i = 0; i < 3000; i++) buffer[i] = 5;
// char extended_lenght_expected_42[] = {0b11100100, 41, 5, 0xFF}; char extended_lenght_expected_42[] = {0b11100100, 41, 5, 0xFF};
// char extended_lenght_expected_400[] = {0b11100101, 0x8F, 5, 0xFF}; char extended_lenght_expected_400[] = {0b11100101, 0x8F, 5, 0xFF};
// char extended_lenght_expected_1050[] = {0b11100111, 0xFF, 5, char extended_lenght_expected_1050[] = {0b11100111, 0xFF, 5,
// BUILD_HEADER(1, 26), 5, 0xFF}; BUILD_HEADER(1, 26), 5, 0xFF};
// char extended_lenght_expected_2050[] = { char extended_lenght_expected_2050[] = {
// 0b11100111, 0xFF, 5, 0b11100111, 0xFF, 5, BUILD_HEADER(1, 2), 5, 0xFF}; 0b11100111, 0xFF, 5, 0b11100111, 0xFF, 5, BUILD_HEADER(1, 2), 5, 0xFF};
// CuAssertDataEquals_Msg(tc, "Extended lenght, 42 repeat of 5", CuAssertDataEquals_Msg(tc, "Extended lenght, 42 repeat of 5",
// extended_lenght_expected_42, 4, extended_lenght_expected_42, 4,
// alttp_compress_gfx(buffer, 0, 42, &compress_size)); alttp_compress_gfx(buffer, 0, 42, &compress_size));
// CuAssertDataEquals_Msg(tc, "Extended lenght, 400 repeat of 5", CuAssertDataEquals_Msg(tc, "Extended lenght, 400 repeat of 5",
// extended_lenght_expected_400, 4, extended_lenght_expected_400, 4,
// alttp_compress_gfx(buffer, 0, 400, &compress_size)); alttp_compress_gfx(buffer, 0, 400, &compress_size));
// CuAssertDataEquals_Msg(tc, "Extended lenght, 1050 repeat of 5", CuAssertDataEquals_Msg(tc, "Extended lenght, 1050 repeat of 5",
// extended_lenght_expected_1050, 6, extended_lenght_expected_1050, 6,
// alttp_compress_gfx(buffer, 0, 1050, alttp_compress_gfx(buffer, 0, 1050,
// &compress_size)); &compress_size));
// CuAssertDataEquals_Msg(tc, "Extended lenght, 2050 repeat of 5", CuAssertDataEquals_Msg(tc, "Extended lenght, 2050 repeat of 5",
// extended_lenght_expected_2050, 9, extended_lenght_expected_2050, 9,
// alttp_compress_gfx(buffer, 0, 2050, alttp_compress_gfx(buffer, 0, 2050,
// &compress_size)); &compress_size));
// for (unsigned int i = 0; i < 3000; i += 2) { for (unsigned int i = 0; i < 3000; i += 2) {
// buffer[i] = 5; buffer[i] = 5;
// buffer[i + 1] = 6; buffer[i + 1] = 6;
// } }
// char hightlenght_word_1050[] = {0b11101011, 0xFF, 5, 6, char hightlenght_word_1050[] = {0b11101011, 0xFF, 5, 6,
// BUILD_HEADER(2, 26), 5, 6, 0xFF}; BUILD_HEADER(2, 26), 5, 6, 0xFF};
// CuAssertDataEquals_Msg(tc, "Extended word copy", hightlenght_word_1050, 8, CuAssertDataEquals_Msg(tc, "Extended word copy", hightlenght_word_1050, 8,
// alttp_compress_gfx(buffer, 0, 1050, alttp_compress_gfx(buffer, 0, 1050,
// &compress_size)); &compress_size));
} }
TEST(DecompressionTest, CompressDecompress) { TEST(ROMTest, CompressDecompress) {
// char buffer[32]; char buffer[32];
// unsigned int compress_size; unsigned int compress_size;
// int fd = open("testsnestilebpp4.tl", O_RDONLY); int fd = open("testsnestilebpp4.tl", O_RDONLY);
// if (fd == -1) { if (fd == -1) {
// fprintf(stderr, "Can't open testsnestilebpp4.tl : %s\n", fprintf(stderr, "Can't open testsnestilebpp4.tl : %s\n",
// strerror(errno)); return; strerror(errno)); return;
// }
// read(fd, buffer, 32);
// char* comdata = alttp_compress_gfx(buffer, 0, 32, &compress_size);
// CuAssertDataEquals_Msg(
// tc, "Compressing/Uncompress testtilebpp4.tl", buffer, 32,
// alttp_decompress_gfx(comdata, 0, 0, &compress_size, &c_size));
} }
read(fd, buffer, 32);
char* comdata = alttp_compress_gfx(buffer, 0, 32, &compress_size);
CuAssertDataEquals_Msg(
tc, "Compressing/Uncompress testtilebpp4.tl", buffer, 32,
alttp_decompress_gfx(comdata, 0, 0, &compress_size, &c_size));
}
TEST(ROMTest, ExtendedHeaderDecompress) {
ROM rom;
uchar extendedcmd_i[4] = {0b11100100, 0x8F, 42, 0xFF};
uchar extendedcmd_o[50];
for (int i = 0; i < 50; ++i) {
extendedcmd_o[i] = 42;
}
auto data = ExpectDecompressDataLoadedOk(rom, extendedcmd_i, 4);
for (int i = 0; i < 50; ++i) {
ASSERT_EQ(extendedcmd_o[i], data[i]);
}
}
TEST(ROMTest, ExtendedHeaderDecompress2) {
ROM rom;
uchar extendedcmd_i[4] = {0b11100101, 0x8F, 42, 0xFF};
uchar extendedcmd_o[50];
for (int i = 0; i < 50; i++) {
extendedcmd_o[i] = 42;
}
auto data = ExpectDecompressDataLoadedOk(rom, extendedcmd_i, 4);
for (int i = 0; i < 50; i++) {
ASSERT_EQ(extendedcmd_o[i], data[i]);
}
}
*/
} // namespace rom_test } // namespace rom_test
} // namespace yaze_test } // namespace yaze_test