added a simple test for wxGetDisplayXXX() functions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index bbff08c43ad6dfaf93b85de1c37c02446fa88ff0..b391b3a8cbca85e22c2d107ba07635ec81dcb73f 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -124,6 +124,7 @@ TEST_GUI_OBJECTS =  \
        test_gui_textctrltest.o \
        test_gui_textentrytest.o \
        test_gui_rawbmp.o \
+       test_gui_guifuncs.o \
        test_gui_selstoretest.o \
        test_gui_clientsize.o \
        test_gui_setsize.o
@@ -531,6 +532,9 @@ test_gui_textentrytest.o: $(srcdir)/controls/textentrytest.cpp $(TEST_GUI_ODEP)
 test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp
 
+test_gui_guifuncs.o: $(srcdir)/misc/guifuncs.cpp $(TEST_GUI_ODEP)
+       $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/guifuncs.cpp
+
 test_gui_selstoretest.o: $(srcdir)/misc/selstoretest.cpp $(TEST_GUI_ODEP)
        $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/misc/selstoretest.cpp
 

diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index aff1930ca88591bab932917473818b3e44d73252..88144e0b32e550f03882722c518288a243485f70 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -112,6 +112,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.obj \
        $(OBJS)\test_gui_textentrytest.obj \
        $(OBJS)\test_gui_rawbmp.obj \
+       $(OBJS)\test_gui_guifuncs.obj \
        $(OBJS)\test_gui_selstoretest.obj \
        $(OBJS)\test_gui_clientsize.obj \
        $(OBJS)\test_gui_setsize.obj
