[Scummvm-cvs-logs] SF.net SVN: scummvm:[52081] scummvm/branches/gsoc2010-testbed/engines/ testbed

sud03r at users.sourceforge.net sud03r at users.sourceforge.net
Sat Aug 14 10:32:40 CEST 2010


Revision: 52081
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52081&view=rev
Author:   sud03r
Date:     2010-08-14 08:32:39 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
TESTBED: formatting fix, deleted spaces/tabs at end of line

Modified Paths:
--------------
    scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/config.h
    scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/midi.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/midi.h
    scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/sound.h
    scummvm/branches/gsoc2010-testbed/engines/testbed/template.h
    scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.h
    scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp
    scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -33,7 +33,7 @@
 namespace Testbed {
 
 TestbedOptionsDialog::TestbedOptionsDialog(Common::Array<Testsuite *> &tsList, TestbedConfigManager *tsConfMan) : GUI::Dialog("Browser"), _testbedConfMan(tsConfMan) {
-	
+
 	new GUI::StaticTextWidget(this, "Browser.Headline", "Select Testsuites to Execute");
 	new GUI::StaticTextWidget(this, "Browser.Path", "Use Doubleclick to select/deselect");
 
@@ -54,7 +54,7 @@
 			_colors.push_back(GUI::ThemeEngine::kFontColorAlternate);
 		}
 	}
-	
+
 	_testListDisplay = new TestbedListWidget(this, "Browser.List", _testSuiteArray);
 	_testListDisplay->setNumberingMode(GUI::kListNumberingOff);
 	_testListDisplay->setList(_testSuiteDescArray, &_colors);
@@ -131,7 +131,7 @@
 		delete ws;
 	default:
 		GUI::Dialog::handleCommand(sender, cmd, data);
-	
+
 	}
 }
 
@@ -162,7 +162,7 @@
 	_yOffset += h;
 }
 
-void TestbedInteractionDialog::addButtonXY(uint x, uint y, uint w, uint h, const Common::String name, uint32 cmd) {	
+void TestbedInteractionDialog::addButtonXY(uint x, uint y, uint w, uint h, const Common::String name, uint32 cmd) {
 	_buttonArray.push_back(new GUI::ButtonWidget(this, x, _yOffset, w, h, name, 0, cmd));
 }
 
@@ -193,7 +193,7 @@
 }
 
 Common::SeekableReadStream *TestbedConfigManager::getConfigReadStream() {
-	// Look for config file using SearchMan	
+	// Look for config file using SearchMan
 	Common::SeekableReadStream *rs = SearchMan.createReadStreamForMember(_configFileName);
 	return rs;
 }
@@ -208,9 +208,9 @@
 	return ws;
 }
 
