Allow Array(1,3,...) as row test parameter (#70)

Author: josef-poetzl

source/AccUnit/Integration/TestRowGenerator.cs

@@ -170,11 +170,28 @@ private string ConvertVbaParamStringToVB(string paramstring)
                                                                m =>
                                                                string.Format("{0}{1}{2}", m.Groups[1].Value,
                                                                              "DBNull.Value", m.Groups[3].Value));
+            tempString = ConvertVbArrayStringsToVB(tempString);
             tempString = ConvertConstantStringsToVB(tempString);
             tempString = tempString.Replace(".Tags(", ".AddTags(");
             return "TestManager.AddRow" + tempString;
         }
 
+        private static readonly Regex VbArrayStringRegex = new Regex(@"([\(\,]?)\s*(Array\((.*)\))\s*([\)\,])", RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
+        private string ConvertVbArrayStringsToVB(string paramstring)
+        {
+            Logger.Log(string.Format("Fill params, replace constants"));
+
+            var test = VbArrayStringRegex.Match(paramstring);
+
+            var tempString = VbArrayStringRegex.Replace(paramstring,
+                                                            m =>
+                                                            string.Format("{0}{1}{2}", m.Groups[1].Value,
+                                                                          "New Object() {New Object() {" + m.Groups[3].Value + "}}", m.Groups[4].Value));
+                                // Note: workaround: New Object() {1, 2, 3} creates 3 params and not an array
+            Logger.Log("completed");
+            return tempString;
+        }
+
         private static readonly Regex ConstantStringRegex = new Regex(@"([\(\,]?)\s*([A-z\.]+)\s*([\)\,])", RegexOptions.CultureInvariant | RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.IgnoreCase);
         private string ConvertConstantStringsToVB(string paramstring)
         {
@@ -224,7 +241,6 @@ private static string ReplaceParamConstantStringWithValue(string paramstring)
         private static object CreateTestRowGenerator(string testparamstring)
         {
             var sourcecode = GetTestRowGeneratorSource(testparamstring);
-
             using (var bcp = new Microsoft.VisualBasic.VBCodeProvider())
             {
                 var cp = new CompilerParameters();

source/Common/Common.Tools/AccessCodeLib.Common.Tools.csproj

@@ -23,7 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

source/Common/Common.VBIDETools/AccessCodeLib.Common.VBIDETools.csproj

@@ -23,7 +23,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

source/Tests/AccessTestClientTests/TestRunnerTests.cs

@@ -16,8 +16,8 @@ internal class TestRunnerTests
         public void TestBuilderTestsSetup()
         {
             _accessTestHelper = AccessClientTestHelper.NewAccessTestHelper();
-            var applictionHelper = new AccessApplicationHelper(_accessTestHelper.Application);
-            _testBuilder = new Interop.TestBuilder(applictionHelper);
+            var applicationHelper = new AccessApplicationHelper(_accessTestHelper.Application);
+            _testBuilder = new Interop.TestBuilder(applicationHelper);
         }
 
         [TearDown]
@@ -234,6 +234,51 @@ public Function TestMethod1(ByRef x() as Long) as Long
    TestMethod1 = x(0)
 End Function
 
+public Function GetCheckValue() as long
+   GetCheckValue = m_Check
+End Function
+");
+            var fixtureName = "clsAccUnitTestClass";
+            var fixture = _testBuilder.CreateTest(fixtureName);
+            Assert.That(fixture, Is.Not.Null);
+
+            var memberName = "TestMethod1";
+            var fixtureMember = new TestFixtureMember(memberName);
+
+            var testClassReader = new TestClassReader(_accessTestHelper.ActiveVBProject);
+            fixtureMember.TestClassMemberInfo = testClassReader.GetTestClassMemberInfo(fixtureName, memberName);
+
+            var rowGenerator = new TestRowGenerator
+            {
+                ActiveVBProject = _accessTestHelper.ActiveVBProject,
+                TestName = fixtureName
+            };
+            var testRows = rowGenerator.GetTestRows(memberName);
+
+            var invocHelper = new InvocationHelper(fixture);
+            var returnValue = invocHelper.InvokeMethod("TestMethod1", testRows[0].Args.ToArray());
+            Assert.That(returnValue, Is.EqualTo(1));
+
+            var result = new TestResultCollector();
+            var testRunner = new Interop.TestRunner(_accessTestHelper.ActiveVBProject);
+            testRunner.Run(fixture, "TestMethod1", result);
+
+            var valueAfterTestRun = invocHelper.InvokeMethod("GetCheckValue");
+            Assert.That(valueAfterTestRun, Is.EqualTo(2));
+        }
+
+        [Test]
+        public void RunRowTest_VbaArrayParam()
+        {
+            AccessClientTestHelper.CreateTestCodeModule(_accessTestHelper, "clsAccUnitTestClass", vbext_ComponentType.vbext_ct_ClassModule, @"
+private m_Check as Long
+
+'AccUnit:Row(Array(1, 2))
+public Function TestMethod1(ByRef x() as Variant) as Long
+   m_Check = x(1) 
+   TestMethod1 = x(0)
+End Function
+
 public Function GetCheckValue() as long
    GetCheckValue = m_Check
 End Function

source/Tests/Common.TestHelper/AccessCodeLib.Common.TestHelpers.csproj

@@ -14,10 +14,14 @@
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <SccProjectName>Svn</SccProjectName>
-    <SccLocalPath>Svn</SccLocalPath>
-    <SccAuxPath>Svn</SccAuxPath>
-    <SccProvider>SubversionScc</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">