Add a test for eol-native file existence in the release script.

[wxWidgets.git] / tests / controls / comboboxtest.cpp

diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp
index a624d62d60f1cd2537d6acd86db0897fe7fbf259..147c5638a77c8fc2a14edb8a02aecd05a2a0f58a 100644 (file)
--- a/tests/controls/comboboxtest.cpp
+++ b/tests/controls/comboboxtest.cpp
@@ -56,7 +56,20 @@ private:
     }
 
     CPPUNIT_TEST_SUITE( ComboBoxTestCase );
     }
 
     CPPUNIT_TEST_SUITE( ComboBoxTestCase );

+#ifdef __WXOSX__
+    CPPUNIT_TEST( SetValue );
+    CPPUNIT_TEST( TextChangeEvents );
+    CPPUNIT_TEST( Selection );
+    CPPUNIT_TEST( InsertionPoint );
+    CPPUNIT_TEST( Replace );
+//  TODO on OS X only works interactively
+//   WXUISIM_TEST( Editable );
+    CPPUNIT_TEST( Hint );
+    CPPUNIT_TEST( CopyPaste ); 
+    CPPUNIT_TEST( UndoRedo );
+#else

         wxTEXT_ENTRY_TESTS();
         wxTEXT_ENTRY_TESTS();

+#endif

         wxITEM_CONTAINER_TESTS();
         CPPUNIT_TEST( Size );
         CPPUNIT_TEST( PopDismiss );
         wxITEM_CONTAINER_TESTS();
         CPPUNIT_TEST( Size );
         CPPUNIT_TEST( PopDismiss );


@@ -129,17 +142,14 @@ void ComboBoxTestCase::Size()
 void ComboBoxTestCase::PopDismiss()
 {
 #if defined(__WXMSW__) || defined(__WXGTK210__)
 void ComboBoxTestCase::PopDismiss()
 {
 #if defined(__WXMSW__) || defined(__WXGTK210__)

-    wxTestableFrame* frame = wxStaticCast(wxTheApp->GetTopWindow(),
-                                          wxTestableFrame);
-
-    EventCounter count(m_combo, wxEVT_COMMAND_COMBOBOX_DROPDOWN);
-    EventCounter count1(m_combo, wxEVT_COMMAND_COMBOBOX_CLOSEUP);
+    EventCounter drop(m_combo, wxEVT_COMBOBOX_DROPDOWN);
+    EventCounter close(m_combo, wxEVT_COMBOBOX_CLOSEUP);

 
     m_combo->Popup();
     m_combo->Dismiss();
 
 
     m_combo->Popup();
     m_combo->Dismiss();
 

-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_COMBOBOX_DROPDOWN));
-    CPPUNIT_ASSERT_EQUAL(1, frame->GetEventCount(wxEVT_COMMAND_COMBOBOX_CLOSEUP));
+    CPPUNIT_ASSERT_EQUAL(1, drop.GetCount());
+    CPPUNIT_ASSERT_EQUAL(1, close.GetCount());

 #endif
 }
 
 #endif
 }
 


@@ -172,7 +182,6 @@ void ComboBoxTestCase::Sort()
 
 void ComboBoxTestCase::ReadOnly()
 {
 
 void ComboBoxTestCase::ReadOnly()
 {

-#ifndef __WXOSX__

     wxArrayString testitems;
     testitems.Add("item 1");
     testitems.Add("item 2");
     wxArrayString testitems;
     testitems.Add("item 1");
     testitems.Add("item 2");


@@ -193,7 +202,6 @@ void ComboBoxTestCase::ReadOnly()
     m_combo->SetValue("ITEM 2");
 
     CPPUNIT_ASSERT_EQUAL("item 2", m_combo->GetValue());
     m_combo->SetValue("ITEM 2");
 
     CPPUNIT_ASSERT_EQUAL("item 2", m_combo->GetValue());

-#endif

 }
 
 void ComboBoxTestCase::IsEmpty()
 }
 
 void ComboBoxTestCase::IsEmpty()