-void TestbedConfigManager::parseConfigFile() {	
+void TestbedConfigManager::parseConfigFile() {
 	Common::SeekableReadStream *rs = getConfigReadStream();
-	
+
 	if (!rs) {
 		Testsuite::logPrintf("Info! No config file found, using default configuration.\n");
 		initDefaultConfiguration();
@@ -222,7 +222,7 @@
 
 	for (Common::ConfigFile::SectionList::const_iterator i = sections.begin(); i != sections.end(); i++) {
 		if (i->name.equalsIgnoreCase("Global")) {
-			// Global params may be directly queried, ignore them	
+			// Global params may be directly queried, ignore them
 		} else {
 			// A testsuite, process it.
 			currTS = getTestsuiteByName(i->name);
@@ -268,7 +268,7 @@
 void TestbedConfigManager::selectTestsuites() {
 
 	parseConfigFile();
-	
+
 	if (_configFileInterface.hasKey("isSessionInteractive", "Global")) {
 		Common::String in;
 		_configFileInterface.getKey("isSessionInteractive", "Global", in);
@@ -285,7 +285,7 @@
 	Common::String prompt("Welcome to the ScummVM testbed!\n"
 						"It is a framework to test the various ScummVM subsystems namely GFX, Sound, FS, events etc.\n"
 						"If you see this, it means interactive tests would run on this system :)\n");
-	
+
 	if (!FSTestSuite::isGameDataFound()) {
 		prompt += "\nSeems like Game data files are not configured properly.\n"
 		"Create Game data files using script ./create-testbed-data.sh in dists/engine-data\n"
@@ -298,7 +298,7 @@
 	if (Testsuite::handleInteractiveInput(prompt, "Proceed?", "Customize", kOptionRight)) {
 		if (Engine::shouldQuit()) {
 			return;
-		}		
+		}
 		// Select testsuites using checkboxes
 		TestbedOptionsDialog tbd(_testsuiteList, this);
 		tbd.runModal();

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -80,7 +80,7 @@
 		_listColors[i] = GUI::ThemeEngine::kFontColorNormal;
 		draw();
 	}
-	
+
 	void markAsDeselected(int i) {
 		if (_list[i].contains("selected")) {
 			_list[i] = _testSuiteArray[i]->getDescription();
@@ -88,7 +88,7 @@
 		_listColors[i] = GUI::ThemeEngine::kFontColorAlternate;
 		draw();
 	}
-	
+
 	void setColor(uint32 indx, GUI::ThemeEngine::FontColor color) {
 		assert(indx < _listColors.size());
 		_listColors[indx] = color;

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -117,7 +117,7 @@
 }
 
 TestExitStatus EventTests::mouseEvents() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing Mouse events.\n "
 	"Any movement/click generated by L/R/M mouse buttons or the mouse wheel should be detected.\n"
@@ -127,7 +127,7 @@
 		Testsuite::logPrintf("Info! Skipping test : keyboard events\n");
 		return kTestSkipped;
 	}
-	
+
 	Common::EventManager *eventMan = g_system->getEventManager();
 
 	Common::Point pt(0, 30);
@@ -227,12 +227,12 @@
 		Testsuite::logDetailedPrintf("Mouse clicks (L/R/M buttons) and wheel movements failed");
 		passed = kTestFailed;
 	}
-	
+
 	return passed;
 }
 
 TestExitStatus EventTests::kbdEvents() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing keyboard events.\n "
 	"Testbed should be able to figure out any alphanumeric keystrokes made by the user and display them back.\n"
@@ -270,7 +270,7 @@
 }
 
 TestExitStatus EventTests::showMainMenu() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing Main Menu events.\n "
 	"Main Menu event is normally trigerred by user pressing (Ctrl + f5).\n"

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -96,12 +96,12 @@
 		fileName.toLowercase();
 		delete directory;
 		directory = gameRoot.getSubDirectory(dirName);
-		
+
 		if (!directory) {
 			Testsuite::logDetailedPrintf("Failed to open directory %s during FS tests\n", dirName.c_str());
 			 return kTestFailed;
 		}
-		
+
 		if (!readDataFromFile(directory, fileName.c_str())) {
 			Testsuite::logDetailedPrintf("Reading from %s/%s failed\n", dirName.c_str(), fileName.c_str());
 			numFailed++;
@@ -111,12 +111,12 @@
 		fileName.toUppercase();
 		delete directory;
 		directory = gameRoot.getSubDirectory(dirName);
-		
+
 		if (!directory) {
 			Testsuite::logDetailedPrintf("Failed to open directory %s during FS tests\n", dirName.c_str());
 			 return kTestFailed;
 		}
-		
+
 		if (!readDataFromFile(directory, fileName.c_str())) {
 			Testsuite::logDetailedPrintf("Reading from %s/%s failed\n", dirName.c_str(), fileName.c_str());
 			numFailed++;

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -82,7 +82,7 @@
 	_palette[8] = r;
 	_palette[9] = g;
 	_palette[10] = b;
-	
+
 	// Set colorNum kColorSpecial with a special color.
 	int absIndx = kColorSpecial * 4;
 	_palette[absIndx + 1] = 173;
@@ -270,7 +270,7 @@
 		if (!gfxScalarMode.equals("")) {
 			info = "The cursor size (yellow) should match the red rectangle.";
 		}
-		
+
 		Testsuite::writeOnScreen(info, pt);
 
 		info = "GFX Mode";
@@ -346,7 +346,7 @@
  * Used by aspectRatio()
  */
 void GFXtests::drawEllipse(int cx, int cy, int a, int b) {
-	
+
 	// Take a buffer of screen size
 	int width = g_system->getWidth();
 	int height = Testsuite::getDisplayRegionCoordinates().y;
@@ -404,7 +404,7 @@
 
 	Common::Point pt(0, 100);
 	Common::Rect rect = Testsuite::writeOnScreen("Testing fullscreen mode", pt);
-	
+
 	if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) {
 		Testsuite::logPrintf("Info! Skipping test : FullScreenMode\n");
 		return kTestSkipped;
@@ -482,7 +482,7 @@
  * Tests the aspect ratio correction by: drawing an ellipse, when corrected the ellipse should render to a circle
  */
 TestExitStatus GFXtests::aspectRatio() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Aspect Ratio Correction test. If aspect ratio correction is enabled you should expect a circle on screen,"
 	" an ellipse otherwise.";
@@ -564,12 +564,12 @@
 		Testsuite::logPrintf("Info! Skipping test : Palettized Cursors\n");
 		return kTestSkipped;
 	}
-	
+
 	TestExitStatus passed = kTestPassed;
 
 	// Testing with cursor Palette
 	setupMouseLoop();
-	
+
 	if (Testsuite::handleInteractiveInput("Which color did the cursor appeared to you?", "Yellow", "Any other", kOptionRight)) {
 		Testsuite::logDetailedPrintf("Couldn't use cursor palette for rendering cursor\n");
 		passed = kTestFailed;
@@ -603,7 +603,7 @@
 	Testsuite::clearScreen();
 	// Make mouse visible
 	CursorMan.showMouse(true);
-	
+
 	Common::String info = "Testing Automated Mouse movements.\n"
 						"You should expect cursor hotspot(top-left corner) to automatically move from (0, 0) to (100, 100).\n"
 						"There we have a rectangle drawn, finally the cursor would lie centred in that rectangle.";
@@ -612,7 +612,7 @@
 		Testsuite::logPrintf("Info! Skipping test : Mouse Movements\n");
 		return kTestSkipped;
 	}
-	
+
 	// Draw Rectangle
 	Graphics::Surface *screen = g_system->lockScreen();
 	screen->fillRect(Common::Rect::center(106, 106, 14, 14), 2);
@@ -649,7 +649,7 @@
  *
  */
 TestExitStatus GFXtests::copyRectToScreen() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing Blitting a Bitmap to screen.\n"
 		"You should expect to see a 20x40 yellow horizontal rectangle centred at the screen.";
@@ -658,7 +658,7 @@
 		Testsuite::logPrintf("Info! Skipping test : Blitting Bitmap\n");
 		return kTestSkipped;
 	}
-	
+
 	GFXTestSuite::setCustomColor(255, 255, 0);
 	byte buffer[20 * 40];
 	memset(buffer, 2, 20 * 40);
@@ -682,7 +682,7 @@
  * It is expected the screen minimizes when this feature is enabled
  */
 TestExitStatus GFXtests::iconifyWindow() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing Iconify Window mode.\n If the feature is supported by the backend, "
 		"you should expect the window to be minimized.\n However you would manually need to de-iconify.";
@@ -691,7 +691,7 @@
 		Testsuite::logPrintf("Info! Skipping test : Iconifying window\n");
 		return kTestSkipped;
 	}
-	
+
 	Common::Point pt(0, 100);
 	Common::Rect rect = Testsuite::writeOnScreen("Testing Iconifying window", pt);
 
@@ -794,7 +794,7 @@
 }
 
 TestExitStatus GFXtests::shakingEffect() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Shaking test. You should expect the graphics(text/bars etc) drawn on the screen to shake!";
 
@@ -822,7 +822,7 @@
 }
 
 TestExitStatus GFXtests::focusRectangle() {
-	
+
 	Testsuite::clearScreen();
 	Common::String info = "Testing : Setting and hiding Focus \n"
 		"If this feature is implemented, the focus should be toggled between the two rectangles on the corners";
@@ -831,7 +831,7 @@
 		Testsuite::logPrintf("Info! Skipping test : focus Rectangle\n");
 		return kTestSkipped;
 	}
-	
+
 	const Graphics::Font &font(*FontMan.getFontByUsage(Graphics::FontManager::kConsoleFont));
 
 	Graphics::Surface *screen = g_system->lockScreen();
@@ -878,7 +878,7 @@
 		Testsuite::logPrintf("Info! Skipping test : Overlay Graphics\n");
 		return kTestSkipped;
 	}
-	
+
 	Graphics::PixelFormat pf = g_system->getOverlayFormat();
 
 	OverlayColor buffer[50 * 100];
@@ -906,7 +906,7 @@
 }
 
 TestExitStatus GFXtests::paletteRotation() {
-	
+
 	Common::String info = "Palette rotation. Here we draw a full 256 colored rainbow and then rotate it.\n"
 						"Note that the screen graphics change without having to draw anything.\n"
 						"The palette should appear to rotate, as a result, the background will change its color too.\n"
@@ -953,7 +953,7 @@
 	}
 
 	g_system->copyRectToScreen(buffer, 256, 22, 50, 256, 30);
