diff --git a/access-add-in/source/modules/TestSuite.cls b/access-add-in/source/modules/TestSuite.cls
index 844aaeb..9e95048 100644
--- a/access-add-in/source/modules/TestSuite.cls
+++ b/access-add-in/source/modules/TestSuite.cls
@@ -42,6 +42,15 @@ End Property
Public Property Set CodeCoverageTracker(ByVal NewRef As Object)
Set m_CodeCoverageTracker = NewRef
+ Set m_TestSuite.CodeCoverageTracker = NewRef
+End Property
+
+Private Property Set AccessTestSuite_CodeCoverageTracker(ByVal RHS As AccUnit.ICodeCoverageTracker)
+ Set CodeCoverageTracker = RHS
+End Property
+
+Private Property Get AccessTestSuite_CodeCoverageTracker() As AccUnit.ICodeCoverageTracker
+ Set AccessTestSuite_CodeCoverageTracker = m_TestSuite.CodeCoverageTracker
End Property
Private Sub m_TestSuite_TestSuiteStarted(ByVal TestSuite As AccUnit.ITestSuite)
diff --git a/source/AccUnit/Interop/AccessTestSuite.cs b/source/AccUnit/Interop/AccessTestSuite.cs
index de8e7e2..2eb3861 100644
--- a/source/AccUnit/Interop/AccessTestSuite.cs
+++ b/source/AccUnit/Interop/AccessTestSuite.cs
@@ -29,6 +29,9 @@ public interface IAccessTestSuite : Interfaces.IVBATestSuite
IAccessTestSuite SelectTests(object TestNameFilter);
IAccessTestSuite Filter(object FilterTags);
ITestClassGenerator TestClassGenerator { get; }
+
+ // Hides the non-COM-visible ITestSuite.CodeCoverageTracker; keep as last member (vtable order).
+ new ICodeCoverageTracker CodeCoverageTracker { get; set; }
}
[ComVisible(true)]
@@ -96,6 +99,12 @@ public ITestClassGenerator TestClassGenerator
}
}
+ public new ICodeCoverageTracker CodeCoverageTracker
+ {
+ get { return base.CodeCoverageTracker as ICodeCoverageTracker; }
+ set { base.CodeCoverageTracker = value; }
+ }
+
public new IAccessTestSuite AppendTestResultReporter(ITestResultReporter reporter)
{
base.AppendTestResultReporter(reporter);
diff --git a/source/Tests/AccessTestClientTests/AccessTestClientTests.csproj b/source/Tests/AccessTestClientTests/AccessTestClientTests.csproj
index 7da7e50..14c8cb3 100644
--- a/source/Tests/AccessTestClientTests/AccessTestClientTests.csproj
+++ b/source/Tests/AccessTestClientTests/AccessTestClientTests.csproj
@@ -142,6 +142,7 @@
+
diff --git a/source/Tests/AccessTestClientTests/AccessTestSuiteCodeCoverageTrackerTests.cs b/source/Tests/AccessTestClientTests/AccessTestSuiteCodeCoverageTrackerTests.cs
new file mode 100644
index 0000000..cd2f90a
--- /dev/null
+++ b/source/Tests/AccessTestClientTests/AccessTestSuiteCodeCoverageTrackerTests.cs
@@ -0,0 +1,60 @@
+using AccessCodeLib.AccUnit.CodeCoverage;
+using NUnit.Framework;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace AccessCodeLib.AccUnit.AccessTestClientTests
+{
+ internal class AccessTestSuiteCodeCoverageTrackerTests
+ {
+ private class TestableAccessTestSuite : Interop.AccessTestSuite
+ {
+ public TestableAccessTestSuite() : base(null, null, null, null)
+ {
+ }
+
+ public void Trace(string text)
+ {
+ RaiseTraceMessage(text);
+ }
+ }
+
+ [Test]
+ public void CodeCoverageTracker_SetViaInteropInterface_IsPassedToTraceMessageEvent()
+ {
+ ICodeCoverageTracker received = null;
+ var tracker = new Interop.CodeCoverageTracker();
+ using (var suite = new TestableAccessTestSuite())
+ {
+ ((Interop.IAccessTestSuite)suite).CodeCoverageTracker = tracker;
+ suite.TestTraceMessage += (message, codeCoverageTracker) => received = codeCoverageTracker;
+
+ suite.Trace("Total");
+ }
+
+ Assert.That(received, Is.SameAs(tracker));
+ }
+
+ [Test]
+ public void CodeCoverageTracker_NotSet_ReturnsNull()
+ {
+ using (var suite = new TestableAccessTestSuite())
+ {
+ Assert.That(((Interop.IAccessTestSuite)suite).CodeCoverageTracker, Is.Null);
+ }
+ }
+
+ [Test]
+ public void IAccessTestSuite_CodeCoverageTracker_IsComVisible()
+ {
+ var property = typeof(Interop.IAccessTestSuite).GetProperty(nameof(Interop.IAccessTestSuite.CodeCoverageTracker),
+ BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly);
+
+ Assert.That(property, Is.Not.Null, "Property must be declared on IAccessTestSuite");
+ Assert.That(property.CanRead && property.CanWrite, Is.True);
+ Assert.That(property.GetCustomAttributes(typeof(ComVisibleAttribute), true)
+ .Cast().Any(a => !a.Value), Is.False);
+ }
+ }
+}