1 files changed, 13 insertions, 15 deletions
diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc
index b5c1f12a101d..3fe642ea8ec6 100644
--- a/testautomation/framework/optional/includes/basic_delete_modules.inc
+++ b/testautomation/framework/optional/includes/basic_delete_modules.inc
@@ -37,20 +37,20 @@ testcase tDeleteModulesAtRunningBasic
 
     dim brc as boolean
     const MAX_WAIT = 3000
-    
+    dim iMenuItemCount as integer
 
     printlog( "Open a new writer-doc" )
     gApplication = "WRITER"
-
     Call hNewDocument()
 
-    printlog( "Create a new module " )
+    printlog( "Open the BASIC Organizer" )
     brc = hOpenBasicOrganizerFromDoc()
     if ( not brc ) then
         warnlog( "Unable to open BASIC organizer for the document" )
         goto endsub
     endif
-    
+
+    printlog( "Create a new module for the current document" )
     brc = hCreateModuleForDoc()
     if ( not brc ) then
         warnlog( "Unable to create a basic module for the document" )
@@ -76,15 +76,14 @@ testcase tDeleteModulesAtRunningBasic
     Tabbar.OpenContextMenu()
 
     try
-        if ( hMenuItemGetCount() = 5 ) then
-            warnlog( "#i101972# - Disabled entries are shown in context menu on tab bar" )
-        end if
-
-
-        if ( hMenuItemGetCount() = 3 ) then
-            warnlog( "Delete is active in context menu for a running macro => BUG!" )
-        end if
-
+        iMenuItemCount = hMenuItemGetCount()
+
+        select case ( iMenuItemCount )
+        case 2  : printlog( "Correct number of items in menu: " & iMenuItemCount )
+        case 3  : warnlog ( "Delete is active in context menu for a running macro => BUG!" )
+        case 5  : warnlog ( "#i101972# - Disabled entries are shown in context menu on tab bar" )
+        default : warnlog ( "Incorrect itemcount in context menu: " & iMenuItemCount )
+        end select
     catch
         warnlog( "Unable to retrieve the number of menuitems" )
     endcatch
@@ -98,8 +97,7 @@ testcase tDeleteModulesAtRunningBasic
         warnlog( "Slot not finished, timeout reached" )
     endif
 
-    Call hCloseDocument()
-    Call hCloseDocument()
+    Call hFileCloseAll()
 
 endcase