#i113581# at least the syntax check does not complain anymore

4 files changed, 146 insertions, 160 deletions

diff --git a/testautomation/graphics/optional/includes/global/g_clipexport.inc b/testautomation/graphics/optional/includes/global/g_clipexport.inc
index 91357e867937..1e0323266ed3 100644
--- a/testautomation/graphics/optional/includes/global/g_clipexport.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport.inc
@@ -165,87 +165,138 @@ global Text5 as string
 global Text6 as string
 global Text7 as string
 
+'--------------------------- Tests for Writer ----------------------------------
+sub writertest
+
+    try
+        call Make_And_Check_Formatted_Text_Line_From_Application
+    catch
+        warnlog "Something went wrong with testing writertest"
+    endcatch
+
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch
+        warnlog "something wrong with testing writertest"
+    endcatch
+end sub ' big one
+
+'---------------------------- Tests for Calc -----------------------------------
+sub calctest
+
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch
+        warnlog "something wrong with calctest"
+    endcatch
+    printlog "currently no specific tests from Calc"
+end sub
+
+'-------------------------------------------------------------------------------
+sub tClipboardFromDrawTest
+
+    EnableQAErrors = false
+    FromApp2 = gApplication
+    printlog "gApplication = " + gApplication
+
+    select case( gApplication )
+    case "WRITER" : call writertest()
+    case "CALC"   : call calctest()
+    case else     : warnlog( "Unsupported gApplication provided: " & gApplication )
+    end select
+
+end sub
+
 '------------------------------- "object"-dependant tests ----------------------
 
-try
-    call Make_Rectangle_From_Application
-    call Full_test_Draw
-    call Full_test_Impress
-    call Full_test_Writer
-    call Full_test_Calc
-catch
-    warnlog "something wrong with testing Rectangle"
-endcatch
-
-try
-    call Make_Make3dObject_From_Application
-    call Full_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing 3dObject"
-endcatch
-
-'qaerrorlog "Make_CurveObject_From_Application needs an overview - FHA"
-try
-    call Make_CurveObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing CurveObj"
-endcatch
-
-try
-    call Make_ConnectorObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing ConnectorObject"
-endcatch
-
-try
-    call Make_LineObject_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    '   call Small_test_Calc
-    '   call Small_test_Writer
-catch
-    warnlog "something wrong with testing LineObject"
-endcatch
-
-try
-catch
-    warnlog "something wrong with testing ConnectorObject"
-endcatch
-
-try
-    call Make_Circle_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-catch
-    warnlog "something wrong with testing Circle"
-endcatch
-
-try
-    call Make_TextSquare_From_Application
-    call Small_test_Draw
-    call Small_test_Impress
-    call Small_test_Calc
-    call Small_test_Writer
-
-catch
-    warnlog "something wrong with testing TextSquare"
-endcatch
-
-call clear_all_and_close
-Printlog "tClipboardFromDrawTest finished"
+sub g_clipexport
+    try
+        call Make_Rectangle_From_Application
+        call Full_test_Draw
+        call Full_test_Impress
+        call Full_test_Writer
+        call Full_test_Calc
+    catch
+        warnlog "something wrong with testing Rectangle"
+    endcatch
+
+    try
+        call Make_Make3dObject_From_Application
+        call Full_test_Draw
+        call Small_test_Impress
+        call Small_test_Calc
+        call Small_test_Writer
+    catch
+        warnlog "something wrong with testing 3dObject"
+    endcatch
+
+    'qaerrorlog "Make_CurveObject_From_Application needs an overview - FHA"
+    try
+        call Make_CurveObject_From_Application
+        call Small_test_Draw
+        call Small_test_Impress
+        call Small_test_Calc
+        call Small_test_Writer
+    catch
+        warnlog "something wrong with testing CurveObj"
+    endcatch
+
+    try
+        call Make_ConnectorObject_From_Application
+        call Small_test_Draw
+        call Small_test_Impress
+        call Small_test_Calc
+        call Small_test_Writer
+    catch
+        warnlog "something wrong with testing ConnectorObject"
+    endcatch
+
+    try
+        call Make_LineObject_From_Application
+        call Small_test_Draw
+        call Small_test_Impress
+        '   call Small_test_Calc
+        '   call Small_test_Writer
+    catch
+        warnlog "something wrong with testing LineObject"
+    endcatch
+
+    try
+    catch
+        warnlog "something wrong with testing ConnectorObject"
+    endcatch
+
+    try
+        call Make_Circle_From_Application
+        call Small_test_Draw
+        call Small_test_Impress
+        call Small_test_Calc
+        call Small_test_Writer
+    catch
+        warnlog "something wrong with testing Circle"
+    endcatch
+
+    try
+        call Make_TextSquare_From_Application
+        call Small_test_Draw
+        call Small_test_Impress
+        call Small_test_Calc
+        call Small_test_Writer
+
+    catch
+        warnlog "something wrong with testing TextSquare"
+    endcatch
+
+    call clear_all_and_close
+    Printlog "tClipboardFromDrawTest finished"
 end sub
 
 
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc
index c8dfe7f52d91..7e0f4fdf1aaa 100644
--- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc
@@ -61,7 +61,7 @@ sub MakeRectangle
 end sub
 
 '-------------------------------------------------------------------------------
