mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed winpr_HexDump calls in tests.

Browse Source
This commit is contained in:
Armin Novak 2014-09-10 08:48:49 +02:00
parent cceb216e2e
commit f18a4b8252
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cunit/test_freerdp.c
View File

@ -37,6 +37,8 @@
#include "test_mppc.h"
#include "test_mppc_enc.h"
#define TAG __FILE__
void dump_data(unsigned char * p, int len, int width, char* name)
{
unsigned char *line = p;
@ -77,10 +79,10 @@ void assert_stream(wStream* s, BYTE* data, int length, const char* func, int lin
printf("\n %s (%d): length mismatch, actual:%d, expected:%d\n", func, line, actual_length, length);
printf("\nActual:\n");
winpr_HexDump(actual_data, actual_length);
winpr_HexDump(TAG, WLOG_ERR, actual_data, actual_length);
printf("Expected:\n");
winpr_HexDump(data, length);
winpr_HexDump(TAG, WLOG_ERR, data, length);
CU_FAIL("assert_stream, length mismatch");
return;
@ -93,10 +95,10 @@ void assert_stream(wStream* s, BYTE* data, int length, const char* func, int lin
printf("\n %s (%d): buffer mismatch:\n", func, line);
printf("\nActual:\n");
winpr_HexDump(actual_data, length);
winpr_HexDump(TAG, WLOG_ERR, actual_data, length);
printf("Expected:\n");
winpr_HexDump(data, length);
winpr_HexDump(TAG, WLOG_ERR, data, length);
CU_FAIL("assert_stream, buffer mismatch");
return;

5
libfreerdp/codec/test/TestFreeRDPCodecProgressive.c
View File

@ -2,6 +2,7 @@
#include <winpr/path.h>
#include <winpr/image.h>
#include <winpr/print.h>
#include <winpr/wlog.h>
#include <freerdp/codec/region.h>
@ -934,8 +935,8 @@ int test_progressive_decode(PROGRESSIVE_CONTEXT* progressive, EGFX_SAMPLE_FILE f
printf("Actual, Expected (offset: %d diff: %d/%d = %.3f%%):\n",
cmp, cnt, size, rate);
winpr_HexDump(&g_DstData[cmp], 16);
winpr_HexDump(&bitmaps[pass].buffer[cmp], 16);
winpr_HexDump(__FILE__, WLOG_ERROR, &g_DstData[cmp], 16);
winpr_HexDump(__FILE__, WLOG_ERROR, &bitmaps[pass].buffer[cmp], 16);
}
//WLog_Image(progressive->log, WLOG_TRACE, g_DstData, g_Width, g_Height, 32);

7
libfreerdp/primitives/test/TestPrimitivesYCbCr.c
View File

@ -2,11 +2,14 @@
#include "prim_test.h"
#include <winpr/print.h>
#include <winpr/wlog.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define TAG __FILE__
static INT16 TEST_Y_COMPONENT[4096] =
{
-32, +16, +64, +272, -32, -16, +0, -16,
@ -2172,8 +2175,8 @@ int TestPrimitivesYCbCr(int argc, char* argv[])
printf("Actual, Expected (offset: %d diff: %d/%d = %d%%):\n",
cmp, cnt, size, (int) rate);
winpr_HexDump(&actual[cmp], 16);
winpr_HexDump(&expected[cmp], 16);
winpr_HexDump(TAG, WLOG_ERROR, &actual[cmp], 16);
winpr_HexDump(TAG, WLOG_ERROR, &expected[cmp], 16);
}
_aligned_free(actual);