[Scummvm-cvs-logs] SF.net SVN: scummvm:[47854] scummvm/trunk/test/sound/raw.h

[lordhoto at users.sourceforge.net]

Revision: 47854
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47854&view=rev
Author:   lordhoto
Date:     2010-02-03 15:24:44 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
Less noisy output in case something goes wrong.

Modified Paths:
--------------
    scummvm/trunk/test/sound/raw.h

Modified: scummvm/trunk/test/sound/raw.h
===================================================================
--- scummvm/trunk/test/sound/raw.h	2010-02-03 15:24:24 UTC (rev 47853)
+++ scummvm/trunk/test/sound/raw.h	2010-02-03 15:24:44 UTC (rev 47854)
@@ -65,8 +65,10 @@
 		int16 *buffer = new int16[sampleRate * time];
 		TS_ASSERT_EQUALS(s->readBuffer(buffer, sampleRate * time), sampleRate * time);
 
+		bool fine = true;
 		for (int i = 0; i < sampleRate * time; ++i)
-			TS_ASSERT_EQUALS(buffer[i], sine[i] << 8);
+			fine &= (buffer[i] == (sine[i] << 8));
+		TS_ASSERT_EQUALS(fine, true);
 
 		TS_ASSERT_EQUALS(s->endOfData(), true);
 
@@ -84,8 +86,10 @@
 		int16 *buffer = new int16[sampleRate * time];
 		TS_ASSERT_EQUALS(s->readBuffer(buffer, sampleRate * time), sampleRate * time);
 
+		bool fine = true;
 		for (int i = 0; i < sampleRate * time; ++i)
-			TS_ASSERT_EQUALS(buffer[i], (int16)READ_BE_UINT16(&sine[i]));
+			fine &= (buffer[i] == (int16)READ_BE_UINT16(&sine[i]));
+		TS_ASSERT_EQUALS(fine, true);
 
 		TS_ASSERT_EQUALS(s->endOfData(), true);
 
@@ -103,8 +107,10 @@
 		int16 *buffer = new int16[sampleRate * time];
 		TS_ASSERT_EQUALS(s->readBuffer(buffer, sampleRate * time), sampleRate * time);
 
+		bool fine = true;
 		for (int i = 0; i < sampleRate * time; ++i)
-			TS_ASSERT_EQUALS(buffer[i], (int16)READ_LE_UINT16(&sine[i]));
+			fine &= (buffer[i] == (int16)READ_LE_UINT16(&sine[i]));
+		TS_ASSERT_EQUALS(fine, true);
 
 		TS_ASSERT_EQUALS(s->endOfData(), true);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.