Refactoring implement test result reporter interface into acc unit (#44)

* Output with TestResultReporters
* remove x86/x64 => compiled for any cpu
* use azure devops pipeline

Author: josef-poetzl

access-add-in/AccUnitLoader.accda

@@ -0,0 +1,9 @@
+if exist .\lib\ (
+  del /Q .\lib\*
+) else (
+  mkdir .\lib\
+)
+copy .\..\source\AccUnit\bin\Release\AccessCodeLib.*.tlb .\lib\
+copy .\..\source\AccUnit\bin\Release\AccessCodeLib.*.dll .\lib\
+
+timeout 3

access-add-in/_CopyAccUnitLibFilesFromRelease.cmd

@@ -120,36 +120,29 @@ On Error Resume Next
 
 End Sub
 
-
 Public Property Get AccUnitFileNames() As Variant()
 
    AccUnitFileNames = Array( _
                         ACCUNIT_TYPELIB_FILE, _
                         ACCUNIT_DLL_FILE, _
                         "AccessCodeLib.Common.Tools.dll", _
-                        "AccessCodeLib.Common.VBIDETools.dll", _
-                        "Microsoft.Vbe.Interop.dll")
+                        "AccessCodeLib.Common.VBIDETools.dll")
 
 End Property
 
-Public Sub ExportAccUnitFiles(Optional ByVal lBit As Long = 0)
+Public Sub ExportAccUnitFiles()
 
    Dim accFileName As Variant
    Dim sBit As String
    Dim DllPath As String
 
 On Error GoTo HandleErr
 
-   If lBit = 0 Then
-      lBit = GetCurrentVbaBitSystem
-   End If
-
-   sBit = CStr(lBit)
    DllPath = CurrentAccUnitConfiguration.AccUnitDllPath
 
    With CurrentApplication.Extensions("AppFile")
       For Each accFileName In AccUnitFileNames
-         .CreateAppFile accFileName, DllPath & accFileName, "BitInfo", sBit
+         .CreateAppFile accFileName, DllPath & accFileName
       Next
    End With
 
@@ -164,46 +157,34 @@ HandleErr:
 
 End Sub
 
-Public Sub ImportAccUnitFiles(Optional ByVal lBit As Long = 0)
+Public Sub ImportAccUnitFiles()
 
    Dim accFileName As Variant
-   Dim sBit As String
    Dim DllPath As String
 
-   If lBit = 0 Then
-      lBit = GetCurrentVbaBitSystem
-   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
+         .SaveAppFile accFileName, DllPath & accFileName, True
       Next
    End With
 
 End Sub
-
-Public Function GetCurrentVbaBitSystem() As Long
-
-#If VBA7 Then
-#If Win64 Then
-      GetCurrentVbaBitSystem = 64
-#Else
-      GetCurrentVbaBitSystem = 32
-#End If
-#Else
-      GetCurrentVbaBitSystem = 32
-#End If
-
-End Function
+'
+'Private Function GetCurrentVbaBitSystem() As Long
+'
+'#If VBA7 Then
+'#If Win64 Then
+'      GetCurrentVbaBitSystem = 64
+'#Else
+'      GetCurrentVbaBitSystem = 32
+'#End If
+'#Else
+'      GetCurrentVbaBitSystem = 32
+'#End If
+'
+'End Sub
 
 Public Function AutomatedTestRunVCS() As Variant
 

access-add-in/_CopyAccUnitLibFilesFromReleaseX64.cmd

@@ -20,6 +20,11 @@ Option Explicit
 Private m_AccUnitFactory As Object
 Private m_MatchResultCollector As Object
 
+Public Enum TestReportOutput
+   DebugPrint = 1
+   LogFile = 2
+End Enum
+
 Private Sub Class_Initialize()
 '
 End Sub
