[Scummvm-cvs-logs] SF.net SVN: scummvm:[50984] scummvm/branches/gsoc2010-testbed/engines/ testbed
sud03r at users.sourceforge.net
sud03r at users.sourceforge.net
Sun Jul 18 11:08:18 CEST 2010
Revision: 50984
http://scummvm.svn.sourceforge.net/scummvm/?rev=50984&view=rev
Author: sud03r
Date: 2010-07-18 09:08:18 +0000 (Sun, 18 Jul 2010)
Log Message:
-----------
Some more improvements in the TestbedListWidget and added description method in testsuite class
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/events.h
scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h
scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.h
scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/misc.h
scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h
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-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -41,10 +41,11 @@
for (iter = tsList.begin(); iter != tsList.end(); iter++) {
_testSuiteArray.push_back((*iter)->getName());
+ _testSuiteDescArray.push_back((*iter)->getDescription());
_colors.push_back(GUI::ThemeEngine::kFontColorAlternate);
}
- _testListDisplay->setList(_testSuiteArray, &_colors);
+ _testListDisplay->setList(_testSuiteDescArray, &_colors);
new GUI::ButtonWidget(this, "Browser.Up", "Select All", kTestbedSelectAll, 0);
new GUI::ButtonWidget(this, "Browser.Cancel", "Continue", GUI::kCloseCmd);
@@ -58,7 +59,7 @@
Testsuite *ts;
switch (cmd) {
case kSelectionToggle:
- ts = _testbedConfMan->getTestsuiteByName(_testListDisplay->getSelectedString());
+ ts = _testbedConfMan->getTestsuiteByName(_testSuiteArray[_testListDisplay->getSelected()]);
if (ts) {
ts->enable(!ts->isEnabled());
_testListDisplay->changeColor();
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/config.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/config.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/config.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -39,9 +39,9 @@
namespace Testbed {
enum {
- kSelectionToggle = 16799, // Some random Number (A better way to do this?)
- kTestbedQuitCmd,
- kTestbedSelectAll
+ kSelectionToggle = 'Tgle',
+ kTestbedQuitCmd = 'Quit',
+ kTestbedSelectAll = 'sAll'
};
class TestbedConfigManager {
@@ -102,6 +102,7 @@
private:
GUI::ListWidget::ColorList _colors;
Common::StringArray _testSuiteArray;
+ Common::StringArray _testSuiteDescArray;
TestbedListWidget *_testListDisplay;
TestbedConfigManager *_testbedConfMan;
};
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/events.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -238,8 +238,4 @@
addTest("Mainmenu Event", &EventTests::showMainMenu);
}
-const char *EventTestSuite::getName() const {
- return "Events";
-}
-
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/events.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/events.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/events.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -53,7 +53,12 @@
*/
EventTestSuite();
~EventTestSuite() {}
- const char *getName() const;
+ const char *getName() const {
+ return "Events";
+ }
+ const char *getDescription() const {
+ return "Events : Keyboard/Mouse/RTL";
+ }
};
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -150,10 +150,6 @@
addTest("WritingFile", &FStests::testWriteFile, false);
}
-const char *FSTestSuite::getName() const {
- return "FS";
-}
-
void FSTestSuite::enable(bool flag) {
const Common::String &path = ConfMan.get("path");
Common::FSNode gameRoot(path);
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -60,7 +60,12 @@
*/
FSTestSuite();
~FSTestSuite() {}
- const char *getName() const;
+ const char *getName() const {
+ return "FS";
+ }
+ const char *getDescription() const {
+ return "File system tests (Navigation, Read/Write)";
+ }
void enable(bool flag);
};
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -76,10 +76,6 @@
//addTest("Pixel Formats", &GFXtests::pixelFormats);
}
-const char *GFXTestSuite::getName() const {
- return "GFX";
-}
-
void GFXTestSuite::setCustomColor(uint r, uint g, uint b) {
_palette[8] = r;
_palette[9] = g;
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/graphics.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -68,7 +68,12 @@
*/
GFXTestSuite();
~GFXTestSuite() {}
- const char *getName() const;
+ const char *getName() const {
+ return "GFX";
+ }
+ const char *getDescription() const {
+ return "Graphics Subsystem";
+ }
static void setCustomColor(uint r, uint g, uint b);
private:
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/misc.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -150,8 +150,4 @@
addTest("Mutexes", &MiscTests::testMutexes, false);
}
-const char *MiscTestSuite::getName() const {
- return "Misc";
-}
-
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/misc.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/misc.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/misc.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -67,7 +67,12 @@
*/
MiscTestSuite();
~MiscTestSuite() {}
- const char *getName() const;
+ const char *getName() const {
+ return "Misc";
+ }
+ const char *getDescription() const {
+ return "Miscellaneous: Timers/Mutexes/Datetime";
+ }
};
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp 2010-07-18 09:08:18 UTC (rev 50984)
@@ -196,8 +196,4 @@
addTest("Verify Error Messages", &SaveGametests::testErrorMessages, false);
}
-const char *SaveGameTestSuite::getName() const {
- return "SaveGames";
-}
-
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -56,7 +56,12 @@
*/
SaveGameTestSuite();
~SaveGameTestSuite() {}
- const char *getName() const;
+ const char *getName() const {
+ return "SaveGames";
+ }
+ const char *getDescription() const {
+ return "Saving Game state tests";
+ }
};
} // End of namespace Testbed
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h 2010-07-18 07:53:05 UTC (rev 50983)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testsuite.h 2010-07-18 09:08:18 UTC (rev 50984)
@@ -122,6 +122,7 @@
static uint parseEvents();
virtual const char *getName() const = 0;
+ virtual const char *getDescription() const = 0;
static void logPrintf(const char *s, ...) GCC_PRINTF(1, 2);
static void logDetailedPrintf(const char *s, ...) GCC_PRINTF(1, 2);
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