-	
+
 	// Show mouse
 	CursorMan.showMouse(true);
 	g_system->updateScreen();
@@ -961,7 +961,7 @@
 
 	bool toRotate = true;
 	Common::Event event;
-	
+
 	while (toRotate) {
 		while (g_system->getEventManager()->pollEvent(event)) {
 			if (event.type == Common::EVENT_LBUTTONDOWN || event.type == Common::EVENT_RBUTTONDOWN) {

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/midi.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/midi.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/midi.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -68,7 +68,7 @@
 				if (!parser->isPlaying()) {
 					quitLoop = true;
 				}
-			}		
+			}
 		}
 	}
 	CursorMan.showMouse(false);
@@ -100,7 +100,7 @@
 		Testsuite::logPrintf("Error! %s", errMsg.c_str());
 		return kTestFailed;
 	}
-	
+
 	Testsuite::logDetailedPrintf("Info! Midi: Succesfully opened the driver\n");
 
 	Common::MemoryWriteStreamDynamic ws(DisposeAfterUse::YES);
@@ -129,7 +129,7 @@
 	driver->close();
 	delete smfParser;
 	delete driver;
-	
+
 	if (Testsuite::handleInteractiveInput("Were you able to hear the music as described?", "Yes", "No", kOptionRight)) {
 		Testsuite::logDetailedPrintf("Error! Midi: Can't play Music\n");
 		return kTestFailed;

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/midi.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/midi.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/midi.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -60,11 +60,11 @@
 	const char *getName() const {
 		return "MIDI";
 	}
-	
+
 	const char *getDescription() const {
 		return "Midi Music";
 	}
-	
+
 	void enable(bool flag);
 
 private:

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -67,16 +67,16 @@
 }
 
 TestExitStatus MiscTests::testDateTime() {
-	
+
 	if (Testsuite::isSessionInteractive) {
 		if (Testsuite::handleInteractiveInput("Testing the date time API implementation", "Continue", "Skip", kOptionRight)) {
 			Testsuite::logPrintf("Info! Date time tests skipped by the user.\n");
 			return kTestSkipped;
 		}
-		
+
 		Testsuite::writeOnScreen("Verifying Date-Time...", Common::Point(0, 100));
 	}
-	
+
 	TimeDate t1, t2;
 	g_system->getTimeAndDate(t1);
 	Testsuite::logDetailedPrintf("Current Time and Date: ");
@@ -126,7 +126,7 @@
 }
 
 TestExitStatus MiscTests::testMutexes() {
-	
+
 	if (Testsuite::isSessionInteractive) {
 		if (Testsuite::handleInteractiveInput("Testing the Mutual Exclusion API implementation", "Continue", "Skip", kOptionRight)) {
 			Testsuite::logPrintf("Info! Mutex tests skipped by the user.\n");

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/sound.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -50,15 +50,15 @@
 
 	_mixer = g_system->getMixer();
 
-	// the three streams to be mixed	
+	// the three streams to be mixed
 	Audio::PCSpeaker *s1 = new Audio::PCSpeaker();
 	Audio::PCSpeaker *s2 = new Audio::PCSpeaker();
 	Audio::PCSpeaker *s3 = new Audio::PCSpeaker();
-	
+
 	s1->play(Audio::PCSpeaker::kWaveFormSine, 1000, -1);
 	s2->play(Audio::PCSpeaker::kWaveFormSine, 1200, -1);
 	s3->play(Audio::PCSpeaker::kWaveFormSine, 1400, -1);
-	
+
 	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_h1, s1);
 	_mixer->pauseHandle(_h1, true);
 
@@ -72,7 +72,7 @@
 
 
 void SoundSubsystemDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) {
-	
+
 	switch (cmd) {
 		case kPlayChannel1:
 			_buttonArray[0]->setLabel("Pause Channel #1");
@@ -112,7 +112,7 @@
 
 TestExitStatus SoundSubsystem::playBeeps() {
 	Testsuite::clearScreen();
-	TestExitStatus passed = kTestPassed; 
+	TestExitStatus passed = kTestPassed;
 	Common::String info = "Testing Sound Output by generating beeps\n"
 	"You should hear a left beep followed by a right beep\n";
 
@@ -120,31 +120,31 @@
 		Testsuite::logPrintf("Info! Skipping test : Play Beeps\n");
 		return kTestSkipped;
 	}
-	
+
 	Audio::PCSpeaker *speaker = new Audio::PCSpeaker();
 	Audio::Mixer *mixer = g_system->getMixer();
 	Audio::SoundHandle handle;
 	mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, speaker);
-	
+
 	// Left Beep
 	Testsuite::writeOnScreen("Left Beep", Common::Point(0, 100));
 	mixer->setChannelBalance(handle, -127);
 	speaker->play(Audio::PCSpeaker::kWaveFormSine, 1000, -1);
 	g_system->delayMillis(500);
 	mixer->pauseHandle(handle, true);
-	
+
 	if (Testsuite::handleInteractiveInput("  Were you able to hear the left beep?  ", "Yes", "No", kOptionRight)) {
 		Testsuite::logDetailedPrintf("Error! Left Beep couldn't be detected : Error with Mixer::setChannelBalance()\n");
 		passed = kTestFailed;
 	}
-	
+
 	// Right Beep
 	Testsuite::writeOnScreen("Right Beep", Common::Point(0, 100));
 	mixer->setChannelBalance(handle, 127);
 	mixer->pauseHandle(handle, false);
 	g_system->delayMillis(500);
 	mixer->stopAll();
-	
+
 	if (Testsuite::handleInteractiveInput("Were you able to hear the right beep?", "Yes", "No", kOptionRight)) {
 		Testsuite::logDetailedPrintf("Error! Right Beep couldn't be detected : Error with Mixer::setChannelBalance()\n");
 		passed = kTestFailed;
@@ -154,7 +154,7 @@
 
 TestExitStatus SoundSubsystem::mixSounds() {
 	Testsuite::clearScreen();
-	TestExitStatus passed = kTestPassed; 
+	TestExitStatus passed = kTestPassed;
 	Common::String info = "Testing Mixer Output by generating multichannel sound output using PC speaker emulator.\n"
 	"The mixer should be able to play them simultaneously\n";
 
@@ -174,7 +174,7 @@
 
 TestExitStatus SoundSubsystem::audiocdOutput() {
 	Testsuite::clearScreen();
-	TestExitStatus passed = kTestPassed; 
+	TestExitStatus passed = kTestPassed;
 	Common::String info = "Testing AudioCD API implementation.\n"
 	"Here we have four tracks, we play them in order i.e 1-2-3-last.\n"
 	"The user should verify if the tracks were run in correct order or not.";
@@ -183,13 +183,13 @@
 		Testsuite::logPrintf("Info! Skipping test : AudioCD API\n");
 		return kTestSkipped;
 	}
-	
+
 	Common::Point pt(0, 100);
 	Testsuite::writeOnScreen("Playing the tracks of testCD in order i.e 1-2-3-last", pt);
 
-	
+
 	// Play all tracks
-	for (int i = 1; i < 5; i++) { 
+	for (int i = 1; i < 5; i++) {
 		AudioCD.play(i, 1, 0, 0);
 		while (AudioCD.isPlaying()) {
 			g_system->delayMillis(500);
@@ -203,12 +203,12 @@
 		Testsuite::logPrintf("Error! Error in AudioCD.play() or probably sound files were not detected, try -d1 (debuglevel 1)\n");
 		passed = kTestFailed;
 	}
-	
+
 	return passed;
 }
 
 TestExitStatus SoundSubsystem::sampleRates() {
-	
+
 	Common::String info = "Testing Multiple Sample Rates.\n"
 						  "Here we try to play sounds at three different sample rates.";
 
@@ -216,7 +216,7 @@
 		Testsuite::logPrintf("Info! Skipping test : Sample Rates\n");
 		return kTestSkipped;
 	}
-	
+
 	TestExitStatus passed = kTestPassed;
 	Audio::Mixer *mixer = g_system->getMixer();
 
@@ -225,14 +225,14 @@
 	Audio::PCSpeaker *s2 = new Audio::PCSpeaker(s1->getRate() - 10000);
 	// Stream at twice sampling rate
 	Audio::PCSpeaker *s3 = new Audio::PCSpeaker(s1->getRate() + 10000);
-	
+
 	s1->play(Audio::PCSpeaker::kWaveFormSine, 1000, -1);
 	s2->play(Audio::PCSpeaker::kWaveFormSine, 1000, -1);
 	s3->play(Audio::PCSpeaker::kWaveFormSine, 1000, -1);
-	
+
 	Audio::SoundHandle handle;
 	Common::Point pt(0, 100);
-	
+
 	mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, s1);
 	Testsuite::writeOnScreen(Common::String::printf("Playing at smaple rate: %d", s1->getRate()), pt);
 	g_system->delayMillis(1000);
@@ -250,7 +250,7 @@
 	g_system->delayMillis(1000);
 	mixer->stopHandle(handle);
 	g_system->delayMillis(1000);
-	
+
 	Testsuite::clearScreen();
 	if (Testsuite::handleInteractiveInput("Was the mixer able to play beeps with variable sample rates?", "Yes", "No", kOptionRight)) {
 		Testsuite::logDetailedPrintf("Error! Error with variable sample rates\n");
@@ -263,7 +263,7 @@
 SoundSubsystemTestSuite::SoundSubsystemTestSuite() {
 	addTest("SimpleBeeps", &SoundSubsystem::playBeeps, true);
 	addTest("MixSounds", &SoundSubsystem::mixSounds, true);
-	
+
 	// Make audio-files discoverable
 	Common::FSNode gameRoot(ConfMan.get("path"));
 	if (gameRoot.exists()) {

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/sound.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/sound.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/sound.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -64,11 +64,11 @@
 	 */
 	SoundSubsystemTestSuite();
 	~SoundSubsystemTestSuite() {}
-	
+
 	const char *getName() const {
 		return "SoundSubsystem";
 	}
-	
+
 	const char *getDescription() const {
 		return "Sound Subsystem";
 	}

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/template.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/template.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/template.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -55,7 +55,7 @@
 	const char *getName() const {
 		return "Dummy Template";
 	}
-	
+
 	const char *getDescription() const {
 		return "Some Arbit description";
 	}

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -49,7 +49,7 @@
 	addText(450, 20, text, Graphics::kTextAlignCenter, _xOffset, 15);
 	Common::Array<Common::String> strArray;
 	GUI::ListWidget::ColorList colors;
-	
+
 	for (Common::Array<Testsuite *>::const_iterator i = _testsuiteList.begin(); i != _testsuiteList.end(); ++i) {
 		strArray.push_back(Common::String::printf("%s :", (*i)->getDescription()));
 		colors.push_back(GUI::ThemeEngine::kFontColorNormal);
@@ -60,7 +60,7 @@
 		}
 		colors.push_back(GUI::ThemeEngine::kFontColorAlternate);
 	}
-	
+
 	addList(0, _yOffset, 500, 200, strArray, &colors);
 	text = "More Details can be viewed in the Log file : " + Testsuite::getLogFile();
 	addText(450, 20, text, Graphics::kTextAlignLeft, 0, 0);
@@ -103,7 +103,7 @@
 	if (gameRoot.exists()) {
 		SearchMan.addDirectory(gameRoot.getDisplayName(), gameRoot);
 	}
-	
+
 	DebugMan.addDebugChannel(kTestbedLogOutput, "LOG", "Log of test results generated by testbed");
 	DebugMan.addDebugChannel(kTestbedEngineDebug, "Debug", "Engine-specific debug statements");
 	DebugMan.enableDebugChannel("LOG");
@@ -169,7 +169,7 @@
 	// TODO: Implement that
 
 	TestbedConfigManager cfMan(_testsuiteList, "testbed.config");
-	
+
 	// Keep running if rerun requested
 
 	do {
@@ -182,13 +182,13 @@
 		if (Engine::shouldQuit()) {
 			return Common::kNoError;
 		}
-		
+
 		TestbedExitDialog tbDialog(_testsuiteList);
 		tbDialog.init();
 		tbDialog.run();
 
 	} while (TestbedExitDialog::rerunRequired());
-	
+
 	return Common::kNoError;
 }
 

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -38,7 +38,7 @@
 
 enum {
 	kTestbedLogOutput = 1 << 0,
-	kTestbedEngineDebug = 1 << 2, 
+	kTestbedEngineDebug = 1 << 2,
 	kCmdRerunTestbed = 'crtb'
 };
 
@@ -55,7 +55,7 @@
 	void invokeTestsuites(TestbedConfigManager &cfMan);
 
 	bool hasFeature(EngineFeature f) const;
-	
+
 private:
 	Common::Array<Testsuite *> _testsuiteList;
 };

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.cpp	2010-08-14 08:32:39 UTC (rev 52081)
@@ -203,7 +203,7 @@
 void Testsuite::clearScreen() {
 	int numBytesPerLine = g_system->getWidth() * g_system->getScreenFormat().bytesPerPixel;
 	int height = getDisplayRegionCoordinates().y;
-	
+
 	// Don't clear test info display region
 	int size =  height * numBytesPerLine;
 	byte *buffer = new byte[size];
@@ -278,7 +278,7 @@
 void Testsuite::updateStats(const char *prefix, const char *info, uint testNum, uint numTests, Common::Point pt) {
 	Common::String text = Common::String::printf(" Running %s: %s (%d of %d) ", prefix, info, testNum, numTests);
 	writeOnScreen(text, pt);
-	uint barColor = kColorSpecial; 
+	uint barColor = kColorSpecial;
 	// below the text a rectangle denoting the progress in the testsuite can be drawn.
 	int separation = getLineSeparation();
 	pt.y += separation;
@@ -293,7 +293,7 @@
 	// draw the boundary
 	memset(buffer, barColor, sizeof(byte) * wRect);
 	memset(buffer + (wRect * (lRect - 1)) , barColor, sizeof(byte) * wRect);
-	
+
 	for (int i = 0; i < lRect; i++) {
 		for (int j = 0; j < wRect; j++) {
 			if (j < wShaded) {
@@ -331,7 +331,7 @@
 		if (!(*i)->enabled) {
 			logPrintf("Info! Skipping Test: %s, Skipped by configuration.\n", ((*i)->featureName).c_str());
 			_numTestsSkipped++;
-			continue;	
+			continue;
 		}
 
 		if((*i)->isInteractive && !isSessionInteractive) {

Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h	2010-08-14 08:04:40 UTC (rev 52080)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h	2010-08-14 08:32:39 UTC (rev 52081)
@@ -100,7 +100,7 @@
 	}
 	bool enableTest(const Common::String &testName, bool enable);
 	void reset();
-	
+
 	/**
 	 * Prompts for User Input in form of "Yes" or "No" for interactive tests
 	 * e.g: "Is this like you expect?" "Yes" or "No"
@@ -156,7 +156,7 @@
 	static void deleteWriteStream();
 
 	// Progress bar (Information Display) related methods.
-	/** 
+	/**
 	 * Display region is in the bottom. Probably 1/4th of the game screen.
 	 * It contains:
 	 * 1) Information about executing testsuite.


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




More information about the Scummvm-git-logs mailing list