Regenerate test files

riok · Nov 20, 2023 · d259502 · d259502
1 parent 3217885
commit d259502
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 74 deletions.
diff --git a/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyFlatteningTest.cs b/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyFlatteningTest.cs
@@ -134,9 +134,9 @@ public void AutoFlattenedPropertyNullablePath()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.ValueId = source.Value.Id;
+                    target.ValueId = sourceValue.Id;
                 }
                 return target;
                 """
@@ -160,10 +160,10 @@ public void AutoFlattenedMultiplePropertiesNullablePath()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.ValueId = source.Value.Id.ToString();
-                    target.ValueName = source.Value.Name;
+                    target.ValueId = sourceValue.Id.ToString();
+                    target.ValueName = sourceValue.Name;
                 }
                 return target;
                 """
@@ -186,9 +186,9 @@ public void AutoFlattenedPropertyNullableValueTypePath()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Id.Value != null)
+                if (source.Id.Value is { } sourceIdValue)
                 {
-                    target.IdValue = source.Id.Value.Value;
+                    target.IdValue = sourceIdValue;
                 }
                 return target;
                 """
@@ -211,9 +211,9 @@ public void AutoFlattenedPropertyNullableValueTypePathShouldResolve()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Prop != null)
+                if (source.Prop is { } sourceProp)
                 {
-                    target.PropInteger = source.Prop.Value.Integer.ToString();
+                    target.PropInteger = sourceProp.Integer.ToString();
                 }
                 return target;
                 """
@@ -260,9 +260,9 @@ public void AutoFlattenedMultiplePropertiesPathDisabledNullable()
                 if (source == null)
                     return default;
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.ValueId = source.Value.Id.ToString();
+                    target.ValueId = sourceValue.Id.ToString();
                 }
                 target.ValueName = source.Value?.Name;
                 return target;
@@ -489,10 +489,12 @@ public Task ManualUnflattenedPropertyTargetPropertyNotFoundShouldDiagnostic()
     public void ManualNestedPropertyNullablePath()
     {
         var source = TestSourceBuilder.MapperWithBodyAndTypes(
-            "[MapProperty(\"Value1.Value1.Id1\", \"Value2.Value2.Id2\")]"
-                + "[MapProperty(\"Value1.Value1.Id10\", \"Value2.Value2.Id20\")]"
-                + "[MapProperty(new[] { \"Value1\", \"Id100\" }, new[] { \"Value2\", \"Id200\" })]"
-                + "partial B Map(A source);",
+            """
+            [MapProperty("Value1.Value1.Id1", "Value2.Value2.Id2")]
+            [MapProperty("Value1.Value1.Id10", "Value2.Value2.Id20")]
+            [MapProperty(new[] { "Value1", "Id100" }, new[] { "Value2", "Id200" })]
+            partial B Map(A source);
+            """,
             "class A { public C? Value1 { get; set; } }",
             "class B { public E? Value2 { get; set; } }",
             "class C { public D? Value1 { get; set; } public string Id100 { get; set; } }",
@@ -507,16 +509,16 @@ public void ManualNestedPropertyNullablePath()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value1 != null)
+                if (source.Value1 is { } sourceValue1)
                 {
                     target.Value2 ??= new();
-                    if (source.Value1.Value1 != null)
+                    if (sourceValue1.Value1 is { } sourceValue1Value1)
                     {
                         target.Value2.Value2 ??= new();
-                        target.Value2.Value2.Id2 = source.Value1.Value1.Id1;
-                        target.Value2.Value2.Id20 = source.Value1.Value1.Id10;
+                        target.Value2.Value2.Id2 = sourceValue1Value1.Id1;
+                        target.Value2.Value2.Id20 = sourceValue1Value1.Id10;
                     }
-                    target.Value2.Id200 = source.Value1.Id100;
+                    target.Value2.Id200 = sourceValue1.Id100;
                 }
                 return target;
                 """

diff --git a/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyNullableTest.cs b/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyNullableTest.cs
@@ -41,9 +41,9 @@ public void NullableIntToNonNullableIntProperty()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value.Value;
+                    target.Value = sourceValue;
                 }
                 return target;
                 """
@@ -70,9 +70,9 @@ TestSourceBuilderOptions.Default with
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value.Value;
+                    target.Value = sourceValue;
                 }
                 return target;
                 """
@@ -100,9 +100,9 @@ TestSourceBuilderOptions.Default with
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value.Value;
+                    target.Value = sourceValue;
                 }
                 else
                 {
@@ -129,9 +129,9 @@ public void NullableStringToNonNullableStringProperty()
             .HaveSingleMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value;
+                    target.Value = sourceValue;
                 }
                 return target;
                 """
