Commit f01a3aa7 authored by Robert Kausch's avatar Robert Kausch Committed by Erik de Castro Lopo

Minor fixes for bitwriter unit test.

parent 096a63d3
/* test_libFLAC - Unit tester for libFLAC /* test_libFLAC - Unit tester for libFLAC
* Copyright (C) 2000-2009 Josh Coalson * Copyright (C) 2000-2009 Josh Coalson
* Copyright (C) 2011-2016 Xiph.Org Foundation * Copyright (C) 2011-2018 Xiph.Org Foundation
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -112,9 +112,8 @@ FLAC__bool test_bitwriter(void) ...@@ -112,9 +112,8 @@ FLAC__bool test_bitwriter(void)
printf("OK\n"); printf("OK\n");
printf("testing init... "); printf("testing init... ");
FLAC__bitwriter_init(bw); if(!FLAC__bitwriter_init(bw)) {
if(0 == bw) { printf("FAILED, returned false\n");
printf("FAILED, returned NULL\n");
return false; return false;
} }
printf("OK\n"); printf("OK\n");
...@@ -135,19 +134,14 @@ FLAC__bool test_bitwriter(void) ...@@ -135,19 +134,14 @@ FLAC__bool test_bitwriter(void)
printf("OK\n"); printf("OK\n");
printf("testing init... "); printf("testing init... ");
FLAC__bitwriter_init(bw); if(!FLAC__bitwriter_init(bw)) {
if(0 == bw) { printf("FAILED, returned false\n");
printf("FAILED, returned NULL\n");
return false; return false;
} }
printf("OK\n"); printf("OK\n");
printf("testing clear... "); printf("testing clear... ");
FLAC__bitwriter_clear(bw); FLAC__bitwriter_clear(bw);
if(0 == bw) {
printf("FAILED, returned NULL\n");
return false;
}
printf("OK\n"); printf("OK\n");
printf("testing delete... "); printf("testing delete... ");
...@@ -166,10 +160,11 @@ FLAC__bool test_bitwriter(void) ...@@ -166,10 +160,11 @@ FLAC__bool test_bitwriter(void)
printf("OK\n"); printf("OK\n");
printf("testing init... "); printf("testing init... ");
ok = FLAC__bitwriter_init(bw); if(!FLAC__bitwriter_init(bw)) {
printf("%s\n", ok?"OK":"FAILED"); printf("FAILED, returned false\n");
if(!ok)
return false; return false;
}
printf("OK\n");
printf("testing clear... "); printf("testing clear... ");
FLAC__bitwriter_clear(bw); FLAC__bitwriter_clear(bw);
...@@ -204,7 +199,7 @@ FLAC__bool test_bitwriter(void) ...@@ -204,7 +199,7 @@ FLAC__bool test_bitwriter(void)
bits = 152 - words*FLAC__BITS_PER_WORD; bits = 152 - words*FLAC__BITS_PER_WORD;
if(bw->words != words) { if(bw->words != words) {
printf("FAILED byte count %u != %u\n", bw->words, words); printf("FAILED word count %u != %u\n", bw->words, words);
FLAC__bitwriter_dump(bw, stdout); FLAC__bitwriter_dump(bw, stdout);
return false; return false;
} }
...@@ -237,7 +232,7 @@ FLAC__bool test_bitwriter(void) ...@@ -237,7 +232,7 @@ FLAC__bool test_bitwriter(void)
test_pattern1[words] <<= 6; test_pattern1[words] <<= 6;
test_pattern1[words] |= 0x3d; test_pattern1[words] |= 0x3d;
if(bw->words != words) { if(bw->words != words) {
printf("FAILED byte count %u != %u\n", bw->words, words); printf("FAILED word count %u != %u\n", bw->words, words);
FLAC__bitwriter_dump(bw, stdout); FLAC__bitwriter_dump(bw, stdout);
return false; return false;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment