fix: create params to test methods (called by add-in) (#59)

josef-poetzl · web-flow · commit 23770bb087da · 2024-05-12T20:28:28.000+02:00
diff --git a/access-add-in/AccUnitLoader.accda b/access-add-in/AccUnitLoader.accda
diff --git a/access-add-in/source/modules/AccUnitLoaderConfigProcedures.bas b/access-add-in/source/modules/AccUnitLoaderConfigProcedures.bas
@@ -146,7 +146,7 @@ Public Property Get AccUnitFileNames() As Variant()
                         ACCUNIT_DLL_FILE, _
                         "AccessCodeLib.Common.Tools.dll", _
                         "AccessCodeLib.Common.VBIDETools.dll", _
-                        "AccessCodeLib.AccUnit.VbeAddIn.dll", _
+                        "AccUnit.VbeAddIn.dll", _
                         "AccessCodeLib.Common.VbeUserControlHost.dll")
 
 End Property
diff --git a/access-add-in/source/modules/_config_Application.bas b/access-add-in/source/modules/_config_Application.bas
@@ -18,7 +18,7 @@ Option Compare Text
 Option Explicit
 
 'Version number
-Private Const APPLICATION_VERSION As String = "0.9.800.240509"
+Private Const APPLICATION_VERSION As String = "0.9.800.240510"
 
 Private Const APPLICATION_NAME As String = "ACLib AccUnit Loader"
 Private Const APPLICATION_FULLNAME As String = "Access Code Library - AccUnit Loader"
diff --git a/access-add-in/source/vcs-options.json b/access-add-in/source/vcs-options.json
@@ -1,6 +1,6 @@
 ﻿{
   "Info": {
-    "AddinVersion": "4.0.35-jp01",
+    "AddinVersion": "4.0.36-jp",
     "AccessVersion": "16.0 32-bit"
   },
   "Options": {
diff --git a/excel-add-in/AccUnitLoader.xlam b/excel-add-in/AccUnitLoader.xlam
diff --git a/excel-add-in/source/AccUnitLoaderConfigProcedures.bas b/excel-add-in/source/AccUnitLoaderConfigProcedures.bas
@@ -4,7 +4,7 @@ Option Compare Text
 
 Public Sub AddAccUnitTlbReference()
    RemoveAccUnitTlbReference
-   CurrentVbProject.References.AddFromFile CurrentAccUnitConfiguration.AccUnitDllPath & "\AccessCodeLib.AccUnit.tlb"
+   CurrentVbProject.References.AddFromFile CurrentAccUnitConfiguration.AccUnitDllPath & "\" & ACCUNIT_TYPELIB_FILE
 End Sub
 
 Public Sub RemoveAccUnitTlbReference()
diff --git a/excel-add-in/source/AccUnitLoaderForm.frm b/excel-add-in/source/AccUnitLoaderForm.frm
@@ -261,7 +261,7 @@ Private Sub cmdSetAccUnitTlbReferenz_Click()
 On Error GoTo HandleErr
 
    AddAccUnitTlbReference
-   ShowSuccessInfo "AccUnit.tlb reference inserted"
+   ShowSuccessInfo ACCUNIT_TYPELIB_FILE & " reference inserted"
    
 ExitHere:
    Exit Sub
@@ -277,7 +277,7 @@ Private Sub cmdRemoveAccUnitTlbReferenz_Click()
 On Error GoTo HandleErr
 
    RemoveAccUnitTlbReference
-   ShowSuccessInfo "AccUnit.tlb reference removed"
+   ShowSuccessInfo ACCUNIT_TYPELIB_FILE & " reference removed"
    
 ExitHere:
    Exit Sub
diff --git a/excel-add-in/source/AccUnitLoaderForm.frx b/excel-add-in/source/AccUnitLoaderForm.frx
diff --git a/excel-add-in/source/AccUnitUserSettings.frx b/excel-add-in/source/AccUnitUserSettings.frx
diff --git a/excel-add-in/source/config_Application.bas b/excel-add-in/source/config_Application.bas
@@ -19,14 +19,14 @@ Option Explicit
 Option Private Module
 
 'Version number
-Private Const APPLICATION_VERSION As String = "0.9.700.240403"
+Private Const APPLICATION_VERSION As String = "0.9.900.2400512"
 
 Private Const APPLICATION_NAME As String = "ACLib AccUnit Loader"
 Private Const APPLICATION_FULLNAME As String = "Access Code Library - AccUnit Loader"
 Private Const APPLICATION_TITLE As String = APPLICATION_FULLNAME
 Private Const APPLICATION_ICONFILE As String = "ACLib.ico"
-Public Const ACCUNIT_TYPELIB_FILE As String = "AccessCodeLib.AccUnit.tlb"
-Public Const ACCUNIT_DLL_FILE As String = "AccessCodeLib.AccUnit.dll"
+Public Const ACCUNIT_TYPELIB_FILE As String = "AccUnit.tlb"
+Public Const ACCUNIT_DLL_FILE As String = "AccUnit.dll"
 
 Private Const APPLICATION_STARTFORMNAME As String = "AccUnitLoaderForm"
 
@@ -39,7 +39,7 @@ Private m_Extensions As AppHandler_ExtensionCollection
 ' <summary>
 ' Konfigurationseinstellungen initialisieren
 ' </summary>
-' <param name="oCurrentAppHandler">Möglichkeit einer Referenzübergabe, damit nicht CurrentApplication genutzt werden muss</param>
+' <param name="oCurrentAppHandler">M�glichkeit einer Referenz�bergabe, damit nicht CurrentApplication genutzt werden muss</param>
 ' <returns></returns>
 ' <remarks>
 ' </remarks>
diff --git a/excel-add-in/source/defGlobal_AccUnitLoader.bas b/excel-add-in/source/defGlobal_AccUnitLoader.bas
@@ -78,7 +78,9 @@ Public Property Get AccUnitFileNames() As Variant()
                         ACCUNIT_TYPELIB_FILE, _
                         ACCUNIT_DLL_FILE, _
                         "AccessCodeLib.Common.Tools.dll", _
-                        "AccessCodeLib.Common.VBIDETools.dll")
+                        "AccessCodeLib.Common.VBIDETools.dll", _
+                        "AccUnit.VbeAddIn.dll", _
+                        "AccessCodeLib.Common.VbeUserControlHost.dll")
 
 End Property
 
