1 files changed, 9 insertions, 17 deletions

diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketestoo_native/data/Test_Ext.xml
index 31d27dc7a4a7..534917f02eac 100644
--- a/smoketestoo_native/data/Test_Ext.xml
+++ b/smoketestoo_native/data/Test_Ext.xml
@@ -32,7 +32,7 @@ const cMessageExtensionService = "Extension Service"
 const cMessageExtensionInstall = "Install Extension"
 const cMessageExtensionUninstall = "Uninstall Extension"
 
-Sub TestExtensions (FilterType as Integer)
+Sub TestExtensions
 Dim oTestExtension as Object, obj_null as Object
 Dim sCurrentMessage as String
 Dim nCurrentAction as Integer
@@ -43,7 +43,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     On Local Error GoTo EXTERROR
 
     nCurrentAction = cLogfileFailed
-    FileChannel% = OpenLogDat (GetLogFileName(FilterType))
+    FileChannel% = OpenLogDat (GetLogFileName(g_CurrentDocTest))
 
     sCurrentMessage = cMessageExtensionService
     nCurrentAction = cEXTService
@@ -58,11 +58,9 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     ctx = getDefaultContext
     ext_mgr = ctx.getValueByName("/singletons/" + cExtensionManager)
 
-    LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, FileChannel)
-    LogState (not IsNull (ext_mgr), "Extension "+ cMessageExtensionService, MainFileChannel)
-    SetStatus (FilterType, cEXTService, not IsNull (ext_mgr))
+    LogTestResult( cEXTService, "Extension "+ cMessageExtensionService, not IsNull (ext_mgr) )
     if (IsNull(ext_mgr)) then
-          Close #FileChannel%
+        Close #FileChannel%
         Exit Sub
     End If
 
@@ -79,11 +77,9 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     'Check if the extension has been added by creating a service which is contained in the extension.
     oTestExtension = createUnoService(cUnoSmoketestTestExtension)
     bResult = (oTestExtension.getImplementationName = sImplementationNameString)
-    LogState (bResult, "Extension "+ cMessageExtensionInstall, FileChannel)
-    LogState (bResult, "Extension "+ cMessageExtensionInstall, MainFileChannel)
-    SetStatus (FilterType, cEXTInstall, bResult)
+    LogTestResult( cEXTInstall, "Extension "+ cMessageExtensionInstall, bResult )
     if (not bResult) then
-           Close #FileChannel%
+        Close #FileChannel%
         Exit Sub
     End If
 
@@ -97,9 +93,7 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
     oTestExtension = createUnoService(cUnoSmoketestTestExtension)
 
     'The service must not be available anymore. Therefor isNull must return true.
-    LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, FileChannel)
-    LogState (IsNull (oTestExtension), "Extension "+ cMessageExtensionUninstall, MainFileChannel)
-    SetStatus (FilterType, cEXTUninstall, IsNull (oTestExtension))
+    LogTestResult( cEXTUninstall, "Extension "+ cMessageExtensionUninstall, IsNull (oTestExtension) )
 
     Print #FileChannel, "---"
     Close #FileChannel%
@@ -107,12 +101,10 @@ sImplementationNameString = cUnoSmoketestTestExtension + "$_TestExtension&q
 
     EXTERROR:
     If  (nCurrentAction = cLogfileFailed) then
-        SetStatus (FilterType, cEXTService, False)
+        LogTestResult( cLogfileFailed, "", False )
         Exit Sub
     else
-        LogState (False, "Extension "+ sCurrentMessage, FileChannel)
-        LogState (False, "Extension "+ sCurrentMessage, MainFileChannel)
-        SetStatus (FilterType, nCurrentAction, False)
+        LogTestResult( nCurrentAction, "Extension "+ sCurrentMessage, False )
         Close #FileChannel%
     End If
     Exit Sub ' With error