Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove TestTimer() (adds nothing to existing tests) and move wxStopWatch tests to a new CppUnit test.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-05-16 15:44:17 +00:00
parent 5d947bc835
commit 45cb70531f
13 changed files with 161 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
samples/console/console.cpp
View File

@@ -131,10 +131,9 @@
#define TEST_STACKWALKER
#define TEST_STDPATHS
#define TEST_STREAMS
#define TEST_TIMER
// #define TEST_VOLUME --FIXME! (RN)
#else // #if TEST_ALL
#define TEST_DATETIME
#define TEST_VOLUME
#endif
// some tests are interactive, define this to run them
@@ -2827,113 +2826,6 @@ static void TestMemoryStream()
#endif // TEST_STREAMS
// ----------------------------------------------------------------------------
// timers
// ----------------------------------------------------------------------------
#ifdef TEST_TIMER
#include "wx/stopwatch.h"
#include "wx/utils.h"
static void TestStopWatch()
{
wxPuts(wxT("*** Testing wxStopWatch ***\n"));
wxStopWatch sw;
sw.Pause();
wxPrintf(wxT("Initially paused, after 2 seconds time is..."));
fflush(stdout);
wxSleep(2);
wxPrintf(wxT("\t%ldms\n"), sw.Time());
wxPrintf(wxT("Resuming stopwatch and sleeping 3 seconds..."));
fflush(stdout);
sw.Resume();
wxSleep(3);
wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
sw.Pause();
wxPrintf(wxT("Pausing agan and sleeping 2 more seconds..."));
fflush(stdout);
wxSleep(2);
wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
sw.Resume();
wxPrintf(wxT("Finally resuming and sleeping 2 more seconds..."));
fflush(stdout);
wxSleep(2);
wxPrintf(wxT("\telapsed time: %ldms\n"), sw.Time());
wxStopWatch sw2;
wxPuts(wxT("\nChecking for 'backwards clock' bug..."));
for ( size_t n = 0; n < 70; n++ )
{
sw2.Start();
for ( size_t m = 0; m < 100000; m++ )
{
if ( sw.Time() < 0 || sw2.Time() < 0 )
{
wxPuts(wxT("\ntime is negative - ERROR!"));
}
}
wxPutchar('.');
fflush(stdout);
}
wxPuts(wxT(", ok."));
}
#include "wx/timer.h"
#include "wx/evtloop.h"
void TestTimer()
{
wxPuts(wxT("*** Testing wxTimer ***\n"));
class MyTimer : public wxTimer
{
public:
MyTimer() : wxTimer() { m_num = 0; }
virtual void Notify()
{
wxPrintf(wxT("%d"), m_num++);
fflush(stdout);
if ( m_num == 10 )
{
wxPrintf(wxT("... exiting the event loop"));
Stop();
wxEventLoop::GetActive()->Exit(0);
wxPuts(wxT(", ok."));
}
fflush(stdout);
}
private:
int m_num;
};
wxEventLoop loop;
wxTimer timer1;
timer1.Start(100, true /* one shot */);
timer1.Stop();
timer1.Start(100, true /* one shot */);
MyTimer timer;
timer.Start(500);
loop.Run();
}
#endif // TEST_TIMER
// ----------------------------------------------------------------------------
// wxVolume tests
// ----------------------------------------------------------------------------
@@ -3309,11 +3201,6 @@ int main(int argc, char **argv)
TestMemoryStream();
#endif // TEST_STREAMS
#ifdef TEST_TIMER
TestStopWatch();
TestTimer();
#endif // TEST_TIMER
#ifdef TEST_DATETIME
#if TEST_INTERACTIVE
TestDateTimeInteractive();

4
tests/Makefile.in
View File

@@ -65,6 +65,7 @@ TEST_OBJECTS = \
test_datetimetest.o \
test_evthandler.o \
test_evtsource.o \
test_stopwatch.o \
test_timertest.o \
test_exec.o \
test_filetest.o \
@@ -389,6 +390,9 @@ test_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_ODEP)
test_evtsource.o: $(srcdir)/events/evtsource.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evtsource.cpp
test_stopwatch.o: $(srcdir)/events/stopwatch.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/stopwatch.cpp
test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp

95
tests/events/stopwatch.cpp Normal file
View File

