Merge pull request #614 from FirelyTeam/613-fix-integration-test---sy…

…stemargumentexception-cannot-generate-a-hash-code-for-valuetuple3-arg_paramname_name 613 Fix CqlComparer for tuples
FirelyTeam · Dec 10, 2024 · 6ebc3ea · 6ebc3ea
2 parents 8315c1a + d837ca7
commit 6ebc3ea
Show file tree

Hide file tree

Showing 35 changed files with 438 additions and 314 deletions.
diff --git a/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs b/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs
@@ -261,7 +261,7 @@ private void WriteCqlTupleMetadataProperties(
             foreach (var (propertyName, signature) in tupleMetadataBuilder.GetAllTupleMetadataPropertySignatures())
             {
                 var types = string.Join(", ", signature.Select(t => $"typeof({_typeToCSharpConverter.ToCSharp(t.Type)})"));
-                var names = string.Join(", ", signature.Select(t => t.Name.QuoteString()));
+                var names = string.Join(", ", signature.Select(t => t.PropName.QuoteString()));
                 writer.WriteLine(indentLevel, $"private static CqlTupleMetadata {propertyName} = new(");
                 writer.WriteLine(indentLevel+1, $"[{types}],");
                 writer.WriteLine(indentLevel+1, $"[{names}]);");

diff --git a/Cql/CodeGeneration.NET/ExpressionToCSharpConverter.cs b/Cql/CodeGeneration.NET/ExpressionToCSharpConverter.cs
@@ -50,7 +50,7 @@ public Context WithOverride(Func<int, int>? indentFn = null, Func<bool, bool>? u
 
             public Context WithDoUseIndent() => WithOverride(useIndentFn: _ => true);
 
-            public string GetTupleMetadataPropertyName(IReadOnlyCollection<(string Name, Type Type)> tupleProperties) =>
+            public string GetTupleMetadataPropertyName(IReadOnlyCollection<(Type Type, string Name)> tupleProperties) =>
                 _tupleMetadataBuilder.GetTupleMetadataPropertyName(tupleProperties);
         }
 

diff --git a/Cql/CodeGeneration.NET/TupleMetadataBuilder.cs b/Cql/CodeGeneration.NET/TupleMetadataBuilder.cs
@@ -8,23 +8,22 @@
 using System;
 using System.Collections.Generic;
 using Hl7.Cql.Abstractions.Infrastructure;
-using Hl7.Cql.Runtime;
+using Hl7.Cql.Primitives;
 
 namespace Hl7.Cql.CodeGeneration.NET;
 
 internal class TupleMetadataBuilder
 {
-    private readonly Dictionary<string, IReadOnlyCollection<(string Name, Type Type)>> _signaturesByHash = new();
+    private readonly Dictionary<string, IReadOnlyCollection<(Type Type, string PropName)>> _signaturesByHash = new();
 
     public string GetTupleMetadataPropertyName(
-        IReadOnlyCollection<(string Name, Type Type)> tupleItemsSignature)
+        IReadOnlyCollection<(Type Type, string PropName)> tupleProps)
     {
-        var propName = CqlTupleMetadata.BuildSignatureHashString(tupleItemsSignature);
-        _signaturesByHash[propName] = tupleItemsSignature;
+        var propName = CqlTupleMetadata.BuildSignatureHashString(tupleProps, CqlTupleMetadata.PropertyPrefix);
+        _signaturesByHash[propName] = tupleProps;
         return propName;
     }
 
-    public IReadOnlyCollection<(string PropertyName, IReadOnlyCollection<(string Name, Type Type)> Signature)> GetAllTupleMetadataPropertySignatures() =>
-        _signaturesByHash
-            .SelectToArray(kv => (kv.Key, kv.Value));
+    public IReadOnlyCollection<(string PropertyName, IReadOnlyCollection<(Type Type, string PropName)> Signature)> GetAllTupleMetadataPropertySignatures() =>
+        _signaturesByHash.SelectToArray(kv => (kv.Key, kv.Value));
 }
diff --git a/Cql/CodeGeneration.NET/TypeToCSharpConverter.cs b/Cql/CodeGeneration.NET/TypeToCSharpConverter.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Hl7.Cql.Abstractions.Infrastructure;
+using Hl7.Cql.Primitives;
 
 namespace Hl7.Cql.CodeGeneration.NET;
 
@@ -35,18 +36,14 @@ private TextWriterFormattableString FormatTypeNameAsTuple(ITypeNameCSharpFormatC
         return formatTypeNameAsTuple;
     }
 
-    public IEnumerable<(string Name, Type Type)> GetTupleProperties(Type type)
+    public IEnumerable<(Type Type, string Name)> GetTupleProperties(Type type)
     {
-        var length = type.GetProperties().Length;
-        for (var i = 0; i < length; i++)
-        {
-            var prop = type.GetProperties()[i];
-            yield return (prop.Name, prop.PropertyType);
-        }
+        var properties = type.GetProperties();
+        return properties.Select(p => (p.PropertyType, p.Name));
     }
 
     public bool ShouldUseTupleType(Type type) =>
-        _useCSharpValueTuples && type.Name.StartsWith("Tuple_"); // REVIEW: This is a heuristic, and may not be correct in all cases.
+        _useCSharpValueTuples && type.IsTupleBaseType();
 
     public string ToCSharp(Type type)
     {

diff --git a/...ts/Infrastructure/CSharpFormatterTests.cs → ...ests/Abstractions/CSharpFormatterTests.cs b/...ts/Infrastructure/CSharpFormatterTests.cs → ...ests/Abstractions/CSharpFormatterTests.cs
@@ -10,7 +10,7 @@
 using Hl7.Cql.Compiler.Infrastructure;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace CoreTests.Infrastructure;
+namespace CoreTests.Abstractions;
 
 [TestClass]
 [TestCategory("UnitTest")]
@@ -83,7 +83,7 @@ public void TypeToCSharpString_ShouldReturnCorrectResults()
 
         Assert.AreEqual(
             expected: "System.Collections.Generic.IDictionary<, >",
-            actual: typeof(IDictionary<,>).ToCSharpString(typeFormatterOptions: new(NoGenericTypeParameterNames:true)));
+            actual: typeof(IDictionary<,>).ToCSharpString(typeFormatterOptions: new(NoGenericTypeParameterNames: true)));
 
         Assert.AreEqual(
             expected: "IDictionary<TKey, TValue>",
@@ -98,13 +98,13 @@ public void TypeToCSharpString_ShouldReturnCorrectResults()
                 typeFormatterOptions: new(
                         NoNamespaces: false,
                         UseKeywords: true,
-                        GenericArgumentTokens: CSharpTokens.GenericArguments with { Separator = ","})));
+                        GenericArgumentTokens: CSharpTokens.GenericArguments with { Separator = "," })));
 
         Assert.AreEqual(
-            expected: "CoreTests.Infrastructure.EmptyStruct+Nested1+Nested2",
+            expected: "CoreTests.Abstractions.EmptyStruct+Nested1+Nested2",
             actual: typeof(EmptyStruct.Nested1.Nested2).ToCSharpString(
                 typeFormatterOptions: new(
-                    NestedTypeSeparator:"+")));
+                    NestedTypeSeparator: "+")));
 
         Assert.AreEqual(
             expected: "System.Nullable<int>",
@@ -123,7 +123,7 @@ public void TypeToCSharpString_ShouldReturnCorrectResults()
     [TestMethod]
     public void MethodToCSharpString_GenericGenericDefinition_ShouldReturnCorrectResults()
     {
-        MethodInfo m = ReflectionUtility.GenericMethodDefinitionOf(fnToMethodCall: () => default(TypeExtensionsTests.INonGenericInterface)!.GenericMethod<decimal,int,TypeExtensionsTests.MyDerivedClass,char>(default!, default!, default!));
+        MethodInfo m = ReflectionUtility.GenericMethodDefinitionOf(fnToMethodCall: () => default(TypeExtensionsTests.INonGenericInterface)!.GenericMethod<decimal, int, TypeExtensionsTests.MyDerivedClass, char>(default!, default!, default!));
 
         Assert.AreEqual(
             expected: "IList<T> GenericMethod<T1, T2, T3, T>(T1 a, T2[] b, IEnumerable<T3>[] c)",
@@ -153,12 +153,12 @@ public void MethodToCSharpString_NonGeneric_ShouldReturnCorrectResults()
         tw = new TestTextWriter(new StringWriter());
         var methodCSharpFormat = new MethodCSharpFormat(
             MethodFormat: method => $"function {method.Name}{method.GenericArguments}{method.Parameters}: {method.ReturnType};",
-            ParameterFormat: new (
+            ParameterFormat: new(
                 ParameterFormat: parameter => $"{parameter.Name}: {parameter.Type}",
                 TypeFormat: new(
-                    UseKeywords:true,
-                    NoNamespaces:true)),
-            ParameterTokens: CSharpTokens.Parameters with { Separator = "; "}
+                    UseKeywords: true,
+                    NoNamespaces: true)),
+            ParameterTokens: CSharpTokens.Parameters with { Separator = "; " }
         );
         methodCSharpFormat.WriteTo(m, tw);
         Assert.AreEqual(

diff --git a/...sts/Infrastructure/TypeExtensionsTests.cs → ...Tests/Abstractions/TypeExtensionsTests.cs b/...sts/Infrastructure/TypeExtensionsTests.cs → ...Tests/Abstractions/TypeExtensionsTests.cs
@@ -5,7 +5,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #pragma warning disable CS8500 // This takes the address of, gets the size of, or declares a pointer to a managed type
 
-namespace CoreTests.Infrastructure;
+namespace CoreTests.Abstractions;
 
 
 [TestClass]
@@ -329,12 +329,12 @@ IList<T> GenericMethod<T1, T2, T3, T>(
             T1 a,
             T2[] b,
             IEnumerable<T3>[] c)
-            where T1: struct, IComparable
-            where T2: notnull, new()
-            where T3: class, new();
+            where T1 : struct, IComparable
+            where T2 : notnull, new()
+            where T3 : class, new();
     }
 
-    public abstract class MyGenericClassBase<T> :  IGenericInterface<T>
+    public abstract class MyGenericClassBase<T> : IGenericInterface<T>
     {
         public void Method(T value)
         {
@@ -359,9 +359,9 @@ public readonly record struct Nested1
     {
         public readonly record struct Nested2 { }
 
-        public readonly record struct GenericNested2<T1,T2> { }
+        public readonly record struct GenericNested2<T1, T2> { }
 
         public delegate TOut NestedFunc<in TIn, out TOut>(TIn input)
-            where TIn: notnull;
+            where TIn : notnull;
     };
 }
diff --git a/Cql/CoreTests/Fhir/DataSourceTests.cs b/Cql/CoreTests/Fhir/DataSourceTests.cs
@@ -46,7 +46,6 @@ public void FiltersOnDefaultProp()
         }
 
         [TestMethod]
-        [Ignore("Will be fixed in PR 614")]
         public void FiltersOnSpecificProp()
         {
             var dr = buildDataSource();

diff --git a/Cql/CoreTests/Primitives/TypeExtensionsTests.cs b/Cql/CoreTests/Primitives/TypeExtensionsTests.cs
@@ -0,0 +1,65 @@
+using System;
+using Hl7.Cql.Primitives;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CoreTests.Primitives;
+
+[TestClass]
+public class TypeExtensionsTests
+{
+    [TestMethod]
+    public void IsCqlInterval_ShouldReturnTrueAndSetElementType_WhenTypeIsCqlInterval()
+    {
+        // Arrange
+        Type type = typeof(CqlInterval<int>);
+        Type elementType;
+
+        // Act
+        bool result = type.IsCqlInterval(out elementType);
+
+        // Assert
+        Assert.IsTrue(result);
+        Assert.AreEqual(typeof(int), elementType);
+    }
+
+    [TestMethod]
+    public void IsCqlInterval_ShouldReturnFalseAndSetElementTypeToNull_WhenTypeIsNotCqlInterval()
+    {
+        // Arrange
+        Type type = typeof(string);
+        Type elementType;
+
+        // Act
+        bool result = type.IsCqlInterval(out elementType);
+
+        // Assert
+        Assert.IsFalse(result);
+        Assert.IsNull(elementType);
+    }
+
+    [TestMethod]
+    public void IsCqlValueTuple_ShouldReturnTrue_WhenTypeIsCqlValueTuple()
+    {
+        // Arrange
+        Type type = typeof(ValueTuple<CqlTupleMetadata, int>);
+
+        // Act
+        bool result = type.IsCqlValueTuple();
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    public void IsCqlValueTuple_ShouldReturnFalse_WhenTypeIsNotCqlValueTuple()
+    {
+        // Arrange
+        Type type = typeof(string);
+
+        // Act
+        bool result = type.IsCqlValueTuple();
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+}
diff --git a/Cql/CoreTests/Tuples/CqlTupleTests.cs b/Cql/CoreTests/Tuples/CqlTupleTests.cs
@@ -3,11 +3,11 @@
 using System.Text.Json;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Hl7.Cql.Fhir;
-using Hl7.Cql.Runtime;
 using Hl7.Cql.Runtime.Serialization;
 using System.IO;
 using System.Runtime.Loader;
 using Hl7.Cql.Packaging;
+using Hl7.Cql.Primitives;
 
 namespace CoreTests.Tuples;
 

diff --git a/Cql/Cql.Abstractions/Cql.Abstractions.csproj b/Cql/Cql.Abstractions/Cql.Abstractions.csproj
@@ -11,13 +11,17 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\Iso8601\Iso8601.csproj" />
-		<InternalsVisibleTo Include="Hl7.Cql.Conversion" Key="$(LibraryPKHash)" />
+		<ProjectReference Include="..\Iso8601\Iso8601.csproj" />
+  </ItemGroup>
+
+	<ItemGroup>
+	  <InternalsVisibleTo Include="Hl7.Cql.Conversion" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Packager" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.MultiPackager" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Fhir" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Model" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Runtime" Key="$(LibraryPKHash)" />
+		<InternalsVisibleTo Include="Hl7.Cql.Primitives" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Compiler" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Operators" Key="$(LibraryPKHash)" />
 		<InternalsVisibleTo Include="Hl7.Cql.Comparers" Key="$(LibraryPKHash)" />

diff --git a/Cql/Cql.Abstractions/Infrastructure/TypeExtensions.cs b/Cql/Cql.Abstractions/Infrastructure/TypeExtensions.cs
@@ -7,7 +7,6 @@
  */
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;