@@ -111,21 +116,21 @@ Public Property Get TestSuite(Optional ByVal TestReportOutputTo As TestReportOut
    Set TestSuite = New TestSuite
 
    With TestSuite
-      .Init AccessTestSuite, New TestResultCollector
+      .Init AccessTestSuite
    End With
 
-   AddTestResultReporter TestSuite, TestReportOutputTo
+   AppendTestResultReporter TestSuite, TestReportOutputTo
 
 End Property
 
-Private Sub AddTestResultReporter(ByVal TestSuite As TestSuite, ByVal TestReportOutputTo As TestReportOutput)
+Private Sub AppendTestResultReporter(ByVal TestSuite As TestSuite, ByVal TestReportOutputTo As TestReportOutput)
 
    If (TestReportOutputTo And TestReportOutput.DebugPrint) = TestReportOutput.DebugPrint Then
-      TestSuite.AddTestResultReporter New DebugPrintTestResultReporter
+      TestSuite.AppendTestResultReporter New DebugPrintTestResultReporter
    End If
 
    If (TestReportOutputTo And TestReportOutput.LogFile) = TestReportOutput.LogFile Then
-      TestSuite.AddTestResultReporter New LogFileTestResultReporter
+      TestSuite.AppendTestResultReporter New LogFileTestResultReporter
    End If
 
 End Sub

access-add-in/_CopyAccUnitLibFilesFromReleaseX86.cmd

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

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

@@ -17,19 +17,31 @@ Attribute VB_Exposed = False
 Option Compare Text
 Option Explicit
 
-Implements ITestResultReporter
+Implements AccUnit.ITestResultReporter
 
-Private WithEvents m_TestResultCollector As TestResultCollector
+Private WithEvents m_TestResultCollector As AccUnit.TestResultCollector
 Attribute m_TestResultCollector.VB_VarHelpID = -1
 
-Private Property Set ITestResultReporter_TestResultCollector(ByVal TestResultCollectorToListen As TestResultCollector)
-   Set TestResultCollector = TestResultCollectorToListen
+Private Property Get ITestResultReporter_TestResultCollector() As AccUnit.ITestResultCollector
+   Set ITestResultReporter_TestResultCollector = m_TestResultCollector
 End Property
 
-Private Property Set TestResultCollector(ByVal TestResultCollectorToListen As TestResultCollector)
+Private Property Set ITestResultReporter_TestResultCollector(ByVal TestResultCollectorToListen As AccUnit.ITestResultCollector)
    Set m_TestResultCollector = TestResultCollectorToListen
 End Property
 
+Private Sub m_TestResultCollector_NewTestResult(ByVal Result As AccUnit.ITestResult)
+'
+End Sub
+
+Private Sub m_TestResultCollector_TestSuiteFinished(ByVal Summary As AccUnit.ITestSummary)
+'
+End Sub
+
+Private Sub m_TestResultCollector_TestSuiteStarted(ByVal TestSuite As AccUnit.ITestSuite)
+'
+End Sub
+
 Private Sub m_TestResultCollector_TestTraceMessage(ByVal Message As String, ByVal CodeCoverageTracker As CodeCoverageTracker)
    If Message Like "* [*][*][*]*" Then
       Message = Replace(Message, vbNewLine, vbTab)
@@ -43,6 +55,7 @@ Private Sub m_TestResultCollector_TestTraceMessage(ByVal Message As String, ByVa
       Debug.Print CodeCoverageTracker.GetReport()
    End If
    End If
+
 End Sub
 
 Private Sub m_TestResultCollector_PrintSummary(ByVal TestSummary As AccUnit.ITestSummary, ByVal PrintTestResults As Boolean)

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

@@ -19,34 +19,46 @@ Option Explicit
 
 Private Const LineSeperatorLen As Long = 40
 
-Implements ITestResultReporter
+Implements AccUnit.ITestResultReporter
 Private m_FileNo As Long
 
-Private WithEvents m_TestResultCollector As TestResultCollector
+Private WithEvents m_TestResultCollector As AccUnit.TestResultCollector
 Attribute m_TestResultCollector.VB_VarHelpID = -1
 
 Private Sub Class_Terminate()
    CloseFile
 End Sub
 
-Private Property Set ITestResultReporter_TestResultCollector(ByVal TestResultCollectorToListen As TestResultCollector)
+Private Property Get ITestResultReporter_TestResultCollector() As AccUnit.ITestResultCollector
+   Set ITestResultReporter_TestResultCollector = m_TestResultCollector
+End Property
+
+Private Property Set ITestResultReporter_TestResultCollector(ByVal TestResultCollectorToListen As ITestResultCollector)
    Set TestResultCollector = TestResultCollectorToListen
 End Property
 
 Private Property Set TestResultCollector(ByVal TestResultCollectorToListen As TestResultCollector)
    Set m_TestResultCollector = TestResultCollectorToListen
 End Property
 
-Private Sub m_TestResultCollector_TestSuiteFinished(ByVal TestSummary As AccUnit.ITestSummary)
-   PrintSummary TestSummary, True
-   CloseFile
-End Sub
-
 Private Sub m_TestResultCollector_TestSuiteStarted(ByVal TestSuite As AccUnit.ITestSuite)
    PrintToFile String(LineSeperatorLen, "#")
    PrintToFile Format(Now(), "yyyy-mm-dd hh:nn:ss")
 End Sub
 
+Private Sub m_TestResultCollector_TestTraceMessage(ByVal Message As String, ByVal CodeCoverageTracker As AccUnit.ICodeCoverageTracker)
+'
+End Sub
+
+Private Sub m_TestResultCollector_NewTestResult(ByVal Result As AccUnit.ITestResult)
+'
+End Sub
+
+Private Sub m_TestResultCollector_TestSuiteFinished(ByVal TestSummary As AccUnit.ITestSummary)
+   PrintSummary TestSummary, True
+   CloseFile
+End Sub
+
 Private Sub m_TestResultCollector_PrintSummary(ByVal TestSummary As AccUnit.ITestSummary, ByVal PrintTestResults As Boolean)
    PrintSummary TestSummary, PrintTestResults
 End Sub