[Scummvm-cvs-logs] SF.net SVN: scummvm:[50290] scummvm/branches/gsoc2010-testbed/engines/ testbed
sud03r at users.sourceforge.net
sud03r at users.sourceforge.net
Fri Jun 25 23:03:54 CEST 2010
Revision: 50290
http://scummvm.svn.sourceforge.net/scummvm/?rev=50290&view=rev
Author: sud03r
Date: 2010-06-25 21:03:53 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
added savegame tests
Modified Paths:
--------------
scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/module.mk
scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
Added Paths:
-----------
scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp
scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-06-25 20:58:52 UTC (rev 50289)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/fs.cpp 2010-06-25 21:03:53 UTC (rev 50290)
@@ -1,6 +1,5 @@
#include "common/config-manager.h"
#include "common/stream.h"
-#include "common/savefile.h"
#include "common/util.h"
#include "testbed/fs.h"
@@ -122,26 +121,11 @@
return false;
}
-/**
- * This test creates a savefile for the given testbed-state and could be reloaded using the saveFile API.
- * It is intended to test saving and loading from savefiles.
- */
-bool FStests::testOpeningSaveFile() {
- Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
- Common::OutSaveFile *saveFile = saveFileMan->openForSaving("saveFile.0");
- saveFile->writeString("State:FS tests");
- saveFile->flush();
- delete saveFile;
-
- return true;
-}
-
FSTestSuite::FSTestSuite() {
addTest("ReadingFile", &FStests::testReadFile);
addTest("WritingFile", &FStests::testWriteFile);
- addTest("OpeningSaveFile", &FStests::testOpeningSaveFile);
}
const char *FSTestSuite::getName() const {
return "File System";
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/module.mk
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/module.mk 2010-06-25 20:58:52 UTC (rev 50289)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/module.mk 2010-06-25 21:03:53 UTC (rev 50290)
@@ -4,6 +4,7 @@
detection.o \
fs.o \
graphics.o \
+ savegame.o \
testbed.o
MODULE_DIRS += \
Added: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp (rev 0)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp 2010-06-25 21:03:53 UTC (rev 50290)
@@ -0,0 +1,51 @@
+#include "common/savefile.h"
+
+#include "testbed/savegame.h"
+
+namespace Testbed {
+
+/**
+ * This test creates a savefile for the given testbed-state and could be reloaded using the saveFile API.
+ * It is intended to test saving and loading from savefiles.
+ */
+
+bool SaveGametests::testSaveLoadState() {
+ Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
+ Common::OutSaveFile *saveFile = saveFileMan->openForSaving("saveFile.0");
+
+ if (!saveFile) {
+ printf("LOG: Can't open saveFile\n");
+ return false;
+ }
+
+ saveFile->writeString("ScummVM Rocks!");
+ saveFile->finalize();
+ delete saveFile;
+
+ Common::InSaveFile *loadFile = saveFileMan->openForLoading("saveFile.0");
+
+
+ if (!loadFile) {
+ printf("LOG: Can't open save File to load\n");
+ return false;
+ }
+
+ Common::String lineToRead = loadFile->readLine();
+ delete loadFile;
+
+ if (lineToRead.equals("ScummVM Rocks!")) {
+ return true;
+ }
+
+ return false;
+}
+
+SaveGameTestSuite::SaveGameTestSuite() {
+ addTest("Opening SaveFile", &SaveGametests::testSaveLoadState);
+}
+
+const char *SaveGameTestSuite::getName() const {
+ return "SaveGames";
+}
+
+} // End of namespace testbed
Property changes on: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.cpp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Added: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h (rev 0)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h 2010-06-25 21:03:53 UTC (rev 50290)
@@ -0,0 +1,35 @@
+#ifndef SAVEGAME_H
+#define SAVEGAME_H
+
+#include "testbed/testsuite.h"
+
+namespace Testbed {
+
+namespace SaveGametests {
+
+// Helper functions for SaveGame tests
+
+// will contain function declarations for SaveGame tests
+bool testSaveLoadState();
+// add more here
+}
+
+class SaveGameTestSuite : public Testsuite {
+public:
+ /**
+ * The constructor for the SaveGameTestSuite
+ * For every test to be executed one must:
+ * 1) Create a function that would invoke the test
+ * 2) Add that test to list by executing addTest()
+ *
+ * @see addTest()
+ */
+ SaveGameTestSuite();
+ ~SaveGameTestSuite(){}
+ const char *getName() const;
+
+};
+
+} // End of namespace Testbed
+
+#endif
Property changes on: scummvm/branches/gsoc2010-testbed/engines/testbed/savegame.h
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Modified: scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp
===================================================================
--- scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp 2010-06-25 20:58:52 UTC (rev 50289)
+++ scummvm/branches/gsoc2010-testbed/engines/testbed/testbed.cpp 2010-06-25 21:03:53 UTC (rev 50290)
@@ -3,9 +3,10 @@
#include "engines/util.h"
-#include "testbed/testbed.h"
#include "testbed/fs.h"
#include "testbed/graphics.h"
+#include "testbed/savegame.h"
+#include "testbed/testbed.h"
namespace Testbed {
@@ -74,6 +75,9 @@
FSTestSuite fts;
fts.execute();
+
+ SaveGameTestSuite sts;
+ sts.execute();
return Common::kNoError;
}
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