CWS-TOOLING: integrate CWS autorecovery

1 files changed, 18 insertions, 5 deletions

diff --git a/testautomation/dbaccess/required/includes/DatabaseTypes.inc b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
index f16e0794d36b..02c8d29b63c7 100644..100755
--- a/testautomation/dbaccess/required/includes/DatabaseTypes.inc
+++ b/testautomation/dbaccess/required/includes/DatabaseTypes.inc
@@ -318,7 +318,7 @@ testcase tEvolutionProperties
     Kontext "TabGeneral"    
         call DialogTest(TabGeneral)
         try
-            if ( DatabaseType.getItemCount() > 12 ) then
+            if ( isDriverInstalled("sdbc:address:evolution:ldap")) then
                 DataBaseType.select(hGetDatabaseDisplayName("sdbc:address:evolution:ldap"))
                 Kontext "ConnectionType"        
                 ConnectionType.OK
@@ -359,13 +359,26 @@ testcase tMozillaProperties
     
     Kontext "TabGeneral"    
         call DialogTest(TabGeneral)
-        DataBaseType.select(hGetDatabaseDisplayName("sdbc:address:mozilla:"))
+        try
+            if ( isDriverInstalled("sdbc:address:mozilla:")) then
+                DataBaseType.select(hGetDatabaseDisplayName("sdbc:address:mozilla:"))
+                Kontext "ConnectionType"
+                ConnectionType.OK
+            else
+                qaerrorlog "Mozilla does not appear to be available on this system"
+                Kontext "ConnectionType"
+                ConnectionType.Cancel
+            endif
+        catch
+            warnlog "failed to select DataBaseType Mozilla - maybe not installed or activated in this build"
+            TabGeneral.Cancel
+            call fCloseDatabase
+            goto endsub
+        endcatch
+        
 
     'add sleep to give OOo time to react 
     sleep(2)    
-
-    Kontext "ConnectionType"        
-        ConnectionType.OK
         
     'call fCheckAdvancedDialog("Mozilla")