modplug-svn-commit Mailing List for modplug (Page 986)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 903
          http://modplug.svn.sourceforge.net/modplug/?rev=903&view=rev
Author:   saga-games
Date:     2011-06-16 20:29:56 +0000 (Thu, 16 Jun 2011)

Log Message:
-----------
[Mod] Extended file load test: File is now saved and then re-loaded to verify if file saving works.
[Mod] Removed VS2008 exe bloatage fix from StdAfx.cpp again since the latest patches seem to have remedied the situation.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.h
    trunk/OpenMPT/mptrack/STDAFX.CPP
    trunk/OpenMPT/mptrack/test/test.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================

--- trunk/OpenMPT/mptrack/Moddoc.h	2011-06-15 13:42:46 UTC (rev 902)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2011-06-16 20:29:56 UTC (rev 903)
@@ -269,6 +269,7 @@
 	SplitKeyboardSettings *GetSplitKeyboardSettings() { return &m_SplitKeyboardSettings; }
 
 	vector<FileHistory> *GetFileHistory() { return &m_FileHistory; }
+	const vector<FileHistory> *GetFileHistory() const { return &m_FileHistory; }
 	time_t GetCreationTime() const { return m_creationTime; }
 	
 // operations

Modified: trunk/OpenMPT/mptrack/STDAFX.CPP
===================================================================
--- trunk/OpenMPT/mptrack/STDAFX.CPP	2011-06-15 13:42:46 UTC (rev 902)
+++ trunk/OpenMPT/mptrack/STDAFX.CPP	2011-06-16 20:29:56 UTC (rev 903)
@@ -4,7 +4,7 @@
 
 #include "stdafx.h"
 
-#if (_MSC_VER == MSVC_VER_2008)
+/*#if (_MSC_VER == MSVC_VER_2008)
 
 // Fix for VS2008 SP1 bloatage (http://tedwvc.wordpress.com/2011/04/16/static-mfc-code-bloat-problem-from-vc2010-is-now-in-vc2008-sp1security-fix/):
 
@@ -33,4 +33,4 @@
 	return(::AfxCtxLoadLibraryW(wszLoadPath));
 }
 
-#endif
+#endif*/

Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp	2011-06-15 13:42:46 UTC (rev 902)
+++ trunk/OpenMPT/mptrack/test/test.cpp	2011-06-16 20:29:56 UTC (rev 903)
@@ -64,7 +64,7 @@
 
 void TestVersion();
 void TestTypes();
-void TestLoadFile();
+void TestLoadSaveFile();
 void TestPCnoteSerialization();
 void TestMisc();
 
@@ -78,11 +78,13 @@
 	DO_TEST(TestTypes);
 	//DO_TEST(TestPCnoteSerialization);
 	DO_TEST(TestMisc);
-	DO_TEST(TestLoadFile)
+	DO_TEST(TestLoadSaveFile)
 
 	Log(TEXT("Tests were run\n"));
 }
 
+
+// Test if functions related to program version data work
 void TestVersion()
 //----------------
 {
@@ -146,6 +148,7 @@
 }
 
 
+// Test if data types are interpreted correctly
 void TestTypes()
 //--------------
 {
@@ -198,47 +201,10 @@
 }
 
 
