fwk143: #i104704 - Changed testcases to context to the newly declared Hyperlink-Dialog, submitted issue for crosslinked id_002.inc and id_004.inc plus others which id did fix but not verify (because they are not called)

2 files changed, 44 insertions, 31 deletions

diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc
index 55dec0008ac1..cd6a6ffe58aa 100644..100755
--- a/testautomation/graphics/required/includes/global/id_002.inc
+++ b/testautomation/graphics/required/includes/global/id_002.inc
@@ -533,40 +533,49 @@ testcase tiEditHyperlink
     hNewDocument
     printlog " Insert->Hyperlink"
     InsertHyperlink
-    WaitSlot (5000)
-    Kontext "Hyperlink"
+
+    kontext "HyperlinkDialog"
+    if ( HyperlinkDialog.exists( 2 ) ) then
+
+        Kontext "Hyperlink"
         Auswahl.MouseDown 50, 5
         Auswahl.MouseUp 50, 5
         Auswahl.typekeys "<PAGEDOWN><PAGEUP>"
         Auswahl.typekeys "<TAB>"
-        sleep 3
+        sleep 1
+
         Kontext "TabHyperlinkInternet"
+        printlog "Workaround to get rid of a Focusing-problem..."
+        NameText.Typekeys "alal <RETURN>"
+        NameText.Typekeys "<MOD1 A><DELETE>"
+        TabHyperlinkInternet.Typekeys "<TAB>", 6
+        TabHyperlinkInternet.Typekeys "<LEFT>", 3
+        printlog "End of workaround"
+
+        Internet.Check  
+        ZielUrl.SetText( "http://www.liegerad-fahrer.de" )
+
+        Uebernehmen.Click()
 
-            printlog "Workaround to get rid of a Focusing-problem..."
-            NameText.Typekeys "alal <RETURN>"
-            NameText.Typekeys "<MOD1 A><DELETE>"
-            TabHyperlinkInternet.Typekeys "<TAB>", 6
-            TabHyperlinkInternet.Typekeys "<LEFT>", 3
-            printlog "End of workaround"
-
-            Internet.Check           'Just to make sure the radio-button is addressable.
-            ZielUrl.Settext "http://www.liegerad-fahrer.de"
-    Kontext "Hyperlink"
-        Uebernehmen.Click
-        Hyperlink.Close
+        kontext "HyperlinkDialog"
+        HyperlinkDialog.Close()
+    else
+        warnlog( "Failed to open <HyperlinkDialog>" )
+    endif
         printlog " presupposition to enable edit->hyperlink: <TAB><F2><STRG+a>"
         hTypeKeys "<TAB><F2>"
     EditSelectAll
     try
         printlog " Edit->Hyperlink "
         EditHyperlinkDraw
-        Kontext "Hyperlink"
-            if Hyperlink.Exists then
-                printlog " close dialog 'Hyperlink'"
-                Hyperlink.Close
-            else
-                Warnlog "- Hyperlinkdialog not up"
-            end if
+
+        Kontext "HyperlinkDialog"
+        if ( HyperlinkDialog.Exists( 2 ) ) then
+            printlog " close dialog 'Hyperlink'"
+            HyperlinkDialog.Close()
+        else
+            Warnlog "- Hyperlinkdialog not up"
+        end if
     catch
         Warnlog "- Not able to edit Hyperlink!"
     endcatch
diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc
index 2fb21db18373..e93ab5bad606 100644..100755
--- a/testautomation/graphics/required/includes/global/id_004.inc
+++ b/testautomation/graphics/required/includes/global/id_004.inc
@@ -177,15 +177,16 @@ testcase tiInsertHyperlink
     Call hNewDocument
     printlog "Insert->Hyperlink "
     InsertHyperlink
-    WaitSlot (5000)
-    Kontext "Hyperlink"
-    if Hyperlink.exists (5) then
+
+    kontext "HyperlinkDialog"
+    if ( HyperlinkDialog.exists( 2 ) ) then
+
+        Kontext "TabHyperlinkInternet"
+        
         Auswahl.MouseDown 50, 5
         Auswahl.MouseUp 50, 5
         Auswahl.typekeys "<PAGEDOWN><PAGEUP>"
         Auswahl.typekeys "<TAB>"
-        sleep 3
-        Kontext "TabHyperlinkInternet"
 
         printlog "Workaround to get rid of a Focusing-problem..."
         NameText.Typekeys "alal <RETURN>"
@@ -195,10 +196,13 @@ testcase tiInsertHyperlink
         printlog "End of workaround..."
 
         Internet.Check
-        ZielUrl.Settext "http://mahler"
-        Kontext "Hyperlink"
-        Uebernehmen.Click
-        Hyperlink.Close
+        ZielUrl.Settext "http://www.nowhere.com"
+
+        Uebernehmen.Click()
+
+        kontext "HyperlinkDialog"
+        HyperlinkDialog.Close()
+        
     else
         warnlog "Failed to open hyperlink ??!!"
     end if