From 8019548104eec2976b8f3e0ddc9d3b68d7885c8e Mon Sep 17 00:00:00 2001
From: "Joerg Skottke [jsk]" <jsk@openoffice.org>
Date: Mon, 10 May 2010 12:24:14 +0200
Subject: sb122: #i110083 - Added test case

---
 .../extensions/optional/includes/issue110083.inc   | 53 ++++++++++++++--------
 .../extensions/optional/input/issues/Logging.xcu   | 24 ++++++++++
 .../optional/t_extension_manager_tools.inc         |  1 +
 3 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100755 testautomation/extensions/optional/input/issues/Logging.xcu

(limited to 'testautomation')

diff --git a/testautomation/extensions/optional/includes/issue110083.inc b/testautomation/extensions/optional/includes/issue110083.inc
index 7df72be5f9a1..8940f7f8274c 100755
--- a/testautomation/extensions/optional/includes/issue110083.inc
+++ b/testautomation/extensions/optional/includes/issue110083.inc
@@ -33,30 +33,47 @@
 
 testcase tExtensionIssue110083()
 
-    printlog( "Configuration schema which might trigger a <Bad root element> (or similar) exception from unopkg" )
+    printlog( "Configuration/-schema .xcu/.xcs-files which might trigger exceptions from unopkg/Extension Manager" )
 
-    const EXTENSION_NAME = "LoggingOptions.xcs"
-    const ERRORMESSAGE_IDENTIFIER = "no component element"
+    const NUMBER_OF_TEST_EXTENSIONS = 2
+
+    dim cExtensionNames( NUMBER_OF_TEST_EXTENSIONS ) as string
+        cExtensionNames( 1 ) = "LoggingOptions.xcs"
+        cExtensionNames( 2 ) = "Logging.xcu"
+
+    dim cErrorIdentifier( NUMBER_OF_TEST_EXTENSIONS ) as string
+        cErrorIdentifier( 1 ) = "no component element"
+        cErrorIdentifier( 2 ) = "no component element"
 
     dim cExtensionPath as string
-        cExtensionPath = gTesttoolPath & "extensions/optional/input/issues/" & EXTENSION_NAME
-        cExtensionPath = convertpath( cExtensionPath )
+        cExtensionPath = gTesttoolPath & "extensions/optional/input/issues/"
+
+    dim cExtension as string
+
+    dim iCurrentExtension as integer
+        
 
-    hExtensionAddGUI( cExtensionPath, "" )
+    for iCurrentExtension = 1 to NUMBER_OF_TEST_EXTENSIONS
 
-    kontext "Active"
-    if ( Active.exists() ) then
-        if ( instr( Active.getText, ERRORMESSAGE_IDENTIFIER ) > 0 ) then
-            warnlog( "#i110083# - error installing xcs-file" )
-            Active.ok()
+        cExtension = convertpath( cExtensionPath & cExtensionNames( iCurrentExtension ) )
+        hExtensionAddGUI( cExtension, "" )
 
-            kontext "PackageManager"
-            PackageManager.close()
+        kontext "Active"
+        if ( Active.exists() ) then
+            if ( instr( Active.getText, cErrorIdentifier( iCurrentExtension ) ) > 0 ) then
+                warnlog( "#i110083# - Error installing .xcs/.xcu-file: " & cExtensionNames( iCurrentExtension ) )
+                Active.ok()
+
+                kontext "PackageManager"
+                PackageManager.close()
+            else
+                warnlog( "Unexpected messagebox displayed. It cannot be handled" )
+            endif
         else
-            warnlog( "Unexpected messagebox displayed. It cannot be handled" )
+            hExtensionRemoveGUI( cExtensionNames( iCurrentExtension ) )
         endif
-    else
-        hExtensionRemoveGUI( EXTENSION_NAME )
-    endif
 
-endcase
\ No newline at end of file
+    next iCurrentExtension
+
+endcase
+
diff --git a/testautomation/extensions/optional/input/issues/Logging.xcu b/testautomation/extensions/optional/input/issues/Logging.xcu
new file mode 100755
index 000000000000..8bf0f34b6f1b
--- /dev/null
+++ b/testautomation/extensions/optional/input/issues/Logging.xcu
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Logging" oor:package="org.openoffice.Office">
+    <node oor:name="Settings">
+        <node oor:name="bw.stv.tvs.logging.DefaultLogger" oor:op="replace">
+            <prop oor:name="DefaultFormatter" oor:type="xs:string">
+                <value>com.sun.star.logging.PlainTextFormatter</value>
+            </prop>
+            <prop oor:name="DefaultHandler" oor:type="xs:string">
+                <value>bw.stv.tvs.logging.UILogHandler</value>
+            </prop>
+            <prop oor:name="LogLevel" oor:type="xs:int">
+                <value>2147483647</value>
+            </prop>
+            <node oor:name="HandlerSettings">
+                <prop oor:name="UIId" oor:type="xs:string">
+                    <value>tvs.ui</value>
+                </prop>
+                <prop oor:name="UITitle" oor:type="xs:string">
+                    <value>TVS-Logger (bw.stv.tvs.logging.DefaultLogger)</value>
+                </prop>
+            </node>
+        </node>
+    </node>
+</oor:component-data>
\ No newline at end of file
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index 80d023877c85..ee4d7f55beba 100755
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -101,6 +101,7 @@ function hExtensionAddGUI( _path as string, _flags as string ) as integer
     '///+<li>Verify that the requested extension exists (filesystem level)</li>
     if ( not FileExists( path ) ) then
         printlog( CFN & "Requested extension does not exist" )
+        printlog( CFN & path )
         hExtensionAddGUI() = -1
         exit function
     endif
-- 
cgit