-template<class T>
-T Round(double a) {return static_cast<T>(floor(a + 0.5));}
-
-double Rand01() {return rand() / double(RAND_MAX);}
-
-template <class T>
-T Rand(const T& min, const T& max) {return Round<T>(min + Rand01() * (max - min));}
-
-
-
-void GenerateCommands(CPattern& pat, const double dProbPcs, const double dProbPc)
-//-------------------------------------------------------------------------------
+// Check if our test file was loaded correctly.
+void TestLoadFile(const CModDoc *pModDoc)
+//---------------------------------------
 {
-    const double dPcxProb = dProbPcs + dProbPc;
-    const CPattern::const_iterator end = pat.End();
-    for(CPattern::iterator i = pat.Begin(); i != end; i++)
-    {
-        const double rand = Rand01();
-        if(rand < dPcxProb)
-        {
-            if(rand < dProbPcs)
-                i->note = NOTE_PCS;
-            else
-                i->note = NOTE_PC;
-
-            i->instr = Rand<BYTE>(0, MAX_MIXPLUGINS);
-			i->SetValueVolCol(Rand<uint16>(0, MODCOMMAND::maxColumnValue));
-			i->SetValueEffectCol(Rand<uint16>(0, MODCOMMAND::maxColumnValue));
-        }
-        else
-            i->Clear();
-    }
-}
-
-
-void TestLoadFile()
-//-----------------
-{
-	CString theFile = __FILE__;
-	theFile.Replace(".cpp", ".mptm");
-	CModDoc *pModDoc = (CModDoc *)theApp.OpenDocumentFile(theFile);
 	const CSoundFile *pSndFile = pModDoc->GetSoundFile();
 
 	// Global Variables
@@ -441,10 +407,67 @@
 	VERIFY_EQUAL_NONCONT(mapping.GetEvent(), MIDIEVENT_CONTROLLERCHANGE);
 	VERIFY_EQUAL_NONCONT(mapping.GetController(), MIDICC_ModulationWheel_Coarse);
 
+}
+
+
+// Test file loading and saving
+void TestLoadSaveFile()
+//---------------------
+{
+	CString theFile = __FILE__;
+	theFile.Replace(".cpp", ".mptm");
+	// Test file loading
+	CModDoc *pModDoc = (CModDoc *)theApp.OpenDocumentFile(theFile);
+	TestLoadFile(pModDoc);
+
+	// Test file saving
+	theFile += ".saved";
+	pModDoc->GetSoundFile()->SaveIT(theFile);
 	pModDoc->OnCloseDocument();
+	
+	// Reload the saved file and test if everything is still working correctly.
+	pModDoc = (CModDoc *)theApp.OpenDocumentFile(theFile);
+	TestLoadFile(pModDoc);
+	pModDoc->OnCloseDocument();
 }
 
 
