Skip to content

Commit b11e8d1

Browse files
BlaiseDBlaiseD
authored
CodeQL maintainability fixes. (#193)
1 parent 5f31111 commit b11e8d1

8 files changed

Lines changed: 29 additions & 30 deletions

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyFromChildReferenceWithoutMemberExpression.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ public void Can_map_parameter_body_from_child_reference_without_member_expressio
2424
config.AssertConfigurationIsValid();
2525
var mapper = config.CreateMapper();
2626

27-
var products = new List<TestProduct>() {
28-
new() { }
29-
}.AsQueryable();
30-
3127
//Act
3228
Expression<Func<TestProductDTO, bool>> expr = x => x.Brand == 2;
3329
var mappedExpression = mapper.MapExpression<Expression<Func<TestProduct, bool>>>(expr);

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/CanMapParameterBodyWithoutMemberExpression.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ public void Can_map_parameter_body_without_member_expression()
2121
config.AssertConfigurationIsValid();
2222
var mapper = config.CreateMapper();
2323

24-
var products = new List<TestProduct>() {
25-
new() { }
26-
}.AsQueryable();
27-
2824
//Act
2925
Expression<Func<TestProductDTO, bool>> expr = x => x.Brand == 2;
3026
var mappedExpression = mapper.MapExpression<Expression<Func<TestProduct, bool>>>(expr);

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ExpressionConversion.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public void Can_map_unary_expression_converting_enum_to_int()
7272
};
7373

7474
var items2 = items.AsQueryable().Select(mapped).ToList();
75+
Assert.NotNull(items2);
7576
}
7677

7778
[Fact]
@@ -178,6 +179,7 @@ public void Can_map_with_different_destination_types()
178179
};
179180

180181
var items2 = items.AsQueryable().Select(mapped).ToList();
182+
Assert.NotNull(items2);
181183
}
182184
}
183185
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public void Should_Map_Expressions_UsingExpressions()
3939
{
4040
var source = new SourceExpressionHolder() { Expression = p => p.Child != null };
4141
var dest = Mapper.Map<DestExpressionHolder>(source);
42+
Assert.NotNull(dest);
4243
}
4344
}
4445

@@ -154,7 +155,9 @@ public void GrandParent_Mapping_To_Sub_Sub_Property_Condition2()
154155
Expression<Func<IQueryable<GrandParentDTO>, bool>> _predicateExpression = gps => gps.Any(gp => gp.Parent.Children.Any(c => c.ID_ == 3));
155156
Expression<Func<IQueryable<GrandParentDTO>, IQueryable<GrandParentDTO>>> _predicateExpression2 = gps => gps.Where(gp => gp.Parent.Children.Any(c => c.ID_ == 3));
156157
var expression = Mapper.Map<Expression<Func<IQueryable<GrandParent>, bool>>>(_predicateExpression);
157-
var expression2 = Mapper.Map<Expression<Func<IQueryable<GrandParent>, IQueryable<GrandParent>>>>(_predicateExpression2);
158+
var expression1 = Mapper.Map<Expression<Func<IQueryable<GrandParent>, IQueryable<GrandParent>>>>(_predicateExpression2);
159+
expression.ShouldNotBeNull();
160+
expression1.ShouldNotBeNull();
158161
When_Use_Outside_Class_Method_Call();
159162
}
160163

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public void BinaryExpressionPartialTranslation()
284284
}
285285

