]> git.saurik.com Git - wxWidgets.git/blobdiff - tests/controls/webtest.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Ensure wxWebViewIE::SetPage clears the existing content before writing the new output...
[wxWidgets.git] / tests / controls / webtest.cpp
diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index 5e5dfbd5a26112b8972612b3deabb35820d34d3f..41e7adfdfe711ec72c079100ef1e363a3fafad6b 100644 (file)
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -9,7 +9,7 @@
 
 #include "testprec.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -42,6 +42,9 @@ private:
         CPPUNIT_TEST( HistoryList );
         CPPUNIT_TEST( Editable );
         CPPUNIT_TEST( Selection );
+        CPPUNIT_TEST( Zoom );
+        CPPUNIT_TEST( RunScript );
+        CPPUNIT_TEST( SetPage );
     CPPUNIT_TEST_SUITE_END();
 
     void Title();
@@ -52,7 +55,10 @@ private:
     void HistoryList();
     void Editable();
     void Selection();
-    void LoadUrl(const wxString& url, int times = 1);
+    void Zoom();
+    void RunScript();
+    void SetPage();
+    void LoadUrl(int times = 1);
 
     wxWebView* m_browser;
 
@@ -77,11 +83,16 @@ void WebTestCase::tearDown()
     wxDELETE(m_browser);
 }
 
-void WebTestCase::LoadUrl(const wxString& url, int times)
+void WebTestCase::LoadUrl(int times)
 {
+    //We alternate between urls as otherwise webkit merges them in the history
+    //we use about and about blank to avoid the need for a network connection
     for(int i = 0; i < times; i++)
     {
-        m_browser->LoadUrl(url);
+        if(i % 2 == 1)
+            m_browser->LoadURL("about:blank");
+        else
+            m_browser->LoadURL("about:");
         wxYield();
     }
 }
@@ -91,11 +102,12 @@ void WebTestCase::Title()
     CPPUNIT_ASSERT_EQUAL("", m_browser->GetCurrentTitle());
 
     //Test title after loading raw html
-    m_browser->SetPage("<html><title>Title</title></html>", "");
+    m_browser->SetPage("<html><title>Title</title><body>Text</body></html>", "");
+    wxYield();
     CPPUNIT_ASSERT_EQUAL("Title", m_browser->GetCurrentTitle());
 
     //Test title after loading a url, we yield to let events process
-    LoadUrl("about:blank");
+    LoadUrl();
     CPPUNIT_ASSERT_EQUAL("", m_browser->GetCurrentTitle());
 }
 
@@ -103,14 +115,14 @@ void WebTestCase::Url()
 {
     CPPUNIT_ASSERT_EQUAL("about:blank", m_browser->GetCurrentURL());
 
-    LoadUrl("about:blank");
-    CPPUNIT_ASSERT_EQUAL("about:blank", m_browser->GetCurrentURL());
+    //After first loading about:blank the next in the sequence is about:
+    LoadUrl();
+    CPPUNIT_ASSERT_EQUAL("about:", m_browser->GetCurrentURL());
 }
 
 void WebTestCase::History()
 {
-    //We use about:blank to remove the need for a network connection
-    LoadUrl("about:blank", 3);
+    LoadUrl(3);
 
     CPPUNIT_ASSERT(m_browser->CanGoBack());
     CPPUNIT_ASSERT(!m_browser->CanGoForward());
@@ -130,13 +142,13 @@ void WebTestCase::History()
 
 void WebTestCase::HistoryEnable()
 {
-    LoadUrl("about:blank");
+    LoadUrl();
     m_browser->EnableHistory(false);
 
     CPPUNIT_ASSERT(!m_browser->CanGoForward());
     CPPUNIT_ASSERT(!m_browser->CanGoBack());
 
-    LoadUrl("about:blank");
+    LoadUrl();
 
     CPPUNIT_ASSERT(!m_browser->CanGoForward());
     CPPUNIT_ASSERT(!m_browser->CanGoBack());
@@ -144,10 +156,11 @@ void WebTestCase::HistoryEnable()
 
 void WebTestCase::HistoryClear()
 {
-    LoadUrl("about:blank", 2);
+    LoadUrl(2);
 
     //Now we are in the 'middle' of the history
     m_browser->GoBack();
+    wxYield();
 
     CPPUNIT_ASSERT(m_browser->CanGoForward());
     CPPUNIT_ASSERT(m_browser->CanGoBack());
@@ -160,7 +173,7 @@ void WebTestCase::HistoryClear()
 
 void WebTestCase::HistoryList()
 {
-    LoadUrl("about:blank", 2);
+    LoadUrl(2);
     m_browser->GoBack();
 
     CPPUNIT_ASSERT_EQUAL(1, m_browser->GetBackwardHistory().size());
@@ -188,6 +201,7 @@ void WebTestCase::Editable()
 void WebTestCase::Selection()
 {
     m_browser->SetPage("<html><body>Some <strong>strong</strong> text</body></html>", "");
+    wxYield();
     CPPUNIT_ASSERT(!m_browser->HasSelection());
 
     m_browser->SelectAll();
@@ -198,9 +212,47 @@ void WebTestCase::Selection()
     CPPUNIT_ASSERT_EQUAL("some <strong>strong</strong> text", 
                          m_browser->GetSelectedSource().Lower());
 
-    m_browser->DeleteSelection();
+    m_browser->ClearSelection();
+    CPPUNIT_ASSERT(!m_browser->HasSelection());  
+}
 
-    CPPUNIT_ASSERT(!m_browser->HasSelection());
+void WebTestCase::Zoom()
+{
+    if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT))
+    {
+        m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_LAYOUT);
+        CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_LAYOUT, m_browser->GetZoomType());
+
+        m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
+        CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
+    }
+
+    //Reset the zoom level
+    m_browser->SetZoom(wxWEB_VIEW_ZOOM_MEDIUM);
+
+    if(m_browser->CanSetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT))
+    {
+        m_browser->SetZoomType(wxWEB_VIEW_ZOOM_TYPE_TEXT);
+        CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TYPE_TEXT, m_browser->GetZoomType());
+
+        m_browser->SetZoom(wxWEB_VIEW_ZOOM_TINY);
+        CPPUNIT_ASSERT_EQUAL(wxWEB_VIEW_ZOOM_TINY, m_browser->GetZoom());
+    }
+}
+
+void WebTestCase::RunScript()
+{
+    m_browser->RunScript("document.write(\"Hello World!\");");
+    CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText());
+}
+
+void WebTestCase::SetPage()
+{
+    m_browser->SetPage("<html><body>text</body></html>", "");
+    CPPUNIT_ASSERT_EQUAL("text", m_browser->GetPageText());
+
+    m_browser->SetPage("<html><body>other text</body></html>", "");
+    CPPUNIT_ASSERT_EQUAL("other text", m_browser->GetPageText());
 }
 
-#endif //wxUSE_WEB
+#endif //wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
wxWidgets (Impactor)