@@ -0,0 +1,95 @@
///////////////////////////////////////////////////////////////////////////////
// Name: tests/events/stopwatch.cpp
// Purpose: Test wxStopWatch class
// Author: Francesco Montorsi (extracted from console sample)
// Created: 2010-05-16
// RCS-ID: $Id$
// Copyright: (c) 2010 wxWidgets team
///////////////////////////////////////////////////////////////////////////////
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "testprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#endif // WX_PRECOMP
#include <time.h>
#include "wx/stopwatch.h"
#include "wx/utils.h"
// --------------------------------------------------------------------------
// test class
// --------------------------------------------------------------------------
class StopWatchTestCase : public CppUnit::TestCase
{
public:
StopWatchTestCase() {}
private:
CPPUNIT_TEST_SUITE( StopWatchTestCase );
CPPUNIT_TEST( Misc );
CPPUNIT_TEST( BackwardsClockBug );
CPPUNIT_TEST_SUITE_END();
void Misc();
void BackwardsClockBug();
DECLARE_NO_COPY_CLASS(StopWatchTestCase)
};
// register in the unnamed registry so that these tests are run by default
CPPUNIT_TEST_SUITE_REGISTRATION( StopWatchTestCase );
// also include in it's own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StopWatchTestCase, "StopWatchTestCase" );
void StopWatchTestCase::Misc()
{
wxStopWatch sw;
long tmp;
sw.Pause(); // pause it immediately
wxSleep(2);
tmp = sw.Time();
CPPUNIT_ASSERT(tmp >= 0 && tmp < 100);
// should not have counted while paused!
sw.Resume();
wxSleep(3);
tmp = sw.Time();
CPPUNIT_ASSERT(tmp >= 3000 && tmp < 4000);
sw.Pause();
sw.Resume();
wxSleep(2);
tmp = sw.Time();
CPPUNIT_ASSERT(tmp >= 5000 && tmp < 6000);
}
void StopWatchTestCase::BackwardsClockBug()
{
wxStopWatch sw;
wxStopWatch sw2;
for ( size_t n = 0; n < 10; n++ )
{
sw2.Start();
for ( size_t m = 0; m < 10000; m++ )
{
CPPUNIT_ASSERT ( sw.Time() >= 0 && sw2.Time() >= 0 );
}
}
}

3
tests/events/timertest.cpp
View File

