35 output test result to external source database text file xml json (#36)

* Refactoring AccUnitLoader: Replace DebugPrintTestResultCollector with a collector for more ResultReporter (Debug.Print, Textfile, XML, ...)
* output to log file

Author: josef-poetzl

access-add-in/AccUnitLoader.accda

@@ -17,7 +17,7 @@ Attribute VB_Exposed = False
 '</codelib>
 '---------------------------------------------------------------------------------------
 '
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 ' verwendete Erweiterungen

access-add-in/source/forms/AccUnitLoaderForm.cls

@@ -16,7 +16,7 @@ Attribute VB_Exposed = False
 '</codelib>
 '---------------------------------------------------------------------------------------
 '
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 Private m_UserSettings As AccUnit.IUserSettings

access-add-in/source/forms/AccUnitUserSettings.cls

@@ -32,7 +32,7 @@ Attribute VB_Description = "Konfigurationseinstellungen der CodeLib verwalten"
 '</codelib>
 '---------------------------------------------------------------------------------------
 '
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 Private m_DaoSqlTools As SqlTools

access-add-in/source/modules/ACLibConfiguration.cls

@@ -9,28 +9,13 @@ Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = False
 Attribute VB_Description = "Konfigurationseinstellungen der CodeLib verwalten"
 '---------------------------------------------------------------------------------------
-' Klassenmodul: AccUnitConfiguration
-'---------------------------------------------------------------------------------------
-'/**
-' <summary>
-' Konfigurationseinstellungen verwalten
-' </summary>
-' <remarks>
-' </remarks>
-'\ingroup addins_shared
-'**/
-'---------------------------------------------------------------------------------------
-'<codelib>
-'  <file>%AppFolder%/source/AccUnitConfiguration.cls</file>
-'  <use>base/ApplicationHandler.cls</use>
-'  <use>data/SqlTools.bas</use>
-'  <use>file/FileTools.bas</use>
-'  <use>data/dao/modDAO_Tools.bas</use>
-'  <ref><name>DAO</name><major>5</major><minor>0</minor><guid>{00025E01-0000-0000-C000-000000000046}</guid></ref>
-'</codelib>
+' Class: AccUnitConfiguration
 '---------------------------------------------------------------------------------------
 '
-Option Compare Database
+' AccUnit configuration
+'
+'---------------------------------------------------------------------------------------
+Option Compare Text
 Option Explicit
 
 Private m_DaoSqlTools As SqlTools

access-add-in/source/modules/AccUnitConfiguration.cls

@@ -2,6 +2,13 @@
 Option Explicit
 Option Compare Text
 
+' Integrierte Erweiterungen
+Private Const EXTENSION_KEY_AccUnitConfiguration As String = "AccUnitConfiguration"
+
+Public Property Get CurrentAccUnitConfiguration() As AccUnitConfiguration
+   Set CurrentAccUnitConfiguration = CurrentApplication.Extensions(EXTENSION_KEY_AccUnitConfiguration)
+End Property
+
 Public Sub AddAccUnitTlbReference()
    RemoveAccUnitTlbReference
    CurrentVbProject.References.AddFromFile CurrentAccUnitConfiguration.AccUnitDllPath & "\AccessCodeLib.AccUnit.tlb"
@@ -97,18 +104,141 @@ Public Sub ExportTestClasses()
 
 End Sub
 
-Public Sub RemoveTestEnvironment(ByVal RemoveTestModules As Boolean)
+Public Sub RemoveTestEnvironment(ByVal RemoveTestModules As Boolean, Optional ByVal SaveTestModules As Boolean = True)
 
    Dim Configurator As AccUnit.Configurator
 
    With New AccUnitLoaderFactory
       Set Configurator = .Configurator
    End With
 
-   Configurator.RemoveTestEnvironment RemoveTestModules, , CurrentVbProject
+   Configurator.RemoveTestEnvironment RemoveTestModules, SaveTestModules, CurrentVbProject
    Set Configurator = Nothing
 
 On Error Resume Next
    Application.RunCommand acCmdCompileAndSaveAllModules
 
 End Sub
+
+
+Public Property Get AccUnitFileNames() As Variant()
+
+   AccUnitFileNames = Array( _
+                        ACCUNIT_TYPELIB_FILE, _
+                        ACCUNIT_DLL_FILE, _
+                        "AccessCodeLib.Common.Tools.dll", _
+                        "AccessCodeLib.Common.VBIDETools.dll", _
+                        "AccessCodeLib.Common.VBIDETools.XmlSerializers.dll", _
+                        "Microsoft.Vbe.Interop.dll")
+   '                       "Interop.VBA.dll"
+End Property
+
+Public Sub ExportAccUnitFiles(Optional ByVal lBit As Long = 0)
+
+   Dim accFileName As Variant
+   Dim sBit As String
+   Dim DllPath As String
+
+On Error GoTo HandleErr
+
+   If lBit = 0 Then
+      lBit = GetCurrentAccessBitSystem
+   End If
+
+   sBit = CStr(lBit)
+   DllPath = CurrentAccUnitConfiguration.AccUnitDllPath
+
+   With CurrentApplication.Extensions("AppFile")
+      For Each accFileName In AccUnitFileNames
+         .CreateAppFile accFileName, DllPath & accFileName, "BitInfo", sBit
+      Next
+   End With
+
+ExitHere:
+   Exit Sub
+
+HandleErr:
+   If accFileName = "AccessCodeLib.AccUnit.tlb" Then
+      Resume Next
+   End If
+   Err.Raise Err.Number, Err.Source, Err.Description, Err.HelpFile, Err.HelpContext
+
+End Sub
+
+Public Sub ImportAccUnitFiles(Optional ByVal lBit As Long = 0)
+
+   Dim accFileName As Variant
+   Dim sBit As String
+   Dim DllPath As String
+
+   If lBit = 0 Then
+      lBit = GetCurrentAccessBitSystem
+   End If
+
+   sBit = CStr(lBit)
+   DllPath = CurrentAccUnitConfiguration.AccUnitDllPath
+
+   If lBit = 32 Then
+      DllPath = Replace(DllPath, "x64", "x86")
+   ElseIf lBit = 64 Then
+      DllPath = Replace(DllPath, "x86", "x64")
+   End If
+
+   With CurrentApplication.Extensions("AppFile")
+      For Each accFileName In AccUnitFileNames
+         .SaveAppFile accFileName, DllPath & accFileName, True, , , "BitInfo", sBit
+      Next
+   End With
+
+End Sub
+
+Public Function GetCurrentAccessBitSystem() As Long
+
+#If VBA7 Then
+#If Win64 Then
+      GetCurrentAccessBitSystem = 64
+#Else
+      GetCurrentAccessBitSystem = 32
+#End If
+#Else
+      GetCurrentAccessBitSystem = 32
+#End If
+
+End Function
+
+Public Function AutomatedTestRun() As Boolean
+
+   Dim Success As Boolean
+   Dim TestSummary As AccUnit.ITestSummary
+   Dim FailedMessage As String
+
+   AddAccUnitTlbReference
+   InsertFactoryModule
+   ImportTestClasses
+
+   SetFocusToImmediateWindow
+
+   Set TestSummary = GetAccUnitFactory.TestSuite(LogFile + DebugPrint).AddFromVBProject.Run.Summary
+   Success = TestSummary.Success
+
+   RemoveTestEnvironment True
+
+   If Not Success Then
+      FailedMessage = TestSummary.Failed & " of " & TestSummary.Total & " Tests failed"
+      Err.Raise vbObjectError + 12, "AccUnitLoader.AutomatedTestRun", FailedMessage
+   End If
+
+End Function
+
+Private Sub SetFocusToImmediateWindow()
+   Dim VbeWin As VBIDE.Window
+   For Each VbeWin In Application.VBE.Windows
+      If VbeWin.Type = vbext_wt_Immediate Then
+         If Not VbeWin.Visible Then
+            VbeWin.Visible = True
+         End If
+         VbeWin.SetFocus
+         Exit Sub
+      End If
+   Next
+End Sub

access-add-in/source/modules/AccUnitLoaderConfigProcedures.bas

@@ -8,23 +8,13 @@ Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = False
 Attribute VB_Exposed = True
 '---------------------------------------------------------------------------------------
-' Klassenmodul: AccUnitLoaderFactory
+' Class: AccUnitLoaderFactory
 '---------------------------------------------------------------------------------------
-'/**
-' <summary>
-' Factory-Klasse für AccUnit
-' </summary>
-' <remarks>
-' </remarks>
-'\ingroup addins_shared
-'**/
+'
+' Factory for AccUnit elements
+'
 '---------------------------------------------------------------------------------------
-'<codelib>
-'  <file>%AppFolder%/source/AccUnitLoaderFactory.cls</file>
-'  <license>_codelib/license.bas</license>
-'</codelib>
-'---
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 Private m_AccUnitFactory As Object
@@ -47,7 +37,7 @@ On Error Resume Next
 
 End Sub
 
-Public Property Get AccUnitFactory() As AccUnit.AccUnitFactory
+Private Property Get AccUnitFactory() As AccUnit.AccUnitFactory
    If m_AccUnitFactory Is Nothing Then
       InitAccUnitFactory
    End If
@@ -81,20 +71,7 @@ Public Property Get ConstraintBuilder() As Object ' AccUnit.ConstraintBuilder
     Set ConstraintBuilder = AccUnitFactory.ConstraintBuilder
 End Property
 
-Public Function NewDebugPrintMatchResultCollector(Optional ByVal ShowPassedText As Boolean = False, Optional ByVal UseRaiseErrorForFailedMatch As Boolean = True) As DebugPrintMatchResultCollector
-
-   With New DebugPrintMatchResultCollector
-      .Init ShowPassedText, UseRaiseErrorForFailedMatch
-      Set NewDebugPrintMatchResultCollector = .This
-   End With
-
-End Function
-
-Public Function NewDebugPrintTestResultCollector() As DebugPrintTestResultCollector
-   Set NewDebugPrintTestResultCollector = New DebugPrintTestResultCollector
-End Function
-
-Public Property Get TestRunner() As Object 'AccUnit.TestRunner
+Private Property Get TestRunner() As Object 'AccUnit.TestRunner
 
     SetErrorTrappingToBreakOnUnhandledErrors
     Set TestRunner = AccUnitFactory.TestRunner(CurrentVbProject)
@@ -114,35 +91,10 @@ Private Sub SetErrorTrappingToBreakOnUnhandledErrors()
 
 End Sub
 
-Public Sub RunTest(ByVal testClassInstance As Object, Optional ByVal MethodName As String = "*", Optional ByVal PrintSummary As Boolean = True, Optional ByVal TestResultCollector As Object)
-
-   If PrintSummary And TestResultCollector Is Nothing Then
-      Set TestResultCollector = New DebugPrintTestResultCollector
-   End If
-
-   TestRunner.Run testClassInstance, MethodName, TestResultCollector
-
-   If PrintSummary Then
-      TestResultCollector.PrintSummary True
-   End If
-
-End Sub
-
 Public Property Get Configurator() As Object 'AccUnit.Configurator
    Set Configurator = AccUnitFactory.Configurator(CurrentVbProject)
 End Property
 
-Public Property Get VbaTestSuite() As Object 'AccUnit.VbaTestSuite
-   Set VbaTestSuite = AccUnitFactory.VbaTestSuite
-
-   With VbaTestSuite
-      Set .HostApplication = Application
-      Set .ActiveVBProject = CurrentVbProject
-      Set .TestRunner = TestRunner
-   End With
-
-End Property
-
 Public Property Get AccessTestSuite() As Object 'AccUnit.AccessTestSuite
    Set AccessTestSuite = AccUnitFactory.AccessTestSuite
 
@@ -154,16 +106,30 @@ Public Property Get AccessTestSuite() As Object 'AccUnit.AccessTestSuite
 
 End Property
 
-Public Property Get DebugPrintTestSuite() As DebugPrintTestSuite
+Public Property Get TestSuite(Optional ByVal TestReportOutputTo As TestReportOutput = TestReportOutput.DebugPrint) As TestSuite
 
-   Set DebugPrintTestSuite = New DebugPrintTestSuite
+   Set TestSuite = New TestSuite
 
-   With DebugPrintTestSuite
-      .Init AccessTestSuite, NewDebugPrintTestResultCollector
+   With TestSuite
+      .Init AccessTestSuite, New TestResultCollector
    End With
 
+   AddTestResultReporter TestSuite, TestReportOutputTo
+
 End Property
 
+Private Sub AddTestResultReporter(ByVal TestSuite As TestSuite, ByVal TestReportOutputTo As TestReportOutput)
+
+   If (TestReportOutputTo And TestReportOutput.DebugPrint) = TestReportOutput.DebugPrint Then
+      TestSuite.AddTestResultReporter New DebugPrintTestResultReporter
+   End If
+
+   If (TestReportOutputTo And TestReportOutput.LogFile) = TestReportOutput.LogFile Then
+      TestSuite.AddTestResultReporter New LogFileTestResultReporter
+   End If
+
+End Sub
+
 Public Property Get CodeCoverageTracker() As Object 'AccUnit.CodeCoverageTracker
     Set CodeCoverageTracker = AccUnitFactory.CodeCoverageTracker(CurrentVbProject)
 End Property

access-add-in/source/modules/AccUnitLoaderFactory.cls

@@ -2,13 +2,7 @@
 '---------------------------------------------------------------------------------------
 ' Modul: AccUnitLoaderFactoryCall
 '---------------------------------------------------------------------------------------
-'<codelib>
-'  <file>%AppFolder%/source/GetAccUnitFactory.bas</file>
-'  <license>_codelib/license.bas</license>
-'  <use>%AppFolder%/source/AccUnitLoaderFactory.cls</use>
-'</codelib>
-'---
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 Public Function GetAccUnitFactory() As AccUnitLoaderFactory

access-add-in/source/modules/AccUnitLoaderFactoryCall.bas

@@ -41,7 +41,7 @@ Public Sub RemoveTestEnvironmentDelTestsRCB(Optional RibbonControl As Object)
 End Sub
 
 Public Sub TestSuiteRunAllFromVBProjectRCB(Optional RibbonControl As Object)
-   GetAccUnitFactory.DebugPrintTestSuite.AddFromVBProject.Run
+   GetAccUnitFactory.TestSuite.AddFromVBProject.Run
    SetFocusToImmediateWindow
 End Sub
 

access-add-in/source/modules/AccUnitLoaderRibbonCallBacks.bas

@@ -33,7 +33,7 @@ Attribute VB_Description = "Erweiterung für ApplicationHandler-Klasse: Anwendun
 '</codelib>
 '---------------------------------------------------------------------------------------
 '
-Option Compare Database
+Option Compare Text
 Option Explicit
 
 Private Const EXTENSION_KEY As String = "AppFile"