X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c7bd972fa6feb7041d32870f152fe1329900126..a4c7b5e4358b0fb0ebbb489f2156fa4e139b2211:/tests/controls/gridtest.cpp

diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp
index aea226aa2b..8012b51429 100644
--- a/tests/controls/gridtest.cpp
+++ b/tests/controls/gridtest.cpp
@@ -24,6 +24,20 @@
 #include "asserthelper.h"
 #include "wx/uiaction.h"
 
+// FIXME: A lot of mouse-related tests sporadically fail in wxGTK. This happens
+//        almost all the time but sometimes the tests do pass and the failure
+//        doesn't happen when debugging so this looks like some kind of event
+//        dispatching/simulating problem rather than a real problem in wxGrid.
+//
+//        Just disable these tests for now but it would be really great to
+//        really fix the problem.
+#ifdef __WXGTK__
+    #define NONGTK_TEST(test)
+#else
+    #define NONGTK_TEST(test) WXUISIM_TEST(test)
+#endif
+
+
 class GridTestCase : public CppUnit::TestCase
 {
 public:
@@ -35,16 +49,17 @@ public:
 private:
     CPPUNIT_TEST_SUITE( GridTestCase );
         WXUISIM_TEST( CellEdit );
-        WXUISIM_TEST( CellClick );
-        WXUISIM_TEST( CellSelect );
-        WXUISIM_TEST( LabelClick );
-        WXUISIM_TEST( SortClick );
+        NONGTK_TEST( CellClick );
+        NONGTK_TEST( CellSelect );
+        NONGTK_TEST( LabelClick );
+        NONGTK_TEST( SortClick );
         WXUISIM_TEST( Size );
-        WXUISIM_TEST( RangeSelect );
+        NONGTK_TEST( RangeSelect );
         CPPUNIT_TEST( Cursor );
         CPPUNIT_TEST( Selection );
         CPPUNIT_TEST( AddRowCol );
         CPPUNIT_TEST( ColumnOrder );
+        CPPUNIT_TEST( ColumnVisibility );
         CPPUNIT_TEST( LineFormatting );
         CPPUNIT_TEST( SortSupport );
         CPPUNIT_TEST( Labels );
@@ -53,12 +68,12 @@ private:
         WXUISIM_TEST( Editable );
         WXUISIM_TEST( ReadOnly );
         CPPUNIT_TEST( PseudoTest_NativeHeader );
-        WXUISIM_TEST( LabelClick );
-        WXUISIM_TEST( SortClick );
+        NONGTK_TEST( LabelClick );
+        NONGTK_TEST( SortClick );
         CPPUNIT_TEST( ColumnOrder );
         CPPUNIT_TEST( PseudoTest_NativeLabels );
-        WXUISIM_TEST( LabelClick );
-        WXUISIM_TEST( SortClick );
+        NONGTK_TEST( LabelClick );
+        NONGTK_TEST( SortClick );
         CPPUNIT_TEST( ColumnOrder );
     CPPUNIT_TEST_SUITE_END();
 
@@ -73,6 +88,7 @@ private:
     void Selection();
     void AddRowCol();
     void ColumnOrder();
+    void ColumnVisibility();
     void LineFormatting();
     void SortSupport();
     void Labels();
@@ -512,6 +528,19 @@ void GridTestCase::ColumnOrder()
     CPPUNIT_ASSERT_EQUAL(3, m_grid->GetColPos(3));
 }
 
+void GridTestCase::ColumnVisibility()
+{
+    m_grid->AppendCols(3);
+    CPPUNIT_ASSERT( m_grid->IsColShown(1) );
+
+    m_grid->HideCol(1);
+    CPPUNIT_ASSERT( !m_grid->IsColShown(1) );
+    CPPUNIT_ASSERT( m_grid->IsColShown(2) );
+
+    m_grid->ShowCol(1);
+    CPPUNIT_ASSERT( m_grid->IsColShown(1) );
+}
+
 void GridTestCase::LineFormatting()
 {
     CPPUNIT_ASSERT(m_grid->GridLinesEnabled());