+template<class T>
+T Round(double a) {return static_cast<T>(floor(a + 0.5));}
+
+double Rand01() {return rand() / double(RAND_MAX);}
+
+template <class T>
+T Rand(const T& min, const T& max) {return Round<T>(min + Rand01() * (max - min));}
+
+
+
+void GenerateCommands(CPattern& pat, const double dProbPcs, const double dProbPc)
+//-------------------------------------------------------------------------------
+{
+	const double dPcxProb = dProbPcs + dProbPc;
+	const CPattern::const_iterator end = pat.End();
+	for(CPattern::iterator i = pat.Begin(); i != end; i++)
+	{
+		const double rand = Rand01();
+		if(rand < dPcxProb)
+		{
+			if(rand < dProbPcs)
+				i->note = NOTE_PCS;
+			else
+				i->note = NOTE_PC;
+
+			i->instr = Rand<BYTE>(0, MAX_MIXPLUGINS);
+			i->SetValueVolCol(Rand<uint16>(0, MODCOMMAND::maxColumnValue));
+			i->SetValueEffectCol(Rand<uint16>(0, MODCOMMAND::maxColumnValue));
+		}
+		else
+			i->Clear();
+	}
+}
+
+
+// Test PC note serialization
 void TestPCnoteSerialization()
 //----------------------------
 {


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




2006	Jan	Feb	Mar (1)	Apr (1)	May	Jun (1)	Jul	Aug (10)	Sep	Oct	Nov	Dec (3)
2007	Jan (1)	Feb (2)	Mar (3)	Apr (2)	May (10)	Jun (2)	Jul (1)	Aug	Sep	Oct	Nov (3)	Dec
2008	Jan (6)	Feb (4)	Mar (5)	Apr (2)	May (1)	Jun (1)	Jul (4)	Aug (6)	Sep (2)	Oct (9)	Nov (1)	Dec (4)
2009	Jan (9)	Feb (2)	Mar (2)	Apr (2)	May (6)	Jun (18)	Jul (33)	Aug (39)	Sep (33)	Oct (24)	Nov (23)	Dec (22)
2010	Jan (29)	Feb (32)	Mar (51)	Apr (17)	May (31)	Jun (21)	Jul (32)	Aug (28)	Sep (35)	Oct (27)	Nov (11)	Dec (13)
2011	Jan (14)	Feb (13)	Mar (27)	Apr (27)	May (28)	Jun (20)	Jul (43)	Aug (52)	Sep (66)	Oct (61)	Nov (11)	Dec (8)
2012	Jan (20)	Feb (30)	Mar (38)	Apr (21)	May (33)	Jun (21)	Jul (25)	Aug (9)	Sep (24)	Oct (42)	Nov (27)	Dec (41)
2013	Jan (20)	Feb (35)	Mar (156)	Apr (298)	May (258)	Jun (201)	Jul (105)	Aug (60)	Sep (193)	Oct (245)	Nov (280)	Dec (194)
2014	Jan (63)	Feb (202)	Mar (200)	Apr (23)	May (53)	Jun (105)	Jul (18)	Aug (26)	Sep (110)	Oct (187)	Nov (97)	Dec (74)
2015	Jan (45)	Feb (55)	Mar (116)	Apr (116)	May (193)	Jun (164)	Jul (50)	Aug (111)	Sep (98)	Oct (71)	Nov (103)	Dec (63)
2016	Jan (33)	Feb (101)	Mar (182)	Apr (139)	May (140)	Jun (103)	Jul (165)	Aug (286)	Sep (208)	Oct (127)	Nov (97)	Dec (54)
2017	Jan (64)	Feb (335)	Mar (202)	Apr (212)	May (139)	Jun (127)	Jul (294)	Aug (154)	Sep (170)	Oct (152)	Nov (156)	Dec (62)
2018	Jan (168)	Feb (237)	Mar (196)	Apr (174)	May (174)	Jun (161)	Jul (127)	Aug (88)	Sep (149)	Oct (66)	Nov (52)	Dec (135)
2019	Jan (146)	Feb (126)	Mar (104)	Apr (58)	May (60)	Jun (28)	Jul (197)	Aug (129)	Sep (141)	Oct (148)	Nov (63)	Dec (100)
2020	Jan (74)	Feb (37)	Mar (59)	Apr (154)	May (194)	Jun (133)	Jul (313)	Aug (197)	Sep (49)	Oct (162)	Nov (143)	Dec (57)
2021	Jan (120)	Feb (107)	Mar (314)	Apr (157)	May (524)	Jun (169)	Jul (72)	Aug (133)	Sep (135)	Oct (146)	Nov (198)	Dec (325)
2022	Jan (409)	Feb (249)	Mar (138)	Apr (95)	May (102)	Jun (221)	Jul (66)	Aug (120)	Sep (192)	Oct (131)	Nov (53)	Dec (171)
2023	Jan (357)	Feb (82)	Mar (168)	Apr (218)	May (196)	Jun (86)	Jul (115)	Aug (49)	Sep (190)	Oct (102)	Nov (45)	Dec (76)
2024	Jan (86)	Feb (50)	Mar (324)	Apr (209)	May (197)	Jun (232)	Jul (194)	Aug (247)	Sep (219)	Oct (266)	Nov (328)	Dec (304)
2025	Jan (191)	Feb (115)	Mar (137)	Apr (32)	May (126)	Jun (403)	Jul (213)	Aug (203)	Sep (148)	Oct (109)	Nov (191)	Dec (209)
2026	Jan (127)	Feb (123)	Mar (160)	Apr (141)	May (47)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

modplug-svn-commit Mailing List for modplug (Page 986)

A music tracker software for Windows.

modplug-svn-commit — OpenMPT subversion commit notifications