[Wgui-cvs] wgui/includes/unit_tests wg_button_unittests.h,1.3,1.4 wg_checkbox_unittests.h,1.2,1.3 wg
Status: Beta
Brought to you by:
greenwire
|
From: Rob W. <gre...@us...> - 2004-06-25 19:38:00
|
Update of /cvsroot/wgui/wgui/includes/unit_tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8505/includes/unit_tests Modified Files: wg_button_unittests.h wg_checkbox_unittests.h wg_window_unittests.h Log Message: Draw architecture changes. Index: wg_window_unittests.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/wg_window_unittests.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wg_window_unittests.h 15 Apr 2004 16:45:00 -0000 1.8 --- wg_window_unittests.h 25 Jun 2004 19:37:50 -0000 1.9 *************** *** 89,94 **** pWindow1->SetVisible(false); ensure("CWindow SetVisible", !pWindow1->IsVisible()); ! ensure("CWindow ClientToScreen", pWindow1->ClientToScreen(wGui::CPoint(3, 4)) == wGui::CPoint(5, 9)); ! ensure("CWindow ClientToScreen", pWindow1->ClientToScreen(wGui::CRect(1, 1, 4, 4)) == wGui::CRect(3, 6, 6, 9)); ensure("CWindow GetWindowText", pWindow1->GetWindowText().empty()); pWindow1->SetWindowText("Foo"); --- 89,94 ---- pWindow1->SetVisible(false); ensure("CWindow SetVisible", !pWindow1->IsVisible()); ! ensure("CWindow ClientToView", pWindow1->ClientToView(wGui::CPoint(3, 4)) == wGui::CPoint(5, 9)); ! ensure("CWindow ClientToView", pWindow1->ClientToView(wGui::CRect(1, 1, 4, 4)) == wGui::CRect(3, 6, 6, 9)); ensure("CWindow GetWindowText", pWindow1->GetWindowText().empty()); pWindow1->SetWindowText("Foo"); Index: wg_checkbox_unittests.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/wg_checkbox_unittests.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wg_checkbox_unittests.h 2 Apr 2004 17:26:15 -0000 1.2 --- wg_checkbox_unittests.h 25 Jun 2004 19:37:50 -0000 1.3 *************** *** 61,69 **** ensure("CCheckBox - OnMouseButtonDown (outside bounds)", !pCheckBox1->OnMouseButtonDown(wGui::CPoint(0, 0), wGui::CMouseMessage::LEFT)); ensure("CCheckBox - OnMouseButtonDown (in bounds)", pCheckBox1->OnMouseButtonDown( ! View.ClientToScreen(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); ensure_equals("CCheckBox - OnMouseButtonDown (CheckBox State)", pCheckBox1->GetCheckBoxState(), wGui::CCheckBox::UNCHECKED); ensure(! Client1.bNewMessage); ensure("CCheckBox - OnMouseButtonUp (in bounds)", pCheckBox1->OnMouseButtonUp( ! View.ClientToScreen(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); while (Server.MessageAvailable()) { --- 61,69 ---- ensure("CCheckBox - OnMouseButtonDown (outside bounds)", !pCheckBox1->OnMouseButtonDown(wGui::CPoint(0, 0), wGui::CMouseMessage::LEFT)); ensure("CCheckBox - OnMouseButtonDown (in bounds)", pCheckBox1->OnMouseButtonDown( ! View.ClientToView(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); ensure_equals("CCheckBox - OnMouseButtonDown (CheckBox State)", pCheckBox1->GetCheckBoxState(), wGui::CCheckBox::UNCHECKED); ensure(! Client1.bNewMessage); ensure("CCheckBox - OnMouseButtonUp (in bounds)", pCheckBox1->OnMouseButtonUp( ! View.ClientToView(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); while (Server.MessageAvailable()) { *************** *** 73,79 **** ensure("CCheckBox - OnMouseButtonUp (message)", Client1.bNewMessage && (Client1.eLastMessage == wGui::CMessage::CTRL_LCLICK)); ensure("CCheckBox - OnMouseButtonDown (middle CheckBox)", pCheckBox1->OnMouseButtonDown( ! View.ClientToScreen(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); ensure("CCheckBox - OnMouseButtonUp (middle CheckBox)", pCheckBox1->OnMouseButtonUp( ! View.ClientToScreen(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); while (Server.MessageAvailable()) { --- 73,79 ---- ensure("CCheckBox - OnMouseButtonUp (message)", Client1.bNewMessage && (Client1.eLastMessage == wGui::CMessage::CTRL_LCLICK)); ensure("CCheckBox - OnMouseButtonDown (middle CheckBox)", pCheckBox1->OnMouseButtonDown( ! View.ClientToView(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); ensure("CCheckBox - OnMouseButtonUp (middle CheckBox)", pCheckBox1->OnMouseButtonUp( ! View.ClientToView(pCheckBox1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); while (Server.MessageAvailable()) { Index: wg_button_unittests.h =================================================================== RCS file: /cvsroot/wgui/wgui/includes/unit_tests/wg_button_unittests.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wg_button_unittests.h 2 Apr 2004 17:26:15 -0000 1.3 --- wg_button_unittests.h 25 Jun 2004 19:37:50 -0000 1.4 *************** *** 69,77 **** ensure("CButton - OnMouseButtonDown (outside bounds)", !pButton1->OnMouseButtonDown(wGui::CPoint(0, 0), wGui::CMouseMessage::LEFT)); ensure("CButton - OnMouseButtonDown (in bounds)", pButton1->OnMouseButtonDown( ! View.ClientToScreen(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); ensure_equals("CButton - OnMouseButtonDown (Button State)", pButton1->GetButtonState(), wGui::CButton::DOWN); ensure(! Client1.bNewMessage); ensure("CButton - OnMouseButtonUp (in bounds)", pButton1->OnMouseButtonUp( ! View.ClientToScreen(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); while (Server.MessageAvailable()) { --- 69,77 ---- ensure("CButton - OnMouseButtonDown (outside bounds)", !pButton1->OnMouseButtonDown(wGui::CPoint(0, 0), wGui::CMouseMessage::LEFT)); ensure("CButton - OnMouseButtonDown (in bounds)", pButton1->OnMouseButtonDown( ! View.ClientToView(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); ensure_equals("CButton - OnMouseButtonDown (Button State)", pButton1->GetButtonState(), wGui::CButton::DOWN); ensure(! Client1.bNewMessage); ensure("CButton - OnMouseButtonUp (in bounds)", pButton1->OnMouseButtonUp( ! View.ClientToView(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::LEFT)); while (Server.MessageAvailable()) { *************** *** 81,87 **** ensure("CButton - OnMouseButtonUp (message)", Client1.bNewMessage && (Client1.eLastMessage == wGui::CMessage::CTRL_LCLICK)); ensure("CButton - OnMouseButtonDown (middle button)", pButton1->OnMouseButtonDown( ! View.ClientToScreen(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); ensure("CButton - OnMouseButtonUp (middle button)", pButton1->OnMouseButtonUp( ! View.ClientToScreen(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); while (Server.MessageAvailable()) { --- 81,87 ---- ensure("CButton - OnMouseButtonUp (message)", Client1.bNewMessage && (Client1.eLastMessage == wGui::CMessage::CTRL_LCLICK)); ensure("CButton - OnMouseButtonDown (middle button)", pButton1->OnMouseButtonDown( ! View.ClientToView(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); ensure("CButton - OnMouseButtonUp (middle button)", pButton1->OnMouseButtonUp( ! View.ClientToView(pButton1->GetWindowRect().TopLeft()) + wGui::CPoint(1, 1), wGui::CMouseMessage::MIDDLE)); while (Server.MessageAvailable()) { |