-sub MakeCircle
+testcase MakeCircle
 
     printlog "Create Circle"
     if gApplication = "WRITER" then
@@ -81,10 +81,10 @@ sub MakeCircle
     gMouseUp (30,30)
     sleep 1
 
-end sub
+endcase
 
 '-------------------------------------------------------------------------------
-sub Make3dObject
+testcase Make3dObject
 
     printlog "Create 3dObject"
     if (Ucase(gApplication) = "CALC") then
@@ -158,10 +158,10 @@ sub Make3dObject
         endif
     end if
 
-end sub
+endcase
 
 '-------------------------------------------------------------------------------
-sub MakeCurveObject
+testcase MakeCurveObject
 
     if (Ucase(gApplication) = "WRITER") then
         warnlog "Cant make circle in this application"
@@ -195,10 +195,10 @@ sub MakeCurveObject
     hMenuItemUnCheck (7)
     sleep 1
 
-end sub
+endcase
 
 '-------------------------------------------------------------------------------
-sub MakeLineObject
+testcase MakeLineObject
 
     if gApplication = "WRITER" then
         warnlog "Currently no support for line-object in this application"
@@ -224,10 +224,10 @@ sub MakeLineObject
     Kontext "Arrowshapes"
     Arrowshapes.Close
 
-end sub
+endcase
 
 '-------------------------------------------------------------------------------
-sub MakeConnectorObject
+testcase MakeConnectorObject
 
     if gApplication = "WRITER" then
         warnlog "Cant make connector in this application"
@@ -268,7 +268,7 @@ sub MakeConnectorObject
         gMouseUp (30,37)
     end if
 
-end sub
+endcase
 
 '-------------------------------------------------------------------------------
 sub MakeFormattedTextLine
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
index c51d92eb3fed..2d58d13f9848 100644
--- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
@@ -412,7 +412,7 @@ sub Check_Text_Formatting
                                 SetKontextApplication
                                 printlog "   Check_Text_Formatting Ends"
 
-
+end suB
                                 '----------------------------------------------------------------------------------------------------
 sub Check_Colors_Borders_Attributes
 
@@ -558,26 +558,10 @@ sub Check_Colors_Borders_Attributes
                                                                                                 ColorModel = Farbmodell.GetSelText
                                                                                                 printlog "   " + ColorModel
 
-                                                                                                select case iSprache      ' Prepared for future language-problematics.
-                                                                                                    if ColorR <> R.GetText then Warnlog "Wrong R-Color. Should be: " + ColorR + " but was: " + R.GetText
-                                                                                                        if ColorG <> G.GetText then Warnlog "Wrong V-Color. Should be: " + ColorG + " but was: " + G.GetText
-                                                                                                            if ColorB <> B.GetText then Warnlog "Wrong B-Color. Should be: " + ColorB + " but was: " + B.GetText
-                                                                                                            Else
                                                                                                                 if ColorC <> C.GetText then Warnlog "Wrong C-Color. Should be: " + ColorC + " but was: " + C.GetText
                                                                                                                     if ColorM <> M.GetText then Warnlog "Wrong M-Color. Should be: " + ColorM + " but was: " + M.GetText
                                                                                                                         if ColorY <> Y.GetText then Warnlog "Wrong J-Color. Should be: " + ColorY + " but was: " + Y.GetText
                                                                                                                             if ColorK <> K.GetText then Warnlog "Wrong N-Color. Should be: " + ColorK + " but was: " + K.GetText