@@ -25,7 +25,10 @@
#include "wx/evtloop.h"
#include "wx/timer.h"
// --------------------------------------------------------------------------
// helper class counting the number of timer events
// --------------------------------------------------------------------------
class TimerCounterHandler : public wxEvtHandler
{
public:

4
tests/makefile.bcc
View File

@@ -49,6 +49,7 @@ TEST_OBJECTS = \
$(OBJS)\test_datetimetest.obj \
$(OBJS)\test_evthandler.obj \
$(OBJS)\test_evtsource.obj \
$(OBJS)\test_stopwatch.obj \
$(OBJS)\test_timertest.obj \
$(OBJS)\test_exec.obj \
$(OBJS)\test_filetest.obj \
@@ -431,6 +432,9 @@ $(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
$(OBJS)\test_timertest.obj: .\events\timertest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp

4
tests/makefile.gcc
View File

@@ -41,6 +41,7 @@ TEST_OBJECTS = \
$(OBJS)\test_datetimetest.o \
$(OBJS)\test_evthandler.o \
$(OBJS)\test_evtsource.o \
$(OBJS)\test_stopwatch.o \
$(OBJS)\test_timertest.o \
$(OBJS)\test_exec.o \
$(OBJS)\test_filetest.o \
@@ -412,6 +413,9 @@ $(OBJS)\test_evthandler.o: ./events/evthandler.cpp
$(OBJS)\test_evtsource.o: ./events/evtsource.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_stopwatch.o: ./events/stopwatch.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_timertest.o: ./events/timertest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<

4
tests/makefile.vc
View File

@@ -43,6 +43,7 @@ TEST_OBJECTS = \
$(OBJS)\test_datetimetest.obj \
$(OBJS)\test_evthandler.obj \
$(OBJS)\test_evtsource.obj \
$(OBJS)\test_stopwatch.obj \
$(OBJS)\test_timertest.obj \
$(OBJS)\test_exec.obj \
$(OBJS)\test_filetest.obj \
@@ -557,6 +558,9 @@ $(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
$(OBJS)\test_evtsource.obj: .\events\evtsource.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evtsource.cpp
$(OBJS)\test_stopwatch.obj: .\events\stopwatch.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\stopwatch.cpp
$(OBJS)\test_timertest.obj: .\events\timertest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp

4
tests/makefile.wat
View File

@@ -279,6 +279,7 @@ TEST_OBJECTS = &
$(OBJS)\test_datetimetest.obj &
$(OBJS)\test_evthandler.obj &
$(OBJS)\test_evtsource.obj &
$(OBJS)\test_stopwatch.obj &
$(OBJS)\test_timertest.obj &
$(OBJS)\test_exec.obj &
$(OBJS)\test_filetest.obj &
@@ -469,6 +470,9 @@ $(OBJS)\test_evthandler.obj : .AUTODEPEND .\events\evthandler.cpp
$(OBJS)\test_evtsource.obj : .AUTODEPEND .\events\evtsource.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_stopwatch.obj : .AUTODEPEND .\events\stopwatch.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_timertest.obj : .AUTODEPEND .\events\timertest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<

1
tests/test.bkl
View File

@@ -40,6 +40,7 @@
datetime/datetimetest.cpp
events/evthandler.cpp
events/evtsource.cpp
events/stopwatch.cpp
events/timertest.cpp
exec/exec.cpp
file/filetest.cpp

4
tests/test_test.dsp
View File

@@ -429,6 +429,10 @@ SOURCE=.\strings\stdstrings.cpp
# End Source File
# Begin Source File
SOURCE=.\events\stopwatch.cpp
# End Source File
# Begin Source File
SOURCE=.\strings\strings.cpp
# End Source File
# Begin Source File

3
tests/test_vc7_test.vcproj
View File

@@ -757,6 +757,9 @@
<File
RelativePath=".\strings\stdstrings.cpp">
</File>
<File
RelativePath=".\events\stopwatch.cpp">
</File>
<File
RelativePath=".\strings\strings.cpp">
</File>

4
tests/test_vc8_test.vcproj
View File

@@ -1083,6 +1083,10 @@
RelativePath=".\strings\stdstrings.cpp"
>
</File>
<File
RelativePath=".\events\stopwatch.cpp"
>
</File>
<File
RelativePath=".\strings\strings.cpp"
>

46
tests/test_vc9_test.vcproj
View File

@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="Windows-1252"?>
<!--
This project was generated by
Bakefile 0.2.8 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="test"
ProjectGUID="{2F45723C-ED6B-5F60-8BFF-6B3609464A7B}"
TargetFrameworkVersion="0"
>
<Platforms>
<Platform
@@ -12,6 +18,7 @@
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
@@ -44,7 +51,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;.;F:\cppunit\include"
AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"
ExceptionHandling="1"
BasicRuntimeChecks="3"
@@ -79,7 +86,7 @@
OutputFile="vc_mswud\test.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\..\lib\vc_lib;F:\cppunit\lib"
AdditionalLibraryDirectories=".\..\lib\vc_lib"
GenerateManifest="true"
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswud\test.pdb"
@@ -97,8 +104,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswud\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -178,9 +185,9 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswu\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -193,8 +200,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswu\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -289,8 +296,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswunivud\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -370,9 +377,9 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivu\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -385,8 +392,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswunivu\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -481,8 +488,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswuddll\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -562,9 +569,9 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswudll\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -577,8 +584,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswudll\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -673,8 +680,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswunivuddll\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -754,9 +761,9 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="vc_mswunivudll\test.pdb"
SubSystem="1"
TargetMachine="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -769,8 +776,8 @@
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile="vc_mswunivudll\test_vc9_test.bsc"
SuppressStartupBanner="true"
/>
<Tool
Name="VCFxCopTool"
@@ -784,6 +791,7 @@
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
@@ -1047,6 +1055,10 @@
RelativePath=".\strings\stdstrings.cpp"
>
</File>
<File
RelativePath=".\events\stopwatch.cpp"
>
</File>
<File
RelativePath=".\strings\strings.cpp"
>
@@ -1142,5 +1154,7 @@
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>