Skip to content

Commit d69e6d4

Browse files
author
LoneWandererProductions
committed
Fix some warnings
1 parent 868e11a commit d69e6d4

41 files changed

Lines changed: 437 additions & 365 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Common.ExtendedObject.Tests/ExtendedSystemObjects.cs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -564,30 +564,30 @@ public void MultiArray()
564564
int[,] matrix = { { 1, 2, 3, 4 }, { 1, 2, 3, 4 }, { 5, 2, 3, 1 } };
565565

566566
matrix.SwapColumn(0, 2);
567-
Assert.AreEqual(matrix[2, 3], 4, "4");
568-
Assert.AreEqual(matrix[0, 3], 1, "4");
567+
Assert.AreEqual(4, matrix[2, 3], "4");
568+
Assert.AreEqual(1, matrix[0, 3], "4");
569569

570-
Assert.AreEqual(matrix[2, 0], 1, "4");
571-
Assert.AreEqual(matrix[0, 0], 5, "4");
570+
Assert.AreEqual(1, matrix[2, 0], "4");
571+
Assert.AreEqual(5, matrix[0, 0], "4");
572572

573573
matrix = new[,] { { 1, 2, 3, 4 }, { 1, 2, 3, 4 }, { 5, 2, 3, 1 } };
574574

575575
matrix.SwapRow(0, 1);
576-
Assert.AreEqual(matrix[0, 0], 2, "4");
577-
Assert.AreEqual(matrix[0, 1], 1, "4");
576+
Assert.AreEqual(2, matrix[0, 0], "4");
577+
Assert.AreEqual(1, matrix[0, 1], "4");
578578

579-
Assert.AreEqual(matrix[2, 0], 2, "4");
580-
Assert.AreEqual(matrix[2, 1], 5, "4");
579+
Assert.AreEqual(2, matrix[2, 0], "4");
580+
Assert.AreEqual(5, matrix[2, 1], "4");
581581

582582
var str = matrix.ToText();
583583
Assert.IsFalse(string.IsNullOrEmpty(str), "Null string");
584-
Assert.AreEqual(str.Length, 45, "Count");
584+
Assert.AreEqual(45, str.Length, "Count");
585585

586586
int[,] normal = { { 1, 2 }, { 1, 2 } };
587587
var copy = normal.Duplicate();
588588
normal[0, 0] = 0;
589-
Assert.AreEqual(copy[0, 0], 1, "00");
590-
Assert.AreEqual(copy[0, 1], 2, "01");
589+
Assert.AreEqual(1, copy[0, 0], "00");
590+
Assert.AreEqual(2, copy[0, 1], "01");
591591

592592
//see Matrix Multiplication, the speed is sadly slower, but it converts arrays to span in a fast way and the results are the same
593593

@@ -599,15 +599,15 @@ public void MultiArray()
599599

600600
var compare1 = HelperMethods.MatrixTestOne(m1, m2);
601601

602-
Assert.AreEqual(compare1[0, 0], 2, "00");
603-
Assert.AreEqual(compare1[1, 0], 1, "10");
604-
Assert.AreEqual(compare1[2, 0], 1, "20");
605-
Assert.AreEqual(compare1[0, 1], 1, "01");
606-
Assert.AreEqual(compare1[1, 1], 2, "11");
607-
Assert.AreEqual(compare1[2, 1], 1, "21");
608-
Assert.AreEqual(compare1[0, 2], 1, "02");
609-
Assert.AreEqual(compare1[1, 2], 1, "12");
610-
Assert.AreEqual(compare1[2, 2], 2, "22");
602+
Assert.AreEqual(2, compare1[0, 0], "00");
603+
Assert.AreEqual(1, compare1[1, 0], "10");
604+
Assert.AreEqual(1, compare1[2, 0], "20");
605+
Assert.AreEqual(1, compare1[0, 1], "01");
606+
Assert.AreEqual(2, compare1[1, 1], "11");
607+
Assert.AreEqual(1, compare1[2, 1], "21");
608+
Assert.AreEqual(1, compare1[0, 2], "02");
609+
Assert.AreEqual(1, compare1[1, 2], "12");
610+
Assert.AreEqual(2, compare1[2, 2], "22");
611611
}
612612

613613
/// <summary>
@@ -654,14 +654,14 @@ public void IdInterface()
654654

655655
//To List
656656
var lst = dct.ToListId();
657-
Assert.AreEqual(lst[0].Id, 0, "Check passed");
658-
Assert.AreEqual(lst[1].Id, 10, "Check passed");
657+
Assert.AreEqual(0, lst[0].Id, "Check passed");
658+
Assert.AreEqual(10, lst[1].Id, "Check passed");
659659

660660
lst[0].Id = 5;
661661
lst[1].Id = 6;
662662

663663
var dic = lst.ToDictionaryId<Item, int>();
664-
Assert.AreEqual(dic.Count, 2, "Check passed");
664+
Assert.AreEqual(2, dic.Count, "Check passed");
665665
Assert.IsTrue(dic.ContainsKey(5), "Key does not exist");
666666
Assert.IsTrue(dic.ContainsKey(6), "Key does not exist");
667667
}

