const int spacing = 8;
wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
- wxTextCtrl* ed = new wxTextCtrl(dlg,11,text,
- wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
+ wxTextCtrl* ed = new wxTextCtrl(dlg, 11, text,
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_MULTILINE);
rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
rowsizer = new wxBoxSizer( wxHORIZONTAL );
failures++; \
}
+#define RT_ASSERT(COND) \
+ if (!(COND)) \
+ RT_FAILURE()
+
#define RT_FAILURE_MSG(MSG) \
{ \
wxString s1 = wxString::Format(wxT("Test failure in tests.cpp, line %i."),__LINE__-1); \
return arr;
}
+// Callback for testing property sorting
+int MyPropertySortFunction(wxPropertyGrid* WXUNUSED(propGrid),
+ wxPGProperty* p1,
+ wxPGProperty* p2)
+{
+ // Reverse alphabetical order
+ return p2->GetLabel().CmpNoCase( p1->GetBaseName() );
+}
+
bool FormMain::RunTests( bool fullTest, bool interactive )
{
wxString t;
const int spacing = 8;
wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
- wxTextCtrl* ed = new wxTextCtrl(dlg,11,wxEmptyString,
- wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE|wxTE_READONLY);
+ wxTextCtrl* ed = new wxTextCtrl(dlg, 11, wxEmptyString,
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_MULTILINE);
rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
rowsizer = new wxBoxSizer( wxHORIZONTAL );
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxBLACK )
RT_FAILURE();
- if ( wxSizeRefFromVariant(pg->GetPropertyValue(wxT("Size"))) != wxSize(150,150) )
+ wxVariant varSize(pg->GetPropertyValue(wxT("Size")));
+ if ( wxSizeRefFromVariant(varSize) != wxSize(150,150) )
RT_FAILURE();
- if ( wxPointRefFromVariant(pg->GetPropertyValue(wxT("Position"))) != wxPoint(150,150) )
+ wxVariant varPos(pg->GetPropertyValue(wxT("Position")));
+ if ( wxPointRefFromVariant(varPos) != wxPoint(150,150) )
RT_FAILURE();
if ( !(pg->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_1) )
RT_FAILURE();
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxWHITE )
RT_FAILURE();
- if ( wxSizeRefFromVariant(pgman->GetPropertyValue(wxT("Size"))) != wxSize(300,300) )
+ varSize = pgman->GetPropertyValue(wxT("Size"));
+ if ( wxSizeRefFromVariant(varSize) != wxSize(300,300) )
RT_FAILURE();
- if ( wxPointRefFromVariant(pgman->GetPropertyValue(wxT("Position"))) != wxPoint(300,300) )
+ varPos = pgman->GetPropertyValue(wxT("Position"));
+ if ( wxPointRefFromVariant(varPos) != wxPoint(300,300) )
RT_FAILURE();
if ( !(pgman->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_2) )
RT_FAILURE();
if ( pgman->GetPropertyValueAsLongLong(wxT("IntProperty")) != wxLL(-80000000000) )
RT_FAILURE();
- //
- // Flexible wx(U)LongLong << operator safety conformance tests
- wxPGProperty* prop;
- wxLongLong ll;
- wxULongLong ull;
-
- prop = pgman->GetProperty(wxT("IntProperty"));
- prop->SetValue(128);
- ll << prop->GetValue();
- if ( ll != 128 )
- RT_FAILURE();
-
- prop->SetValue(WXVARIANT(wxLL(68719476736)));
- ll << prop->GetValue();
- if ( ll.GetValue() != wxLL(68719476736) )
- RT_FAILURE();
-
-#if wxUSE_LONGLONG_NATIVE
- wxLongLong_t ll_t;
- ll_t << prop->GetValue();
- if ( ll_t != wxLL(68719476736) )
- RT_FAILURE();
-#endif
-
- prop->SetValue(256);
- ll << prop->GetValue();
- if ( ll != 256 )
- RT_FAILURE();
-
- prop = pgman->GetProperty(wxT("UIntProperty"));
- prop->SetValue(128);
- ull << prop->GetValue();
- if ( ull != 128 )
- RT_FAILURE();
-
- prop->SetValue(WXVARIANT(wxULL(68719476739)));
- ull << prop->GetValue();
- if ( ull.GetValue() != wxULL(68719476739) )
- RT_FAILURE();
-
-#if wxUSE_LONGLONG_NATIVE
- wxULongLong_t ull_t;
- ull_t << prop->GetValue();
- if ( ull_t != wxLL(68719476739) )
- RT_FAILURE();
-#endif
-
- prop->SetValue(256);
- ull << prop->GetValue();
- if ( ull != 256 )
- RT_FAILURE();
-
// Make sure children of composite parent get updated as well
- // Original string value: "Lamborghini Diablo SV; 5707; [300; 3.9; 8.6] 300000"
+ // Original string value: "Lamborghini Diablo SV; 5707; [300; 3.9; 8.6] 300000; Not Convertible"
//
// This updates children as well
- wxString nvs = "Lamborghini Diablo XYZ; 5707; [100; 3.9; 8.6] 3000002";
+ wxString nvs = "Lamborghini Diablo XYZ; 5707; [100; 3.9; 8.6] 3000002; Convertible";
pgman->SetPropertyValue("Car", nvs);
if ( pgman->GetPropertyValueAsString("Car.Model") != "Lamborghini Diablo XYZ" )
wxLogDebug("Did not match: Car.Price ($)=%s", pgman->GetPropertyValueAsString("Car.Price ($)").c_str());
RT_FAILURE();
}
+
+ if ( !pgman->GetPropertyValueAsBool("Car.Convertible") )
+ {
+ wxLogDebug("Did not match: Car.Convertible=%s", pgman->GetPropertyValueAsString("Car.Convertible").c_str());
+ RT_FAILURE();
+ }
}
{
#endif
}
+ {
+ //
+ // Test multiple selection
+ RT_START_TEST(MULTIPLE_SELECTION)
+ if ( !(pgman->GetExtraStyle() & wxPG_EX_MULTIPLE_SELECTION) )
+ CreateGrid( -1, wxPG_EX_MULTIPLE_SELECTION);
+ pgman = m_pPropGridManager;
+
+ wxPropertyGrid* pg = pgman->GetGrid();
+
+ wxPGProperty* prop1 = pg->GetProperty(wxT("Label"));
+ wxPGProperty* prop2 = pg->GetProperty(wxT("Cell Text Colour"));
+ wxPGProperty* prop3 = pg->GetProperty(wxT("Height"));
+ wxPGProperty* catProp = pg->GetProperty(wxT("Appearance"));
+
+ RT_ASSERT( prop1 && prop2 && prop3 );
+
+ pg->ClearSelection();
+ pg->AddToSelection(prop1);
+ pg->AddToSelection(prop2);
+ pg->AddToSelection(prop3);
+
+ // Adding category to selection should fail silently
+ pg->AddToSelection(catProp);
+
+ wxArrayPGProperty selectedProperties = pg->GetSelectedProperties();
+
+ RT_ASSERT( selectedProperties.size() == 3 )
+ RT_ASSERT( pg->IsPropertySelected(prop1) )
+ RT_ASSERT( pg->IsPropertySelected(prop2) )
+ RT_ASSERT( pg->IsPropertySelected(prop3) )
+ RT_ASSERT( !pg->IsPropertySelected(catProp) )
+
+ pg->RemoveFromSelection(prop1);
+ wxArrayPGProperty selectedProperties2 = pg->GetSelectedProperties();
+
+ RT_ASSERT( selectedProperties2.size() == 2 )
+ RT_ASSERT( !pg->IsPropertySelected(prop1) )
+ RT_ASSERT( pg->IsPropertySelected(prop2) )
+ RT_ASSERT( pg->IsPropertySelected(prop3) )
+
+ pg->ClearSelection();
+
+ wxArrayPGProperty selectedProperties3 = pg->GetSelectedProperties();
+
+ RT_ASSERT( selectedProperties3.size() == 0 )
+ RT_ASSERT( !pg->IsPropertySelected(prop1) )
+ RT_ASSERT( !pg->IsPropertySelected(prop2) )
+ RT_ASSERT( !pg->IsPropertySelected(prop3) )
+
+ pg->SelectProperty(prop2);
+
+ RT_ASSERT( !pg->IsPropertySelected(prop1) )
+ RT_ASSERT( pg->IsPropertySelected(prop2) )
+ RT_ASSERT( !pg->IsPropertySelected(prop3) )
+ }
+
+ {
+ //
+ // Test label editing
+ RT_START_TEST(LABEL_EDITING)
+
+ wxPropertyGrid* pg = pgman->GetGrid();
+
+ // Just mostly test that these won't crash
+ pg->MakeColumnEditable(0, true);
+ pg->MakeColumnEditable(2, true);
+ pg->MakeColumnEditable(0, false);
+ pg->MakeColumnEditable(2, false);
+ pg->SelectProperty(wxT("Height"));
+ pg->BeginLabelEdit(0);
+ pg->BeginLabelEdit(0);
+ pg->EndLabelEdit(0);
+ pg->EndLabelEdit(0);
+
+ // Recreate grid
+ CreateGrid( -1, -1 );
+ pgman = m_pPropGridManager;
+ }
+
{
RT_START_TEST(Attributes)
pgman->EnsureVisible(wxT("Cell Colour"));
}
+ {
+ RT_START_TEST(RemoveProperty)
+
+ wxPGProperty* p;
+
+ wxPGProperty* origParent =
+ pgman->GetProperty(wxT("Window Styles"))->GetParent();
+
+ p = pgman->RemoveProperty(wxT("Window Styles"));
+ pgman->Refresh();
+ pgman->Update();
+
+ pgman->AppendIn(origParent, p);
+ pgman->Refresh();
+ pgman->Update();
+ }
+
+ {
+ RT_START_TEST(SortFunction)
+
+ wxPGProperty* p;
+
+ // Make sure indexes are as supposed
+
+ p = pgman->GetProperty(wxT("User Name"));
+ if ( p->GetIndexInParent() != 3 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("User Id"));
+ if ( p->GetIndexInParent() != 2 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("User Home"));
+ if ( p->GetIndexInParent() != 1 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("Operating System"));
+ if ( p->GetIndexInParent() != 0 )
+ RT_FAILURE();
+
+ pgman->GetGrid()->SetSortFunction(MyPropertySortFunction);
+
+ pgman->GetGrid()->SortChildren(wxT("Environment"));
+
+ // Make sure indexes have been reversed
+ p = pgman->GetProperty(wxT("User Name"));
+ if ( p->GetIndexInParent() != 0 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("User Id"));
+ if ( p->GetIndexInParent() != 1 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("User Home"));
+ if ( p->GetIndexInParent() != 2 )
+ RT_FAILURE();
+
+ p = pgman->GetProperty(wxT("Operating System"));
+ if ( p->GetIndexInParent() != 3 )
+ RT_FAILURE();
+ }
+
{
RT_START_TEST(SetPropertyBackgroundColour)
wxCommandEvent evt;
}
{
- RT_START_TEST(ManagerClear)
+ RT_START_TEST(Clear)
+
+ // Manager clear
+ pgman->SelectProperty("Label");
pgman->Clear();
if ( pgman->GetPageCount() )
RT_FAILURE();
+ if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
+ RT_FAILURE();
+
+ // Recreate the original grid
+ CreateGrid( -1, -1 );
+ pgman = m_pPropGridManager;
+
+ // Grid clear
+ pgman->SelectProperty("Label");
+ pgman->GetGrid()->Clear();
+
+ if ( pgman->GetGrid()->GetRoot()->GetChildCount() )
+ RT_FAILURE();
+
// Recreate the original grid
CreateGrid( -1, -1 );
pgman = m_pPropGridManager;
}
- /*
- {
+ /*{
// TODO: This test fails.
RT_START_TEST(SetSplitterPosition)
// Recreate the original grid
CreateGrid( -1, -1 );
pgman = m_pPropGridManager;
- }
- */
+ }*/
{
RT_START_TEST(HideProperty)
srand(0x1234);
wxArrayPGProperty arr1;
-
+
arr1 = GetPropertiesInRandomOrder(page);
if ( !_failed_ )
wxASSERT(wxPG_EX_INIT_NOCAT == 0x00001000);
- for ( i=12; i<24; i++ )
+ for ( i=12; i<27; i++ )
{
int flag = 1<<i;
RT_MSG(wxString::Format(wxT("ExStyle: 0x%X"),flag));
projects / wxWidgets.git / blobdiff