286286
Expression<Func<ComplexEntityDto, bool>> translatedExpression =
287-
translatedExpression = x =>
287+
x =>
288288
x.intToEnum == SimpleEnumInt.Value2
289289
&& x.intToInt == (int)SimpleEnumInt.Value1
290290
&& x.enumToEnum == SimpleEnumInt.Value3

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Impl/SourceInjectedQuery.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it()
111111
{
112112
var result = _source.AsQueryable()
113113
.UseAsDataSource(Mapper).For<Destination>()
114-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
114+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
115115
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
116116
.OrderByDescending(s => s.DestValue).Select(s => s.DestValue);
117117

@@ -123,7 +123,7 @@ public void Shoud_support_string_return_type()
123123
{
124124
var result = _source.AsQueryable()
125125
.UseAsDataSource(Mapper).For<Destination>()
126-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
126+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
127127
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
128128
.OrderByDescending(s => s.DestValue).Select(s => s.StringValue);
129129

@@ -134,7 +134,7 @@ public void Shoud_support_enumerable_return_type()
134134
{
135135
var result = _source.AsQueryable()
136136
.UseAsDataSource(Mapper).For<Destination>()
137-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
137+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
138138
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
139139
.OrderByDescending(s => s.DestValue).Select(s => s.Strings);
140140

@@ -154,7 +154,7 @@ public void Shoud_support_enumerable_return_type_with_result()
154154

155155
var result = source.AsQueryable()
156156
.UseAsDataSource(Configuration).For<Destination>()
157-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
157+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
158158
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 5).Take(2)
159159
.OrderByDescending(s => s.DestValue).Select(s => s.Strings);
160160

@@ -168,7 +168,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_with_annonumus_ty
168168
{
169169
var result = _source.AsQueryable()
170170
.UseAsDataSource(Mapper).For<Destination>()
171-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
171+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
172172
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
173173
.OrderByDescending(s => s.DestValue).Select(s => new { A = s.DestValue });
174174

@@ -227,7 +227,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_toList()
227227
{
228228
var result = _source.AsQueryable()
229229
.UseAsDataSource(Configuration).For<Destination>()
230-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
230+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
231231
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
232232
.OrderByDescending(s => s.DestValue).Select(s => s.DestValue);
233233

@@ -240,7 +240,7 @@ public void Shoud_support_string_return_type_toList()
240240
{
241241
var result = _source.AsQueryable()
242242
.UseAsDataSource(Configuration).For<Destination>()
243-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
243+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
244244
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
245245
.OrderByDescending(s => s.DestValue).Select(s => s.StringValue);
246246

@@ -257,7 +257,7 @@ public void Shoud_support_enumerable_return_type_toList()
257257

258258
var result = _source.AsQueryable()
259259
.UseAsDataSource(Configuration).For<Destination>()
260-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
260+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
261261
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
262262
.OrderByDescending(s => s.DestValue).Select(s => s.Strings);
263263

@@ -277,7 +277,7 @@ public void Shoud_support_enumerable_return_type_with_result_toList()
277277

278278
var result = source.AsQueryable()
279279
.UseAsDataSource(Configuration).For<Destination>()
280-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
280+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
281281
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 5).Take(2)
282282
.OrderByDescending(s => s.DestValue).Select(s => s.Strings);
283283

@@ -297,7 +297,7 @@ public void Shoud_support_any_stupid_thing_you_can_throw_at_it_with_annonumus_ty
297297
{
298298
var result = _source.AsQueryable()
299299
.UseAsDataSource(Configuration).For<Destination>()
300-
.Where(s => true && 5.ToString() == "5" && s.DestValue.ToString() != "0")
300+
.Where(s => 5.ToString() == "5" && s.DestValue.ToString() != "0")
301301
.OrderBy(s => s.DestValue).SkipWhile(d => d.DestValue < 7).Take(1)
302302
.OrderByDescending(s => s.DestValue).Select(s => new { A = s.DestValue });
303303

@@ -518,6 +518,7 @@ public void SupportsParmeterization_DoesNotCacheParameter()
518518
var result = source.UseAsDataSource(mapper).For<DestWithParams>(new Dictionary<string, object> { { "value", 15 } }).ToArray();
519519

520520
// Assert
521+
result1.ShouldNotBeNull();
521522
result.ShouldNotBeNull();
522523
result.ShouldNotBeEmpty();
523524
result.Single().Value.ShouldBe(20);

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/ShouldThrowInvalidOperationExceptionForUnmatchedLiterals.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void ThrowsCreatingBinaryExpressionCombiningNullableParameterWithNonNulla
8181
ParameterExpression productParam = Expression.Parameter(typeof(Product), "x");
8282
MemberExpression property = Expression.MakeMemberAccess(productParam, AutoMapper.Internal.TypeExtensions.GetFieldOrProperty(typeof(Product), memberName));
8383

84-
var ex = Assert.Throws<InvalidOperationException>
84+
Assert.Throws<InvalidOperationException>
8585
(
8686
() => Expression.Lambda<Func<Product, bool>>
8787
(

‎tests/AutoMapper.Extensions.ExpressionMapping.UnitTests/Structures/DeclaringMemberKeyTest.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,43 @@ public void Constructor_InitializesPropertiesCorrectly()
3636
#region Equals Tests
3737

3838
[Fact]
39-
public void Equals_SameReference_ReturnsTrue()
39+
public void Equals_NullObject_ReturnsFalse()
4040
{
4141
// Arrange
4242
var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1);
4343

4444
// Act
45-
var result = key.Equals(key);
45+
var result = key.Equals((object)null);
4646

4747
// Assert
48-
Assert.True(result);
48+
Assert.False(result);
4949
}
5050

5151
[Fact]
52-
public void Equals_NullObject_ReturnsFalse()
52+
public void Equals_NullDeclaringMemberKey_ReturnsFalse()
5353
{
5454
// Arrange
5555
var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1);
5656

5757
// Act
58-
var result = key.Equals((object)null);
58+
var result = key.Equals((DeclaringMemberKey)null);
5959

6060
// Assert
6161
Assert.False(result);
6262
}
6363

6464
[Fact]
65-
public void Equals_NullDeclaringMemberKey_ReturnsFalse()
65+
public void Equals_SameValues_ReturnsTrue()
6666
{
6767
// Arrange
68-
var key = new DeclaringMemberKey(_testMemberInfo1, TestFullName1);
68+
var key1 = new DeclaringMemberKey(_testMemberInfo1, TestFullName1);
69+
var key2 = new DeclaringMemberKey(_testMemberInfo1, TestFullName1);
6970

7071
// Act
71-
var result = key.Equals((DeclaringMemberKey)null);
72+
var result = key1.Equals(key2);
7273

7374
// Assert
74-
Assert.False(result);
75+
Assert.True(result);
7576
}
7677

7778
[Fact]

0 commit comments

Comments
 (0)