@@ -101,7 +103,7 @@ ExitHere:
    Exit Sub
 
 HandleErr:
-   If AccUnitFileName = "AccessCodeLib.AccUnit.tlb" Then
+   If AccUnitFileName = ACCUNIT_TYPELIB_FILE Then
       Resume Next
    End If
    Err.Raise Err.Number, Err.Source, Err.Description, Err.HelpFile, Err.HelpContext
diff --git a/source/AccUnit/Properties/AssemblyInfo.cs b/source/AccUnit/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.8.0")]
-[assembly: AssemblyFileVersion("0.9.8.0")]
+[assembly: AssemblyVersion("0.9.9.0")]
+[assembly: AssemblyFileVersion("0.9.9.0")]
diff --git a/source/AccUnit/Tools/TestClassGenerator.cs b/source/AccUnit/Tools/TestClassGenerator.cs
@@ -1,6 +1,7 @@
 ﻿using AccessCodeLib.Common.VBIDETools;
 using Microsoft.Vbe.Interop;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AccessCodeLib.AccUnit.Tools
 {
@@ -28,7 +29,9 @@ public CodeModule NewTestClass(string CodeModuleToTest = null,
             return InsertTestMethods(testClassName, methods);
         }
 
-        private IEnumerable<CodeModuleMember> GetTestCodeModuleMemberFromCodeModule(string codeModuleToTest, string stateUnderTest = null, string expectedBehaviour = null)
+        private IEnumerable<CodeModuleMember> GetTestCodeModuleMemberFromCodeModule(
+                string codeModuleToTest, string stateUnderTest = null, string expectedBehaviour = null,
+                IEnumerable<string> methodsUnderTestFilter = null)
         {
             var codeModule = new CodeModuleContainer(_vbProject).TryGetCodeModule(codeModuleToTest);
             if (codeModule is null)
@@ -40,6 +43,11 @@ private IEnumerable<CodeModuleMember> GetTestCodeModuleMemberFromCodeModule(stri
             var members = codeModulueReader.Members;
             var publicMembers = members.FindAll(true);
 
+            if (methodsUnderTestFilter != null)
+            {
+                publicMembers = publicMembers.Where(m => methodsUnderTestFilter.Contains(m.Name)).ToList();
+            }
+
             var testCodeModuleMembers = new List<CodeModuleMember>();
             foreach (var member in publicMembers)
             {
@@ -94,6 +102,15 @@ public CodeModule InsertTestMethods(string testClass, IEnumerable<CodeModuleMemb
             return modules.Generator.Add(vbext_ComponentType.vbext_ct_ClassModule, testClass, sourcecode, true);
         }
 
+        public CodeModule InsertTestMethods(string codeModuleToTest, string testClass, IEnumerable<string> methodsUnderTest, string stateUnderTest, string expectedBehaviour)
+        {
+            if (codeModuleToTest == null        )
+                return InsertTestMethods(testClass, methodsUnderTest, stateUnderTest, expectedBehaviour);
+
+            var methods = GetTestCodeModuleMemberFromCodeModule(codeModuleToTest, stateUnderTest, expectedBehaviour, methodsUnderTest);
+            return InsertTestMethods(testClass, methods);
+        }
+
         public CodeModule InsertTestMethods(string testClass, IEnumerable<string> methodsUnderTest, string stateUnderTest, string expectedBehaviour)
         {
             var testCodeGenerator = new TestCodeGenerator();
diff --git a/vbe-add-In/AccUnit.VbeAddIn/CommitMethodNameEventArgs.cs b/vbe-add-In/AccUnit.VbeAddIn/CommitMethodNameEventArgs.cs
@@ -19,15 +19,17 @@ public CommitInsertTestMethodEventArgs(string methodUnderTest, string stateUnder
 
     public class CommitInsertTestMethodsEventArgs : EventArgs
     {
-        public CommitInsertTestMethodsEventArgs(string testClass, IEnumerable<string> methodsUnderTest, string stateUnderTest, string expectedBehaviour)
+        public CommitInsertTestMethodsEventArgs(string codeModuleToTest, string testClass, IEnumerable<string> methodsUnderTest, string stateUnderTest, string expectedBehaviour)
         {
+            CodeModuleToTest = codeModuleToTest;
             TestClass = testClass;
             MethodsUnderTest = methodsUnderTest;
             StateUnderTest = stateUnderTest;
             ExpectedBehaviour = expectedBehaviour;
             Cancel = false;
         }
 
+        public string CodeModuleToTest { get; private set; }    
         public string TestClass { get; private set; }
         public IEnumerable<string> MethodsUnderTest { get; private set; }
         public string StateUnderTest { get; private set; }
diff --git a/vbe-add-In/AccUnit.VbeAddIn/InsertTestMethod/GenerateTestMethodsFromCodeModuleViewModel.cs b/vbe-add-In/AccUnit.VbeAddIn/InsertTestMethod/GenerateTestMethodsFromCodeModuleViewModel.cs
@@ -208,7 +208,7 @@ public IStringValueLabelControlSource MethodNameSyntax
         protected virtual void Commit()
         {
             InsertTestMethods?.Invoke(this,
-                new CommitInsertTestMethodsEventArgs(TestClassName.Value, MethodNamesToTest, StateTestNamePart.Value, ExpectedTestNamePart.Value));
+                new CommitInsertTestMethodsEventArgs(CurrentCodeModule.Name, TestClassName.Value, MethodNamesToTest, StateTestNamePart.Value, ExpectedTestNamePart.Value));
         }
     }
 }
diff --git a/vbe-add-In/AccUnit.VbeAddIn/Properties/AssemblyInfo.cs b/vbe-add-In/AccUnit.VbeAddIn/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]
diff --git a/vbe-add-In/AccUnit.VbeAddIn/VbeIntegrationManager.cs b/vbe-add-In/AccUnit.VbeAddIn/VbeIntegrationManager.cs
@@ -370,7 +370,7 @@ private CodeModule InsertTestMethodsDialogCommitMethodName(object sender, Commit
             {
                 using (new BlockLogger($"{e.TestClass}.{e.MethodsUnderTest}_{e.StateUnderTest}_{e.ExpectedBehaviour}"))
                 {
-                    return testClassGenerator.InsertTestMethods(e.TestClass, e.MethodsUnderTest, e.StateUnderTest, e.ExpectedBehaviour);
+                    return testClassGenerator.InsertTestMethods(e.CodeModuleToTest, e.TestClass, e.MethodsUnderTest, e.StateUnderTest, e.ExpectedBehaviour);
                 }
             }
             catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Info": {`
`3`		`- "AddinVersion": "4.0.35-jp01",`
	`3`	`+ "AddinVersion": "4.0.36-jp",`
`4`	`4`	`"AccessVersion": "16.0 32-bit"`
`5`	`5`	`},`
`6`	`6`	`"Options": {`