From 469b8ce0eeb85943c63f2987807279989275fc4c Mon Sep 17 00:00:00 2001 From: Blaise Taylor Date: Fri, 20 Feb 2026 15:52:41 -0500 Subject: [PATCH] CodeQL maintainability fixes. --- ...omChildReferenceWithoutMemberExpression.cs | 4 ---- ...MapParameterBodyWithoutMemberExpression.cs | 4 ---- .../ExpressionConversion.cs | 2 ++ .../ExpressionMapping.cs | 5 ++++- .../ExpressionMappingEnumToNumericOrString.cs | 2 +- .../Impl/SourceInjectedQuery.cs | 21 ++++++++++--------- ...dOperationExceptionForUnmatchedLiterals.cs | 2 +- .../Structures/DeclaringMemberKeyTest.cs | 19 +++++++++-------- 8 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs index 11fe968..dd90729 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs @@ -24,10 +24,6 @@ public void Can_map_parameter_body_from_child_reference_without_member_expressio config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); - var products = new List() { - new() { } - }.AsQueryable(); - //Act Expression> expr = x => x.Brand == 2; var mappedExpression = mapper.MapExpression>>(expr); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs index 499109a..31cb1fb 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs @@ -21,10 +21,6 @@ public void Can_map_parameter_body_without_member_expression() config.AssertConfigurationIsValid(); var mapper = config.CreateMapper(); - var products = new List() { - new() { } - }.AsQueryable(); - //Act Expression> expr = x => x.Brand == 2; var mappedExpression = mapper.MapExpression>>(expr); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs index aa0a9b7..da5bd21 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs @@ -72,6 +72,7 @@ public void Can_map_unary_expression_converting_enum_to_int() }; var items2 = items.AsQueryable().Select(mapped).ToList(); + Assert.NotNull(items2); } [Fact] @@ -178,6 +179,7 @@ public void Can_map_with_different_destination_types() }; var items2 = items.AsQueryable().Select(mapped).ToList(); + Assert.NotNull(items2); } } } \ No newline at end of file diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs index 14a8ef6..6a562d9 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMapping.cs @@ -39,6 +39,7 @@ public void Should_Map_Expressions_UsingExpressions() { var source = new SourceExpressionHolder() { Expression = p => p.Child != null }; var dest = Mapper.Map(source); + Assert.NotNull(dest); } } @@ -154,7 +155,9 @@ public void GrandParent_Mapping_To_Sub_Sub_Property_Condition2() Expression, bool>> _predicateExpression = gps => gps.Any(gp => gp.Parent.Children.Any(c => c.ID_ == 3)); Expression, IQueryable>> _predicateExpression2 = gps => gps.Where(gp => gp.Parent.Children.Any(c => c.ID_ == 3)); var expression = Mapper.Map, bool>>>(_predicateExpression); - var expression2 = Mapper.Map, IQueryable>>>(_predicateExpression2); + var expression1 = Mapper.Map, IQueryable>>>(_predicateExpression2); + expression.ShouldNotBeNull(); + expression1.ShouldNotBeNull(); When_Use_Outside_Class_Method_Call(); } diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs index 2cba843..5ce7870 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs @@ -284,7 +284,7 @@ public void BinaryExpressionPartialTranslation() } Expression> translatedExpression = - translatedExpression = x => + x => x.intToEnum == SimpleEnumInt.Value2 && x.intToInt == (int)SimpleEnumInt.Value1 && x.enumToEnum == SimpleEnumInt.Value3 diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs index 30c6190..94aae4f 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs @@ -111,7 +111,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it() { var result = _source.AsQueryable() .UseAsDataSource(Mapper).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.DestValue); @@ -123,7 +123,7 @@ public void Shoud_support_string_return_type() { var result = _source.AsQueryable() .UseAsDataSource(Mapper).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.StringValue); @@ -134,7 +134,7 @@ public void Shoud_support_enumerable_return_type() { var result = _source.AsQueryable() .UseAsDataSource(Mapper).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.Strings); @@ -154,7 +154,7 @@ public void Shoud_support_enumerable_return_type_with_result() var result = source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 5).Take(2) .OrderByDescending(s => s.DestValue).Select(s => s.Strings); @@ -168,7 +168,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_with_annonumus_ty { var result = _source.AsQueryable() .UseAsDataSource(Mapper).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => new { A = s.DestValue }); @@ -227,7 +227,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_toList() { var result = _source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.DestValue); @@ -240,7 +240,7 @@ public void Shoud_support_string_return_type_toList() { var result = _source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.StringValue); @@ -257,7 +257,7 @@ public void Shoud_support_enumerable_return_type_toList() var result = _source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => s.Strings); @@ -277,7 +277,7 @@ public void Shoud_support_enumerable_return_type_with_result_toList() var result = source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 5).Take(2) .OrderByDescending(s => s.DestValue).Select(s => s.Strings); @@ -297,7 +297,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_with_annonumus_ty { var result = _source.AsQueryable() .UseAsDataSource(Configuration).For() - .Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0") + .Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0") .OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1) .OrderByDescending(s => s.DestValue).Select(s => new { A = s.DestValue }); @@ -518,6 +518,7 @@ public void SupportsParmeterization_DoesNotCacheParameter() var result = source.UseAsDataSource(mapper).For(new Dictionary { { "value", 15 } }).ToArray(); // Assert + result1.ShouldNotBeNull(); result.ShouldNotBeNull(); result.ShouldNotBeEmpty(); result.Single().Value.ShouldBe(20); diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldThrowInvalidOperationExceptionForUnmatchedLiterals.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldThrowInvalidOperationExceptionForUnmatchedLiterals.cs index 5d91e6d..0d02389 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldThrowInvalidOperationExceptionForUnmatchedLiterals.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldThrowInvalidOperationExceptionForUnmatchedLiterals.cs @@ -81,7 +81,7 @@ public void ThrowsCreatingBinaryExpressionCombiningNullableParameterWithNonNulla ParameterExpression productParam = Expression.Parameter(typeof(Product), "x"); MemberExpression property = Expression.MakeMemberAccess(productParam, AutoMapper.Internal.TypeExtensions.GetFieldOrProperty(typeof(Product), memberName)); - var ex = Assert.Throws + Assert.Throws ( () => Expression.Lambda> ( diff --git a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Structures/DeclaringMemberKeyTest.cs b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Structures/DeclaringMemberKeyTest.cs index 5e72693..e2c14cd 100644 --- a/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Structures/DeclaringMemberKeyTest.cs +++ b/tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Structures/DeclaringMemberKeyTest.cs @@ -36,42 +36,43 @@ public void Constructor_InitializesPropertiesCorrectly() #region Equals Tests [Fact] - public void Equals_SameReference_ReturnsTrue() + public void Equals_NullObject_ReturnsFalse() { // Arrange var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1); // Act - var result = key.Equals(key); + var result = key.Equals((object)null); // Assert - Assert.True(result); + Assert.False(result); } [Fact] - public void Equals_NullObject_ReturnsFalse() + public void Equals_NullDeclaringMemberKey_ReturnsFalse() { // Arrange var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1); // Act - var result = key.Equals((object)null); + var result = key.Equals((DeclaringMemberKey)null); // Assert Assert.False(result); } [Fact] - public void Equals_NullDeclaringMemberKey_ReturnsFalse() + public void Equals_SameValues_ReturnsTrue() { // Arrange - var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1); + var key1 = new DeclaringMemberKey(_testMemberInfo1, TestFullName1); + var key2 = new DeclaringMemberKey(_testMemberInfo1, TestFullName1); // Act - var result = key.Equals((DeclaringMemberKey)null); + var result = key1.Equals(key2); // Assert - Assert.False(result); + Assert.True(result); } [Fact]