Skip to content

Commit a68fe51

Browse files
FantasyTeddyFantasyTeddy
committed
Fix nullability warnings in tests
1 parent 096f368 commit a68fe51

File tree

4 files changed

+32
-52
lines changed

4 files changed

+32
-52
lines changed

‎PostgrestTests/ClientTests.cs‎

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,21 @@ public void TestQueryParams()
3939
}
4040
});
4141

42-
Assert.AreEqual($"{BaseUrl}/users?some-param=foo&other-param=bar",
43-
(client.Table<User>() as Table<User>)!.GenerateUrl());
42+
Assert.AreEqual($"{BaseUrl}/users?some-param=foo&other-param=bar", client.Table<User>().GenerateUrl());
4443
}
4544

4645
[TestMethod("will use TableAttribute")]
4746
public void TestTableAttribute()
4847
{
4948
var client = new Client(BaseUrl);
50-
Assert.AreEqual($"{BaseUrl}/users", (client.Table<User>() as Table<User>)!.GenerateUrl());
49+
Assert.AreEqual($"{BaseUrl}/users", client.Table<User>().GenerateUrl());
5150
}
5251

5352
[TestMethod("will default to Class.name in absence of TableAttribute")]
5453
public void TestTableAttributeDefault()
5554
{
5655
var client = new Client(BaseUrl);
57-
Assert.AreEqual($"{BaseUrl}/Stub", (client.Table<Stub>() as Table<Stub>)!.GenerateUrl());
56+
Assert.AreEqual($"{BaseUrl}/Stub", client.Table<Stub>().GenerateUrl());
5857
}
5958

6059
[TestMethod("will set header from options")]
@@ -76,7 +75,7 @@ public void TestQueryApiKey()
7675
{ "apikey", "some-key" }
7776
}
7877
});
79-
Assert.AreEqual($"{BaseUrl}/users?apikey=some-key", (client.Table<User>() as Table<User>)!.GenerateUrl());
78+
Assert.AreEqual($"{BaseUrl}/users?apikey=some-key", client.Table<User>().GenerateUrl());
8079
}
8180

8281
[TestMethod("filters: simple")]
@@ -97,7 +96,7 @@ public void TestFiltersSimple()
9796
foreach (var pair in dict)
9897
{
9998
var filter = new QueryFilter("foo", pair.Key, "bar");
100-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
99+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
101100
Assert.AreEqual("foo", result.Key);
102101
Assert.AreEqual(pair.Value, result.Value);
103102
}
@@ -116,7 +115,7 @@ public void TestFiltersLike()
116115
foreach (var pair in dict)
117116
{
118117
var filter = new QueryFilter("foo", pair.Key, "%bar%");
119-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
118+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
120119
Assert.AreEqual("foo", result.Key);
121120
Assert.AreEqual(pair.Value, result.Value);
122121
}
@@ -141,7 +140,7 @@ public void TestFiltersArraysWithLists()
141140
{
142141
var list = new List<object> { "bar", "buzz" };
143142
var filter = new QueryFilter("foo", pair.Key, list);
144-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
143+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
145144
Assert.AreEqual("foo", result.Key);
146145
Assert.AreEqual(pair.Value, result.Value);
147146
}
@@ -168,7 +167,7 @@ public void TestFiltersContainsArraysWithLists()
168167
{
169168
var list = new List<object> { "bar", "buzz" };
170169
var filter = new QueryFilter("foo", pair.Key, list);
171-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
170+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
172171
Assert.AreEqual("foo", result.Key);
173172
Assert.AreEqual(pair.Value, result.Value);
174173
}
@@ -192,7 +191,7 @@ public void TestFiltersArraysWithDictionaries()
192191
{
193192
var value = new Dictionary<string, object> { { "bar", 100 }, { "buzz", "zap" } };
194193
var filter = new QueryFilter("foo", pair.Key, value);
195-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
194+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
196195
Assert.AreEqual("foo", result.Key);
197196
Assert.AreEqual(pair.Value, result.Value);
198197
}
@@ -217,7 +216,7 @@ public void TestFiltersFullTextSearch()
217216
{
218217
var config = new FullTextSearchConfig("bar", "english");
219218
var filter = new QueryFilter("foo", pair.Key, config);
220-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
219+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
221220
Assert.AreEqual("foo", result.Key);
222221
Assert.AreEqual(pair.Value, result.Value);
223222
}
@@ -242,7 +241,7 @@ public void TestFiltersRanges()
242241
{
243242
var config = new IntRange(2, 3);
244243
var filter = new QueryFilter("foo", pair.Key, config);
245-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
244+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
246245
Assert.AreEqual("foo", result.Key);
247246
Assert.AreEqual(pair.Value, result.Value);
248247
}
@@ -254,7 +253,7 @@ public void TestFiltersNot()
254253
var client = new Client(BaseUrl);
255254
var filter = new QueryFilter("foo", Operator.Equals, "bar");
256255
var notFilter = new QueryFilter(Operator.Not, filter);
257-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(notFilter);
256+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(notFilter);
258257