‎Common.Images/ImageZoom.xaml.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
using System;
127127
using System.Collections.Generic;
128128
using System.Diagnostics;
129+
using System.Threading;
129130
using System.Threading.Tasks;
130131
using System.Windows;
131132
using System.Windows.Documents;
@@ -521,7 +522,7 @@ private static WriteableBitmap ToBitmapSource(UnmanagedImageBuffer buffer)
521522
/// <summary>
522523
/// The lock object used for monitor locking (thread-safety).
523524
/// </summary>
524-
private readonly object _lock = new();
525+
private readonly Lock _lock = new();
525526

526527
/// <summary>
527528
/// The disposed

‎Common.Images/Thumbnails.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ public void RemoveSingleItem(int id)
432432
{
433433
_refresh = false;
434434

435-
if (ItemsSource != null && !ItemsSource.ContainsKey(id))
435+
if (ItemsSource?.ContainsKey(id) == false)
436436
{
437437
return;
438438
}
@@ -703,7 +703,7 @@ private async Task LoadSingleImage(int key, string filePath, Panel exGrid, Cance
703703
if (token.IsCancellationRequested) return;
704704

705705
// 1. Heavy lifting (IO) happens on the background thread
706-
var bitmap = await ImageStream.GetBitmapImageFileStreamAsync(filePath, cellSize, cellSize);
706+
var bitmap = await ImageStream.GetBitmapImageFileStreamAsync(filePath, cellSize);
707707
if (bitmap == null || token.IsCancellationRequested) return;
708708

709709
// 2. ALL UI element creation and property setting happens on the UI Thread

‎CommonLibrary.Tests/IoFileSearch.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public async Task GetFilesByExtensionWithExtensionAsync()
5555

5656
Assert.IsTrue(check, "Did not delete Folder:");
5757

58-
Assert.AreEqual(list[0], PathOperations + ResourcesGeneral.TstExt, "Correct File");
58+
Assert.AreEqual(PathOperations + ResourcesGeneral.TstExt, list[0], "Correct File");
5959

6060
check = await FileHandleDelete.DeleteFile(file);
6161

@@ -91,7 +91,7 @@ public async Task GetFilesByExtensionWithoutExtensionAsync()
9191

9292
Assert.IsTrue(check, "Correct Number of files");
9393

94-
Assert.AreEqual(list[0], PathOperations, "Not the correct File");
94+
Assert.AreEqual(PathOperations, list[0], "Not the correct File");
9595

9696
//search Test with contains string
9797
var ext = new List<string> { ResourcesGeneral.TstExt };

‎CommonLibrary.Tests/MatrixTests.cs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void MatrixMultiplications()
3232

3333
var result = MatrixUtility.UnsafeMultiplication(m1, m2);
3434

35-
Assert.AreEqual(result[0, 0], 6, "First");
35+
Assert.AreEqual(6, result[0, 0], "First");
3636

3737
x = new double[,] { { 2, 1, 1 }, { 1, 2, 1 }, { 1, 1, 2 } };
3838
m1 = new BaseMatrix { Matrix = x };
@@ -58,35 +58,35 @@ public void MatrixMultiplications()
5858
timer.Stop();
5959
Trace.WriteLine($"Test two (unsafe multiplication): {timer.Elapsed}");
6060

61-
Assert.AreEqual(result[0, 0], 2, "00");
62-
Assert.AreEqual(result[1, 0], 1, "10");
63-
Assert.AreEqual(result[2, 0], 1, "20");
64-
Assert.AreEqual(result[0, 1], 1, "01");
65-
Assert.AreEqual(result[1, 1], 2, "11");
66-
Assert.AreEqual(result[2, 1], 1, "21");
67-
Assert.AreEqual(result[0, 2], 1, "02");
68-
Assert.AreEqual(result[1, 2], 1, "12");
69-
Assert.AreEqual(result[2, 2], 2, "22");
70-
71-
Assert.AreEqual(compare1[0, 0], 2, "00");
72-
Assert.AreEqual(compare1[1, 0], 1, "10");
73-
Assert.AreEqual(compare1[2, 0], 1, "20");
74-
Assert.AreEqual(compare1[0, 1], 1, "01");
75-
Assert.AreEqual(compare1[1, 1], 2, "11");
76-
Assert.AreEqual(compare1[2, 1], 1, "21");
77-
Assert.AreEqual(compare1[0, 2], 1, "02");
78-
Assert.AreEqual(compare1[1, 2], 1, "12");
79-
Assert.AreEqual(compare1[2, 2], 2, "22");
80-
81-
Assert.AreEqual(compare2[0, 0], 2, "00");
82-
Assert.AreEqual(compare2[1, 0], 1, "10");
83-
Assert.AreEqual(compare2[2, 0], 1, "20");
84-
Assert.AreEqual(compare2[0, 1], 1, "01");
85-
Assert.AreEqual(compare2[1, 1], 2, "11");
86-
Assert.AreEqual(compare2[2, 1], 1, "21");
87-
Assert.AreEqual(compare2[0, 2], 1, "02");
88-
Assert.AreEqual(compare2[1, 2], 1, "12");
89-
Assert.AreEqual(compare2[2, 2], 2, "22");
61+
Assert.AreEqual(2, result[0, 0], "00");
62+
Assert.AreEqual(1, result[1, 0], "10");
63+
Assert.AreEqual(1, result[2, 0], "20");
64+
Assert.AreEqual(1, result[0, 1], "01");
65+
Assert.AreEqual(2, result[1, 1], "11");
66+
Assert.AreEqual(1, result[2, 1], "21");
67+
Assert.AreEqual(1, result[0, 2], "02");
68+
Assert.AreEqual(1, result[1, 2], "12");
69+
Assert.AreEqual(2, result[2, 2], "22");
70+
71+
Assert.AreEqual(2, compare1[0, 0], "00");
72+
Assert.AreEqual(1, compare1[1, 0], "10");
73+
Assert.AreEqual(1, compare1[2, 0], "20");
74+
Assert.AreEqual(1, compare1[0, 1], "01");
75+
Assert.AreEqual(2, compare1[1, 1], "11");
76+
Assert.AreEqual(1, compare1[2, 1], "21");
77+
Assert.AreEqual(1, compare1[0, 2], "02");
78+
Assert.AreEqual(1, compare1[1, 2], "12");
79+
Assert.AreEqual(2, compare1[2, 2], "22");
80+
81+
Assert.AreEqual(2, compare2[0, 0], "00");
82+
Assert.AreEqual(1, compare2[1, 0], "10");
83+
Assert.AreEqual(1, compare2[2, 0], "20");
84+
Assert.AreEqual(1, compare2[0, 1], "01");
85+
Assert.AreEqual(2, compare2[1, 1], "11");
86+
Assert.AreEqual(1, compare2[2, 1], "21");
87+
Assert.AreEqual(1, compare2[0, 2], "02");
88+
Assert.AreEqual(1, compare2[1, 2], "12");
89+
Assert.AreEqual(2, compare2[2, 2], "22");
9090

9191
x = new double[,] { { 0, -1, 0 }, { 1, 0, 0 }, { 0, 0, 1 } };
9292
m1 = new BaseMatrix { Matrix = x };
@@ -95,9 +95,9 @@ public void MatrixMultiplications()
9595

9696
result = m1 * m2;
9797

98-
Assert.AreEqual(result[0, 0], 0, "00");
99-
Assert.AreEqual(result[1, 0], 1, "10");
100-
Assert.AreEqual(result[2, 0], 0, "20");
98+
Assert.AreEqual(0, result[0, 0], "00");
99+
Assert.AreEqual(1, result[1, 0], "10");
100+
Assert.AreEqual(0, result[2, 0], "20");
101101

102102
double[,]? matrix = { { 1, 1, 3, 1 } };
103103
m1 = new BaseMatrix(matrix);
@@ -141,10 +141,10 @@ public void MatrixAdditions()
141141

142142
var result = MatrixUtility.UnsafeAddition(m1, m2);
143143

144-
Assert.AreEqual(result[0, 0], 11, "11");
145-
Assert.AreEqual(result[0, 1], 9, "9");
146-
Assert.AreEqual(result[1, 0], 4, "4");
147-
Assert.AreEqual(result[1, 1], 4, "4");
144+
Assert.AreEqual(11, result[0, 0], "11");
145+
Assert.AreEqual(9, result[0, 1], "9");
146+
Assert.AreEqual(4, result[1, 0], "4");
147+
Assert.AreEqual(4, result[1, 1], "4");
148148
}
149149

150150
/// <summary>
@@ -161,10 +161,10 @@ public void MatrixSubtraction()
161161

162162
var result = MatrixUtility.UnsafeSubtraction(m1, m2);
163163

164-
Assert.AreEqual(result[0, 0], 5, "5");
165-
Assert.AreEqual(result[0, 1], -1, "-1");
166-
Assert.AreEqual(result[1, 0], 2, "2");
167-
Assert.AreEqual(result[1, 1], 0, "0");
164+
Assert.AreEqual(5, result[0, 0], "5");
165+
Assert.AreEqual(-1, result[0, 1], "-1");
166+
Assert.AreEqual(2, result[1, 0], "2");
167+
Assert.AreEqual(0, result[1, 1], "0");
168168
}
169169

170170
/// <summary>

‎CommonLibrary.Tests/PathfinderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void TestFindPathSingleStep()
7777
PrintPath(grid, path.FullPath);
7878

7979
Assert.IsNotNull(path, "Path should not be null.");
80-
Assert.AreEqual(path.FullPath.Count, 2, "Path length should be 2.");
80+
Assert.AreEqual(2, path.FullPath.Count, "Path length should be 2.");
8181
}
8282

8383

0 commit comments

Comments
 (0)