-                                                                                                                            End if
-                                                                                                                            if ColorR <> R.GetText then Warnlog "Wrong R-Color. Should be: " + ColorR + " but was: " + R.GetText
-                                                                                                                                if ColorG <> G.GetText then Warnlog "Wrong G-Color. Should be: " + ColorG + " but was: " + G.GetText
-                                                                                                                                    if ColorB <> B.GetText then Warnlog "Wrong B-Color. Should be: " + ColorB + " but was: " + B.GetText
-                                                                                                                                    Else
-                                                                                                                                        if ColorC <> C.GetText then Warnlog "Wrong C-Color. Should be: " + ColorC + " but was: " + C.GetText
-                                                                                                                                            if ColorM <> M.GetText then Warnlog "Wrong M-Color. Should be: " + ColorM + " but was: " + M.GetText
-                                                                                                                                                if ColorY <> Y.GetText then Warnlog "Wrong Y-Color. Should be: " + ColorY + " but was: " + Y.GetText
-                                                                                                                                                    if ColorK <> K.GetText then Warnlog "Wrong K-Color. Should be: " + ColorK + " but was: " + K.GetText
-                                                                                                                                                    End if
-                                                                                                                                                end select
 
                                                                                                                                                 Kontext
                                                                                                                                                 Active.setpage TabFarbverlaeufe
@@ -624,7 +608,8 @@ sub Check_Colors_Borders_Attributes
                                                                                                                                                 Printlog "End of one application"
 
 
-                                                                                                                                                '---------------------------------- Set the Kontext to the current Application ----------------------------------'
+end sub
+   '---------------------------------- Set the Kontext to the current Application ----------------------------------'
 sub SetKontextApplication
 
     sleep 1
@@ -698,7 +683,7 @@ sub New_Writer
 end sub
 
 '-------------------------------------------------------------------------------
-sub Choose_Toapplication
+testcase Choose_Toapplication
 
     For ToAppCounter = 1 to 4
 
@@ -724,6 +709,6 @@ sub Choose_Toapplication
     Call hNewDocument
     SetKontextApplication
 
-end sub
+endcase
 
 '--------------------------------------------------------------------------------------------------------
diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc
index a203bdf18ff9..427cc1a8c13b 100644
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -181,56 +181,6 @@ sub sPrintCheckOrder (optional bcheck as boolean)
     Printlog "-----------------------------------"
 end sub
 
-'--------------------------- Tests for Writer ----------------------------------
-sub writertest
-
-    try
-        call Make_And_Check_Formatted_Text_Line_From_Application
-    catch
-        warnlog "Something went wrong with testing writertest"
-    endcatch
-
-    try
-        call Make_Rectangle_From_Application
-        call Full_test_Draw
-        call Full_test_Impress
-        call Full_test_Writer
-        call Full_test_Calc
-    catch
-        warnlog "something wrong with testing writertest"
-    endcatch
-end sub ' big one
-
-'---------------------------- Tests for Calc -----------------------------------
-sub calctest
-
-    try
-        call Make_Rectangle_From_Application
-        call Full_test_Draw
-        call Full_test_Impress
-        call Full_test_Writer
-        call Full_test_Calc
-    catch
-        warnlog "something wrong with calctest"
-    endcatch
-    printlog "currently no specific tests from Calc"
-end sub
-
-'-------------------------------------------------------------------------------
-sub tClipboardFromDrawTest
-
-    EnableQAErrors = false
-    FromApp2 = gApplication
-    printlog "gApplication = " + gApplication
-
-    select case( gApplication )
-    case "WRITER" : call writertest()
-    case "CALC"   : call calctest()
-    case else     : warnlog( "Unsupported gApplication provided: " & gApplication )
-    end select
-    
-end sub
-
 '-------------------------------------------------------------------------------
 sub Select_Copy
 
@@ -786,4 +736,4 @@ sub sSelectEmptyLayout
     else
         printlog "No change of Layout needed."
     endif
-end sub
\ No newline at end of file
+end sub