SqlMetaData resolution in common MDS project

Rewrite VerifyGetCommand in adapter test to no longer use reflection/dynamic invocation

Author: benrr101

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -1049,9 +1049,10 @@
       <Link>Resources\ILLink.Substitutions.xml</Link>
     </EmbeddedResource>
 
+    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
     <EmbeddedResource Include="$(CommonSourceRoot)Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
       <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
-      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName> <!-- @TODO: How necessary is this? -->
+      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
     </EmbeddedResource>
 
     <!-- Base strings in English -->

src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj

@@ -81,9 +81,15 @@
     <!-- the app context switch in their csproj. This file only applies to netcore on windows.    -->
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
-    <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
+    <EmbeddedResource Include="Resources\ILLink.Substitutions.xml"
                       Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'" />
 
+    <!-- Used by SqlMetaDataFactory to construct its DataSet -->
+    <EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
+      <Link>Resources\Microsoft.Data.SqlCLient.SqlMetaData.xml</Link>
+      <LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
+    </EmbeddedResource>
+
     <!-- Base strings in English -->
     <EmbeddedResource Update="Resources\Strings.resx">
       <LogicalName>Microsoft.Data.SqlClient.Resources.Strings.resources</LogicalName>

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs

@@ -1398,45 +1398,67 @@ public void TestReadOnlyColumnMetadata()
         }
 
         [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
-        [InlineData(nameof(SqlCommandBuilder.GetInsertCommand), null)]
-        [InlineData(nameof(SqlCommandBuilder.GetInsertCommand), true)]
-        [InlineData(nameof(SqlCommandBuilder.GetInsertCommand), false)]
-        [InlineData(nameof(SqlCommandBuilder.GetUpdateCommand), null)]
-        [InlineData(nameof(SqlCommandBuilder.GetUpdateCommand), true)]
-        [InlineData(nameof(SqlCommandBuilder.GetUpdateCommand), false)]
-        [InlineData(nameof(SqlCommandBuilder.GetDeleteCommand), null)]
-        [InlineData(nameof(SqlCommandBuilder.GetDeleteCommand), false)]
-        [InlineData(nameof(SqlCommandBuilder.GetDeleteCommand), true)]
-        public void VerifyGetCommand(string methodName, bool? useColumnsForParameterNames)
+        [InlineData(null)]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void VerifyDeleteCommand(bool? useColumnsForParameterNames)
         {
-            using (SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString))
+            if (useColumnsForParameterNames.HasValue)
             {
-                connection.Open();
-                using (SqlDataAdapter dataAdapter = new SqlDataAdapter("SELECT * FROM dbo.Customers", connection))
-                {
-                    using (SqlCommandBuilder commandBuilder = new SqlCommandBuilder(dataAdapter))
-                    {
-                        object[] parameters = null;
-                        Type[] parameterTypes = null;
-                        if (useColumnsForParameterNames != null)
-                        {
-                            parameters = new object[] { useColumnsForParameterNames };
-                            parameterTypes = new Type[] { typeof(bool) };
-                        }
-                        else
-                        {
-                            parameters = new object[] { };
-                            parameterTypes = new Type[] { };
-                        }
+                VerifyGetCommand(commandBuilder => commandBuilder.GetDeleteCommand(useColumnsForParameterNames.Value));
+            }
+            else
+            {
+                VerifyGetCommand(commandBuilder => commandBuilder.GetDeleteCommand());
+            }
+        }
 
-                        MethodInfo method = commandBuilder.GetType().GetMethod(methodName, parameterTypes);
-                        using (SqlCommand cmd = (SqlCommand)method.Invoke(commandBuilder, parameters))
-                        {
-                            Assert.NotNull(cmd);
-                        }
-                    }
-                }
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData(null)]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void VerifyInsertCommand(bool? useColumnsForParameterNames)
+        {
+            if (useColumnsForParameterNames.HasValue)
+            {
+                VerifyGetCommand(commandBuilder => commandBuilder.GetInsertCommand(useColumnsForParameterNames.Value));
+            }
+            else
+            {
+                VerifyGetCommand(commandBuilder => commandBuilder.GetInsertCommand());
+            }
+        }
+
+        [ConditionalTheory(typeof(DataTestUtility), nameof(DataTestUtility.AreConnStringsSetup), nameof(DataTestUtility.IsNotAzureSynapse))]
+        [InlineData(null)]
+        [InlineData(false)]
+        [InlineData(true)]
+        public void VerifyUpdateCommand(bool? useColumnsForParameterNames)
+        {
+            if (useColumnsForParameterNames.HasValue)
+            {
+                VerifyGetCommand(commandBuilder => commandBuilder.GetUpdateCommand(useColumnsForParameterNames.Value));
             }
+            else
+            {
+                VerifyGetCommand(commandBuilder => commandBuilder.GetUpdateCommand());
+            }
+        }
+
+        private static void VerifyGetCommand(Func<SqlCommandBuilder, SqlCommand> getFunc)
+        {
+            // Arrange
+            using SqlConnection connection = new SqlConnection(DataTestUtility.TCPConnectionString);
+            connection.Open();
+
+            using SqlDataAdapter dataAdapter = new SqlDataAdapter("SELECT * FROM dbo.Customers", connection);
+            using SqlCommandBuilder commandBuilder = new SqlCommandBuilder(dataAdapter);
+
+            // Act
+            using SqlCommand command = getFunc(commandBuilder);
+
+            // Assert
+            Assert.NotNull(command);
         }
 
         #region Utility_Methods