@@ -572,6 +573,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
 $(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
 

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index b201e85bec92a1747296cc67ebe499c17fbdaab4..2dcf5a66d24d90ccb70b93df8995efabf4adc08c 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -105,6 +105,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.o \
        $(OBJS)\test_gui_textentrytest.o \
        $(OBJS)\test_gui_rawbmp.o \
+       $(OBJS)\test_gui_guifuncs.o \
        $(OBJS)\test_gui_selstoretest.o \
        $(OBJS)\test_gui_clientsize.o \
        $(OBJS)\test_gui_setsize.o
@@ -550,6 +551,9 @@ $(OBJS)\test_gui_textentrytest.o: ./controls/textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_guifuncs.o: ./misc/guifuncs.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_selstoretest.o: ./misc/selstoretest.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 

diff --git a/tests/makefile.vc b/tests/makefile.vc
index dc2ec67e06c9fa4d5538d0ae0b40d63466df9111..331705a2fd74dbdf8cad48ea8de9c20f7a0ce4bb 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -108,6 +108,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_textctrltest.obj \
        $(OBJS)\test_gui_textentrytest.obj \
        $(OBJS)\test_gui_rawbmp.obj \
+       $(OBJS)\test_gui_guifuncs.obj \
        $(OBJS)\test_gui_selstoretest.obj \
        $(OBJS)\test_gui_clientsize.obj \
        $(OBJS)\test_gui_setsize.obj
@@ -657,6 +658,9 @@ $(OBJS)\test_gui_textentrytest.obj: .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp
 
+$(OBJS)\test_gui_guifuncs.obj: .\misc\guifuncs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\guifuncs.cpp
+
 $(OBJS)\test_gui_selstoretest.obj: .\misc\selstoretest.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\misc\selstoretest.cpp
 

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 15b4793f5549af996a994ca9825ee76ea80fc39c..cc01f9613f458d6f0600a4a2b0ffc23bb74c9a19 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -317,6 +317,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_textctrltest.obj &
        $(OBJS)\test_gui_textentrytest.obj &
        $(OBJS)\test_gui_rawbmp.obj &
+       $(OBJS)\test_gui_guifuncs.obj &
        $(OBJS)\test_gui_selstoretest.obj &
        $(OBJS)\test_gui_clientsize.obj &
        $(OBJS)\test_gui_setsize.obj
@@ -603,6 +604,9 @@ $(OBJS)\test_gui_textentrytest.obj :  .AUTODEPEND .\controls\textentrytest.cpp
 $(OBJS)\test_gui_rawbmp.obj :  .AUTODEPEND .\image\rawbmp.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
+$(OBJS)\test_gui_guifuncs.obj :  .AUTODEPEND .\misc\guifuncs.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_selstoretest.obj :  .AUTODEPEND .\misc\selstoretest.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 

diff --git a/tests/misc/guifuncs.cpp b/tests/misc/guifuncs.cpp
new file mode 100644 (file)
index 0000000..886769a
--- /dev/null
+++ b/tests/misc/guifuncs.cpp
@@ -0,0 +1,69 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        tests/misc/misctests.cpp
+// Purpose:     test miscellaneous GUI functions
+// Author:      Vadim Zeitlin
+// Created:     2008-09-22
+// RCS-ID:      $Id$
+// Copyright:   (c) 2008 Vadim Zeitlin
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#include "wx/defs.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class MiscGUIFuncsTestCase : public CppUnit::TestCase
+{
+public:
+    MiscGUIFuncsTestCase() { }
+
+private:
+    CPPUNIT_TEST_SUITE( MiscGUIFuncsTestCase );
+        CPPUNIT_TEST( DisplaySize );
+    CPPUNIT_TEST_SUITE_END();
+
+    void DisplaySize();
+
+    DECLARE_NO_COPY_CLASS(MiscGUIFuncsTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( MiscGUIFuncsTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MiscGUIFuncsTestCase, "MiscGUIFuncsTestCase" );
+
+void MiscGUIFuncsTestCase::DisplaySize()
+{
+    // test that different (almost) overloads return the same results
+    int w, h;
+    wxDisplaySize(&w, &h);
+    wxSize sz = wxGetDisplaySize();
+
+    CPPUNIT_ASSERT_EQUAL( w, sz.x );
+    CPPUNIT_ASSERT_EQUAL( h, sz.y );
+
+    // test that passing NULL works as expected, e.g. doesn't crash
+    wxDisplaySize(NULL, NULL);
+    wxDisplaySize(&w, NULL);
+    wxDisplaySize(NULL, &h);
+
+    CPPUNIT_ASSERT_EQUAL( w, sz.x );
+    CPPUNIT_ASSERT_EQUAL( h, sz.y );
+
+    // test that display PPI is something reasonable
+    sz = wxGetDisplayPPI();
+    CPPUNIT_ASSERT( sz.x < 1000 && sz.y < 1000 );
+}
+

diff --git a/tests/test.bkl b/tests/test.bkl
index 80ec00b75f00fbd47d1ebefcaff3acafa2bc1639..f6d3ec51ae654d2db111853ae183a060e6826c8f 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -109,6 +109,7 @@
             controls/textctrltest.cpp
             controls/textentrytest.cpp
             image/rawbmp.cpp
+            misc/guifuncs.cpp
             misc/selstoretest.cpp
             window/clientsize.cpp
             window/setsize.cpp

diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index b3b644d5b22d644b77ebc3f872b2610dbc1ddbca..396016da2d98d93237e2422d130ee0c71260734f 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -253,6 +253,10 @@ SOURCE=.\dummy.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\misc\guifuncs.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\geometry\point.cpp\r
 # End Source File\r
 # Begin Source File\r

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 9f942f2aca320a7549414825da6e814ecf8df933..bfc46ef2ab6d1f2ba025e76ebac550b51917ae52 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -706,6 +706,8 @@
                                                UsePrecompiledHeader="1"/>\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\misc\guifuncs.cpp"/>\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"/>\r
                        <File\r

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index be16b2ca48d6c409bde35292db2967570246d023..65aa8f61de6de526ef6f8e3774ea485189e6195d 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -884,6 +884,9 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\misc\guifuncs.cpp"\r
+                       />\r
                        <File\r
                                RelativePath=".\geometry\point.cpp"\r
                        />\r