259258
Assert.AreEqual("foo", result.Key);
260259
Assert.AreEqual("not.eq.bar", result.Value);
@@ -281,7 +280,7 @@ public void TestFiltersAndOr()
281280
foreach (var pair in dict)
282281
{
283282
var filter = new QueryFilter(pair.Key, filters);
284-
var result = (client.Table<User>() as Table<User>)!.PrepareFilter(filter);
283+
var result = ((Table<User>)client.Table<User>()).PrepareFilter(filter);
285284
Assert.AreEqual(pair.Value, $"{result.Key}={result.Value}");
286285
}
287286
}
@@ -293,21 +292,20 @@ public async Task TestBasicUpdate()
293292

294293
var user = await client.Table<User>().Filter("username", Operator.Equals, "supabot").Single();
295294

296-
if (user != null)
297-
{
298-
// Update user status
299-
user.Status = "OFFLINE";
300-
var response = await user.Update<User>();
295+
Assert.IsNotNull(user);
301296

302-
var updatedUser = response.Models.FirstOrDefault();
297+
// Update user status
298+
user.Status = "OFFLINE";
299+
var response = await user.Update<User>();
303300

304-
if (updatedUser == null)
305-
Assert.Fail();
301+
var updatedUser = response.Models.FirstOrDefault();
306302

307-
Assert.AreEqual(1, response.Models.Count);
308-
Assert.AreEqual(user.Username, updatedUser.Username);
309-
Assert.AreEqual(user.Status, updatedUser.Status);
310-
}
303+
if (updatedUser == null)
304+
Assert.Fail();
305+
306+
Assert.AreEqual(1, response.Models.Count);
307+
Assert.AreEqual(user.Username, updatedUser.Username);
308+
Assert.AreEqual(user.Status, updatedUser.Status);
311309
}
312310

313311

@@ -1133,24 +1131,6 @@ public async Task TestCancellationToken()
11331131
}
11341132
}
11351133

1136-
private string? GetEnumMemberAttrValue<T>(T enumVal)
1137-
{
1138-
var enumType = typeof(T);
1139-
var memInfo = enumType.GetMember(enumVal!.ToString()!);
1140-
1141-
if (memInfo == null)
1142-
throw new ArgumentException("Supplied enum value is unknown.");
1143-
1144-
var attr = memInfo.FirstOrDefault()?.GetCustomAttributes(false).OfType<EnumMemberAttribute>()
1145-
.FirstOrDefault();
1146-
if (attr != null)
1147-
{
1148-
return attr.Value;
1149-
}
1150-
1151-
return null;
1152-
}
1153-
11541134
[TestMethod("columns")]
11551135
public async Task TestColumns()
11561136
{

‎PostgrestTests/Models/ForeignKeyTestModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ public class ForeignKeyTestModel : BaseModel
99
[PrimaryKey("id")] public int Id { get; set; }
1010

1111
[Reference(typeof(Movie), foreignKey: "foreign_key_test_relation_1")]
12-
public Movie MovieFK1 { get; set; }
12+
public Movie MovieFK1 { get; set; } = null!;
1313

1414
[Reference(typeof(Movie), foreignKey: "foreign_key_test_relation_2")]
15-
public Movie MovieFK2 { get; set; }
15+
public Movie MovieFK2 { get; set; } = null!;
1616

17-
[Reference(typeof(Person))] public Person RandomPersonFK { get; set; }
17+
[Reference(typeof(Person))] public Person RandomPersonFK { get; set; } = null!;
1818
}

‎PostgrestTests/Models/LinkedModels.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace PostgrestTests.Models;
88
[Table("movie")]
99
public class Movie : BaseModel
1010
{
11-
[PrimaryKey("id")] public string Id { get; set; }
11+
[PrimaryKey("id")] public string Id { get; set; } = null!;
1212

1313
[Column("name")] public string? Name { get; set; }
1414

@@ -29,7 +29,7 @@ public enum MovieStatus
2929
[Table("person")]
3030
public class Person : BaseModel
3131
{
32-
[PrimaryKey("id")] public string Id { get; set; }
32+
[PrimaryKey("id")] public string Id { get; set; } = null!;
3333

3434
[Reference(typeof(Movie))] public List<Movie> Movies { get; set; } = new();
3535

@@ -46,7 +46,7 @@ public class Person : BaseModel
4646
[Table("profile")]
4747
public class Profile : BaseModel
4848
{
49-
[PrimaryKey("person_id", true)] public string PersonId { get; set; }
49+
[PrimaryKey("person_id", true)] public string PersonId { get; set; } = null!;
5050

5151
[Reference(typeof(Person))] public Person? Person { get; set; }
5252
[Column("email")] public string? Email { get; set; }

‎PostgrestTests/Models/NestedForeignKeyTestModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class NestedForeignKeyTestModel : BaseModel
99
[PrimaryKey("id")] public int Id { get; set; }
1010

1111
[Reference(typeof(ForeignKeyTestModel))]
12-
public ForeignKeyTestModel FKTestModel { get; set; }
12+
public ForeignKeyTestModel FKTestModel { get; set; } = null!;
1313

14-
[Reference(typeof(User))] public User User { get; set; }
14+
[Reference(typeof(User))] public User User { get; set; } = null!;
1515
}

0 commit comments

Comments
 (0)