Fix: export test components with test classes (#51)

* * Export Test Classes: + option to include TestComponents
AccessCodeLib · Mar 23, 2024 · 21d0d91 · 21d0d91
1 parent de398f8
commit 21d0d91
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/access-add-in/AccUnitLoader.accda b/access-add-in/AccUnitLoader.accda
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.34",
+    "AddinVersion": "4.0.35",
     "AccessVersion": "16.0 32-bit"
   },
   "Options": {

diff --git a/excel-add-in/AccUnitLoader.xlam b/excel-add-in/AccUnitLoader.xlam
diff --git a/source/AccUnit/Configuration/Configurator.cs b/source/AccUnit/Configuration/Configurator.cs
@@ -18,7 +18,7 @@ public interface IConfigurator
         void RemoveTestEnvironment(bool RemoveTestModules = false, bool ExportModulesBeforeRemoving = true, [MarshalAs(UnmanagedType.IDispatch)] object VBProject = null);
         void InsertAccUnitLoaderFactoryModule(bool UseAccUnitTypeLib, bool RemoveIfExists = false, [MarshalAs(UnmanagedType.IDispatch)] object VBProject = null, object HostApplication = null);
         void RemoveAccUnitLoaderFactoryModule([MarshalAs(UnmanagedType.IDispatch)] object VBProject = null);
-        void ExportTestClasses(string ExportPath = null, [MarshalAs(UnmanagedType.IDispatch)] object VBProject = null);
+        void ExportTestClasses(string ExportPath = null, [MarshalAs(UnmanagedType.IDispatch)] object VBProject = null, bool ExportTestComponents = true);
         void ImportTestClasses(string FileNameFilter = null, string ImportPath = null, [MarshalAs(UnmanagedType.IDispatch)] object VBProject = null);
 
         IUserSettings UserSettings { get; } 
@@ -127,15 +127,15 @@ private void RemoveAccUnitTlbReference()
             }
         }
 
-        public void ExportTestClasses(string exportPath = null, object vbProject = null)
+        public void ExportTestClasses(string exportPath = null, object vbProject = null, bool exportTestComponents = true)
         {
             if (vbProject != null)
                 _vbProject = (VBProject)vbProject;
 
             OfficeApplicationHelper officeApplicationHelper = new VBProjectOnlyApplicatonHelper(_vbProject);
             using (var testClassManager = new TestClassManager(officeApplicationHelper))
             {
-                testClassManager.ExportTestClasses(exportPath);
+                testClassManager.ExportTestClasses(exportPath, exportTestComponents);
             }
         }
 

diff --git a/source/AccUnit/Configuration/TestClassManager.cs b/source/AccUnit/Configuration/TestClassManager.cs
@@ -148,7 +148,7 @@ private static OfficeObjectInfo GetObjectInfo(string name)
             }
         }
 
-        public void ExportTestClasses(string exportDirectory = null)
+        public void ExportTestClasses(string exportDirectory = null, bool exportTestComponents = false)
         {
             if (exportDirectory is null)
             {
@@ -160,6 +160,15 @@ public void ExportTestClasses(string exportDirectory = null)
             {
                 ExportTestClass(testClassInfo.Name, exportDirectory);
             }
+
+            if (exportTestComponents)
+            {
+                var components = new TestClassReader(ActiveVBProject).GetTestComponents();
+                foreach (var c in components)
+                {
+                    ExportTestClass(c.Name, exportDirectory);
+                }
+            }
         }
 
         public void DeleteFactoryCodeModule()

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.4.0")]
-[assembly: AssemblyFileVersion("0.9.4.0")]
+[assembly: AssemblyVersion("0.9.5.0")]
+[assembly: AssemblyFileVersion("0.9.5.0")]