@@ -156,9 +156,9 @@ public void NullableClassToNonNullableClassProperty()
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 return target;
                 """
@@ -207,9 +207,9 @@ TestSourceBuilderOptions.Default with
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value;
+                    target.Value = sourceValue;
                 }
                 return target;
                 """
@@ -237,9 +237,9 @@ TestSourceBuilderOptions.Default with
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = source.Value;
+                    target.Value = sourceValue;
                 }
                 else
                 {
@@ -315,9 +315,9 @@ public void NullableClassToNullableClassProperty()
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 return target;
                 """
@@ -346,9 +346,9 @@ TestSourceBuilderOptions.Default with
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 return target;
                 """
@@ -378,9 +378,9 @@ TestSourceBuilderOptions.Default with
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 else
                 {
@@ -409,9 +409,9 @@ public void DisabledNullableClassPropertyToNonNullableProperty()
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 return target;
                 """
@@ -436,9 +436,9 @@ public void NullableClassPropertyToDisabledNullableProperty()
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 return target;
                 """
@@ -467,9 +467,9 @@ TestSourceBuilderOptions.Default with
             .HaveMapMethodBody(
                 """
                 var target = new global::B();
-                if (source.Value != null)
+                if (source.Value is { } sourceValue)
                 {
-                    target.Value = MapToD(source.Value);
+                    target.Value = MapToD(sourceValue);
                 }
                 else
                 {
@@ -569,9 +569,9 @@ public void ShouldUseUserImplementedMappingWithNonNullableValueType()
                 if (y == null)
                     return default;
                 var target = new global::NotNullableType();
-                if (y.Test != null)
+                if (y.Test is { } yTest)
                 {
-                    target.Test = Map(y.Test.Value);
+                    target.Test = Map(yTest);
                 }
                 return target;
                 """

diff --git a/.../_snapshots/EnumerableTest.ArrayToCollectionShouldUpgradeNullability#Mapper.g.verified.cs b/.../_snapshots/EnumerableTest.ArrayToCollectionShouldUpgradeNullability#Mapper.g.verified.cs
@@ -8,9 +8,9 @@ public partial class Mapper
         if (source == null)
             return default;
         var target = new global::B();
-        if (source.Value != null)
+        if (source.Value is { } sourceValue)
         {
-            target.Value = MapToICollection(source.Value);
+            target.Value = MapToICollection(sourceValue);
         }
         return target;
     }

diff --git a/...ots/EnumerableTest.ArrayToReadOnlyCollectionShouldUpgradeNullability#Mapper.g.verified.cs b/...ots/EnumerableTest.ArrayToReadOnlyCollectionShouldUpgradeNullability#Mapper.g.verified.cs
@@ -8,9 +8,9 @@ public partial class Mapper
         if (source == null)
             return default;
         var target = new global::B();
-        if (source.Value != null)
+        if (source.Value is { } sourceValue)
         {
-            target.Value = MapToIReadOnlyCollection(source.Value);
+            target.Value = MapToIReadOnlyCollection(sourceValue);
         }
         return target;
     }

diff --git a/...numerableTest.CollectionToReadOnlyCollectionShouldUpgradeNullability#Mapper.g.verified.cs b/...numerableTest.CollectionToReadOnlyCollectionShouldUpgradeNullability#Mapper.g.verified.cs
@@ -8,9 +8,9 @@ public partial class Mapper
         if (source == null)
             return default;
         var target = new global::B();
-        if (source.Value != null)
+        if (source.Value is { } sourceValue)
         {
-            target.Value = MapToIReadOnlyCollection(source.Value);
+            target.Value = MapToIReadOnlyCollection(sourceValue);
         }
         return target;
     }
