CodeQL maintainability fixes.

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<TestProduct>() {
-                new() { }
-              }.AsQueryable();
-
             //Act
             Expression<Func<TestProductDTO, bool>> expr = x => x.Brand == 2;
             var mappedExpression = mapper.MapExpression<Expression<Func<TestProduct, bool>>>(expr);

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<TestProduct>() {
-                new() { }
-              }.AsQueryable();
-
             //Act
             Expression<Func<TestProductDTO, bool>> expr = x => x.Brand == 2;
             var mappedExpression = mapper.MapExpression<Expression<Func<TestProduct, bool>>>(expr);

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);
         }
     }
 }

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<DestExpressionHolder>(source);
+            Assert.NotNull(dest);
         }
     }
 
@@ -154,7 +155,9 @@ public void GrandParent_Mapping_To_Sub_Sub_Property_Condition2()
             Expression<Func<IQueryable<GrandParentDTO>, bool>> _predicateExpression = gps => gps.Any(gp => gp.Parent.Children.Any(c => c.ID_ == 3));
             Expression<Func<IQueryable<GrandParentDTO>, IQueryable<GrandParentDTO>>> _predicateExpression2 = gps => gps.Where(gp => gp.Parent.Children.Any(c => c.ID_ == 3));
             var expression = Mapper.Map<Expression<Func<IQueryable<GrandParent>, bool>>>(_predicateExpression);
-            var expression2 = Mapper.Map<Expression<Func<IQueryable<GrandParent>, IQueryable<GrandParent>>>>(_predicateExpression2);
+            var expression1 = Mapper.Map<Expression<Func<IQueryable<GrandParent>, IQueryable<GrandParent>>>>(_predicateExpression2);
+            expression.ShouldNotBeNull();
+            expression1.ShouldNotBeNull();
             When_Use_Outside_Class_Method_Call();
         }
 

tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionMappingEnumToNumericOrString.cs

@@ -284,7 +284,7 @@ public void BinaryExpressionPartialTranslation()
             }
 
             Expression<Func<ComplexEntityDto, bool>> translatedExpression =
-                translatedExpression = x =>
+                x =>
                 x.intToEnum == SimpleEnumInt.Value2
                 && x.intToInt == (int)SimpleEnumInt.Value1
                 && x.enumToEnum == SimpleEnumInt.Value3

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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<Destination>()
-              .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<DestWithParams>(new Dictionary<string, object> { { "value", 15 } }).ToArray();
 
             // Assert
+            result1.ShouldNotBeNull();
             result.ShouldNotBeNull();
             result.ShouldNotBeEmpty();
             result.Single().Value.ShouldBe(20);

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<InvalidOperationException>
+            Assert.Throws<InvalidOperationException>
             (
                 () => Expression.Lambda<Func<Product, bool>>
                 (

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]