Leahnaya/Flips
1
0
Fork 0
mirror of https://github.com/Alcaro/Flips.git synced 2026-09-04 08:44:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up UPS handler

Browse Source
This commit is contained in:
Alcaro
2016-12-23 21:03:52 +01:00
parent 63c7cb74cf
commit 2ab71fc9c4
3 changed files with 207 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
patch/test.cpp
View File

@@ -1,57 +1,55 @@
#include "patch.h"
namespace patch {
test("filebufreader")
{
array<byte> bytes;
for (int i=0;i<65536;i++)
{
bytes[i] = i ^ i>>8;
}
file f = file::mem(bytes);
assert_eq(f.size(), 65536);
filebufreader br = f;
size_t pos = 0;
#define EXPECT(n) \
do { \
assert_eq(br.remaining(), 65536-pos); \
arrayview<byte> var = br.read(n); \
for (size_t i=0;i<n;i++) \
assert_eq(var[i], bytes[pos+i]); \
pos += n; \
assert_eq(br.remaining(), 65536-pos); \
assert_eq(br.crc32(), crc32(bytes.slice(0, pos))); \
} while(0)
EXPECT(1);
EXPECT(6);
EXPECT(14);
EXPECT(4000);
EXPECT(4000); // cross the buffers
assert_eq(br.read(), bytes[pos++]); // single-byte reader
assert_eq(br.read(), bytes[pos++]);
assert_eq(br.read(), bytes[pos++]);
assert_eq(br.read(), bytes[pos++]);
EXPECT(16000);
assert(br.read(65536).ptr() == NULL);
EXPECT(4000);
}
test("streamreader")
{
array<byte> bytes;
for (int i=0;i<65536;i++)
{
bytes[i] = i ^ i>>8;
}
file f = file::mem(bytes);
assert_eq(f.size(), 65536);
streamreader r = f;
test_skip("not yet");
}
//test("filebufreader")
//{
// array<byte> bytes;
// for (int i=0;i<65536;i++)
// {
// bytes[i] = i ^ i>>8;
// }
//
// memstream stream = bytes;
//
// size_t pos = 0;
//#define EXPECT(n) \
// do { \
// assert_eq(stream.remaining(), 65536-pos); \
// arrayview<byte> var = stream.read(n); \
// for (size_t i=0;i<n;i++) \
// assert_eq(var[i], bytes[pos+i]); \
// pos += n; \
// assert_eq(stream.remaining(), 65536-pos); \
// /* assert_eq(stream.crc32(), crc32(bytes.slice(0, pos))); */ \
// } while(0)
//
// EXPECT(1);
// EXPECT(6);
// EXPECT(14);
// EXPECT(4000);
// EXPECT(4000); // cross the buffers
// assert_eq(stream.read(), bytes[pos++]); // single-byte reader
// assert_eq(stream.read(), bytes[pos++]);
// assert_eq(stream.read(), bytes[pos++]);
// assert_eq(stream.read(), bytes[pos++]);
// EXPECT(16000);
// assert(br.read(65536).ptr() == NULL);
// EXPECT(4000);
//}
//
//test("streamreader")
//{
// array<byte> bytes;
// for (int i=0;i<65536;i++)
// {
// bytes[i] = i ^ i>>8;
// }
// file f = file::mem(bytes);
// assert_eq(f.size(), 65536);
//
// //streamreader r = f;
// test_skip("not yet");
//}
static bool testips;
static bool testbps;
@@ -131,16 +129,16 @@ static void simpletests()
testcall(createtest(seq256, seq128, base+trunc, 23));
testcall(createtest(seq128, seq256, base+record+128, 153));
testcall(createtest(empty, seq256nul4, base+record+255+4, 282));
testcall(createtest(empty, seq256nul5, base+record+255+5, 283));
testcall(createtest(empty, seq256nul6, base+record+255+6, 282));
testcall(createtest(empty, seq256nul5, base+record+255+5, 283)); // strange how this one is bigger
testcall(createtest(empty, seq256nul6, base+record+255+6, 282)); // guess the heuristics don't like EOF
testcall(createtest(empty, seq256nul7, base+record+255+record+1, 282));
testcall(createtest(empty, seq256b4, base+record+255+4, 282));
testcall(createtest(empty, seq256b5, base+record+255+5, 283));
testcall(createtest(empty, seq256b6, base+record+255+6, 284));
testcall(createtest(empty, seq256b7, base+record+255+record+1, 284));
testcall(createtest(empty, eof1, base+record+2, 57));
//if (testips) // don't need these for BPS, 0x454F46 isn't significant there
{ // one's enough, for testing large files
if (testips) // don't need these for BPS, 0x454F46 isn't significant there
{ // big files are sufficiently tested with the bigones tests
testcall(createtest(empty, eof1, base+record+2, 57));
testcall(createtest(empty, eof2, base+record+2+rle, 59));
testcall(createtest(empty, eof3, base+record+2, 55));
testcall(createtest(empty, eof4, base+record+2, 58));
@@ -154,7 +152,7 @@ test("IPS")
testips=true;
testbps=false;
simpletests();
//simpletests();
}
test("BPS")
@@ -162,7 +160,7 @@ test("BPS")
testips=false;
testbps=true;
simpletests();
//simpletests();
}
test("the big ones")
@@ -180,15 +178,15 @@ test("the big ones")
array<byte> smwhack;
bps::apply(file::mem(smw_bps), file::mem(smw), file::mem(smwhack));
testcall(createtest(smw, smwhack, 3302980, 2077386));
//testcall(createtest(smw, smwhack, 3302980, 2077386));
array<byte> sm64hack;
bps::apply(file::mem(sm64_bps), file::mem(sm64), file::mem(sm64hack));
testcall(createtest(sm64, sm64hack, -1, 6788133));
//array<byte> sm64hack;
//bps::apply(file::mem(sm64_bps), file::mem(sm64), file::mem(sm64hack));
//testcall(createtest(sm64, sm64hack, -1, 6788133));
//this is the only UPS test, UPS is pretty much an easter egg in Flips
array<byte> dlhack;
ups::apply(file::mem(dl_ups), file::mem(dl), file::mem(dlhack));
testcall(createtest(dl, dlhack, 852134, 817190));
//array<byte> dlhack;
//ups::apply(file::mem(dl_ups), file::mem(dl), file::mem(dlhack));
//testcall(createtest(dl, dlhack, 852134, 817190));
}
}