@@ -26,4 +26,4 @@ public partial class Mapper
         }
         return target;
     }
-}
+}
diff --git a/...Test.ShouldUpgradeNullabilityInDisabledNullableContextInSelectClause#Mapper.g.verified.cs b/...Test.ShouldUpgradeNullabilityInDisabledNullableContextInSelectClause#Mapper.g.verified.cs
@@ -8,9 +8,9 @@ public partial class Mapper
         if (source == null)
             return default;
         var target = new global::B();
-        if (source.Value != null)
+        if (source.Value is { } sourceValue)
         {
-            target.Value = MapToDArray(source.Value);
+            target.Value = MapToDArray(sourceValue);
         }
         return target;
     }
@@ -33,4 +33,4 @@ public partial class Mapper
         }
         return target;
     }
-}
+}
diff --git a/...st.NullableIntWithAdditionalFlattenedValueToNonNullableIntProperties#Mapper.g.verified.cs b/...st.NullableIntWithAdditionalFlattenedValueToNonNullableIntProperties#Mapper.g.verified.cs
@@ -6,24 +6,24 @@ public partial class Mapper
     private partial global::B Map(global::A source)
     {
         var target = new global::B();
-        if (source.Nested != null)
+        if (source.Nested is { } sourceNested)
         {
-            if (source.Nested.Value2 != null)
+            if (sourceNested.Value2 is { } sourceNestedValue2)
             {
-                target.NestedValue2 = source.Nested.Value2.Value;
+                target.NestedValue2 = sourceNestedValue2;
             }
-            target.Nested = MapToD(source.Nested);
+            target.Nested = MapToD(sourceNested);
         }
         return target;
     }
 
     private global::D MapToD(global::C source)
     {
         var target = new global::D();
-        if (source.Value1 != null)
+        if (source.Value1 is { } sourceValue1)
         {
-            target.Value1 = source.Value1.Value;
+            target.Value1 = sourceValue1;
         }
         return target;
     }
-}
+}
diff --git a/...st.ShouldUpgradeNullabilityInDisabledNullableContextInNestedProperty#Mapper.g.verified.cs b/...st.ShouldUpgradeNullabilityInDisabledNullableContextInNestedProperty#Mapper.g.verified.cs
@@ -8,9 +8,9 @@ public partial class Mapper
         if (source == null)
             return default;
         var target = new global::B();
-        if (source.Value != null)
+        if (source.Value is { } sourceValue)
         {
-            target.Value = MapToD(source.Value);
+            target.Value = MapToD(sourceValue);
         }
         return target;
     }
@@ -21,4 +21,4 @@ public partial class Mapper
         target.Value = source.Value;
         return target;
     }
-}
+}
diff --git a/...ProjectionNullableTest.ClassToClassNullableSourcePathManuallyFlatten#Mapper.g.verified.cs b/...ProjectionNullableTest.ClassToClassNullableSourcePathManuallyFlatten#Mapper.g.verified.cs
@@ -16,10 +16,10 @@ public partial class Mapper
     private partial global::B Map(global::A source)
     {
         var target = new global::B();
-        if (source.Nested?.Nested2 != null)
+        if (source.Nested?.Nested2 is { } sourceNestedNested2)
         {
-            target.NestedValue4 = source.Nested.Nested2.Value3;
+            target.NestedValue4 = sourceNestedNested2.Value3;
         }
         return target;
     }
-}
+}