native0: #161747 - Fixed scriptcount(s) in f_basic_vba-compat_import_nothing-/-disabled-/-enabled.bas

3 files changed, 19 insertions, 11 deletions

diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
index fea6742d5917..f5576308a6a9 100644..100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
@@ -59,7 +59,8 @@ testcase tBasicVBACompatImportDisabled()
     dim bFound as boolean  
     
     ' Depending on the mode of macro import we have differtent basic libraries listed
-    const NODE_COUNT = 78 
+    const NODE_COUNT_OOO = 78 ' OpenOffice.org
+    const NODE_COUNT     = 80 ' branded product
  
     const DOCUMENT_POSITION_OFFSET = -7
     
@@ -83,8 +84,10 @@ testcase tBasicVBACompatImportDisabled()
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode" )
-    if ( cNodeCount <> NODE_COUNT ) then
-        warnlog( "The number of nodes is incorrect: " & cNodeCount )
+    if ( gOOo ) then	
+        if ( cNodeCount <> NODE_COUNT_OOO ) then  warnlog( "The number of nodes is incorrect: " & cNodeCount )
+    else
+        if ( cNodeCount <> NODE_COUNT ) then  warnlog( "The number of nodes is incorrect: " & cNodeCount )
     endif
     
     printlog( "Verify position of the document node" )
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
index f5e9c0c4f515..3e6450e4c2e7 100644..100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
@@ -63,7 +63,8 @@ testcase tBasicVBACompatImportEnabled()
     dim bFound as boolean  
     
     ' Depending on the mode of macro import we have differtent basic libraries listed
-    const NODE_COUNT = 74
+    const NODE_COUNT_OOO = 74
+    const NODE_COUNT     = 76
  
     const DOCUMENT_POSITION_OFFSET = -3
     
@@ -87,9 +88,10 @@ testcase tBasicVBACompatImportEnabled()
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode." )
-    if ( cNodeCount <> NODE_COUNT ) then
-        warnlog( "The number of nodes is incorrect: " & cNodeCount )
-        printlog( "Expected were...................: " & NODE_COUNT )
+    if ( gOOo ) then
+        if ( cNodeCount <> NODE_COUNT_OOO ) then warnlog( "The number of nodes is incorrect: " & cNodeCount )
+    else
+        if ( cNodeCount <> NODE_COUNT ) then warnlog( "The number of nodes is incorrect: " & cNodeCount )
     endif
     
     printlog( "Verify position of the document node." )
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
index f61064e28e0d..bab6bf1a4b1b 100644..100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
@@ -45,8 +45,9 @@ testcase tBasicVBACompatImportNothing()
     dim cNodeCount as integer
     
     ' Depending on the mode of macro import we have differtent basic libraries listed
-    const NODE_COUNT = 72 ' Do not import Microsoft(R) Excel(R) macros at all
-    const MACRO_LIST = 0  ' The document library should have no scripts listed
+    const NODE_COUNT     = 74 ' Do not import Microsoft(R) Excel(R) macros at all
+    const NODE_COUNT_OOO = 72 
+    const MACRO_LIST     = 0  ' The document library should have no scripts listed
     const DOCUMENT_POSITION_OFFSET = -1
     
     const IMPORT_EXCEL_MACROS = FALSE
@@ -69,8 +70,10 @@ testcase tBasicVBACompatImportNothing()
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode" )
-    if ( cNodeCount <> NODE_COUNT ) then
-        warnlog( "The number of nodes is incorrect: " & cNodeCount )
+    if ( gOOo ) then
+        if ( cNodeCount <> NODE_COUNT_OOO ) then warnlog( "The number of nodes is incorrect: " & cNodeCount )
+    else
+        if ( cNodeCount <> NODE_COUNT ) then warnlog( "The number of nodes is incorrect: " & cNodeCount )
     endif
     
     printlog( "Verify position of the document node" )