Assert was switched in these instances, so I changed it to the "expected, actual" (#7142)

Co-authored-by: p-storm <paul.de.man@gmail.com>

src/modules/previewpane/PreviewPaneUnitTests/HTMLParsingExtensionTest.cs

@@ -31,7 +31,8 @@ namespace PreviewPaneUnitTests
             string html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(html, "<table class=\"table table-striped table-bordered\">\n<thead>\n<tr>\n<th>A</th>\n<th>B</th>\n</tr>\n</thead>\n</table>\n");
+            const string expected = "<table class=\"table table-striped table-bordered\">\n<thead>\n<tr>\n<th>A</th>\n<th>B</th>\n</tr>\n</thead>\n</table>\n";
+            Assert.AreEqual(expected, html);
         }
 
         [TestMethod]
@@ -46,7 +47,8 @@ namespace PreviewPaneUnitTests
             string html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(html, "<blockquote class=\"blockquote\">\n<p>Blockquotes.</p>\n</blockquote>\n");
+            const string expected = "<blockquote class=\"blockquote\">\n<p>Blockquotes.</p>\n</blockquote>\n";
+            Assert.AreEqual(expected, html);
         }
 
         [TestMethod]
@@ -61,7 +63,8 @@ namespace PreviewPaneUnitTests
             string html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(html, "<p><img src=\"#\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
+            const string expected = "<p><img src=\"#\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n";
+            Assert.AreEqual(expected, html);
         }
 
         [TestMethod]
@@ -76,7 +79,8 @@ namespace PreviewPaneUnitTests
             string html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(html, "<figure class=\"figure\">\n<figcaption class=\"figure-caption\">This is a caption</figcaption>\n</figure>\n");
+            const string expected = "<figure class=\"figure\">\n<figcaption class=\"figure-caption\">This is a caption</figcaption>\n</figure>\n";
+            Assert.AreEqual(expected, html);
         }
 
         [TestMethod]
@@ -92,8 +96,9 @@ namespace PreviewPaneUnitTests
             string html = Markdown.ToHtml(mdString, markdownPipeline);
 
             // Assert
-            Assert.AreEqual(count, 1);
-            Assert.AreEqual(html, "<p><img src=\"#\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n");
+            Assert.AreEqual(1, count);
+            const string expected = "<p><img src=\"#\" class=\"img-fluid\" alt=\"text\" title=\"Figure\" /></p>\n";
+            Assert.AreEqual(expected, html);
         }
     }
 }

src/modules/previewpane/PreviewPaneUnitTests/MarkdownPreviewHandlerTest.cs

@@ -23,7 +23,7 @@ namespace PreviewPaneUnitTests
                 markdownPreviewHandlerControl.DoPreview<string>("HelperFiles/MarkdownWithExternalImage.txt");
 
                 // Assert
-                Assert.AreEqual(markdownPreviewHandlerControl.Controls.Count, 2);
+                Assert.AreEqual(2, markdownPreviewHandlerControl.Controls.Count);
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[0], typeof(WebBrowserExt));
             }
         }
@@ -38,7 +38,7 @@ namespace PreviewPaneUnitTests
                 markdownPreviewHandlerControl.DoPreview<string>("HelperFiles/MarkdownWithExternalImage.txt");
 
                 // Assert
-                Assert.AreEqual(markdownPreviewHandlerControl.Controls.Count, 2);
+                Assert.AreEqual(2, markdownPreviewHandlerControl.Controls.Count);
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[1], typeof(RichTextBox));
             }
         }
@@ -53,7 +53,7 @@ namespace PreviewPaneUnitTests
                 markdownPreviewHandlerControl.DoPreview<string>("HelperFiles/MarkdownWithHTMLImageTag.txt");
 
                 // Assert
-                Assert.AreEqual(markdownPreviewHandlerControl.Controls.Count, 2);
+                Assert.AreEqual(2, markdownPreviewHandlerControl.Controls.Count);
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[1], typeof(RichTextBox));
             }
         }
@@ -68,7 +68,7 @@ namespace PreviewPaneUnitTests
                 markdownPreviewHandlerControl.DoPreview<string>("HelperFiles/MarkdownWithScript.txt");
 
                 // Assert
-                Assert.AreEqual(markdownPreviewHandlerControl.Controls.Count, 1);
+                Assert.AreEqual(1, markdownPreviewHandlerControl.Controls.Count);
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[0], typeof(WebBrowserExt));
             }
         }
@@ -85,11 +85,11 @@ namespace PreviewPaneUnitTests
                 // Assert
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[0], typeof(WebBrowserExt));
                 Assert.IsNotNull(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).DocumentText);
-                Assert.AreEqual(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).Dock, DockStyle.Fill);
-                Assert.AreEqual(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).IsWebBrowserContextMenuEnabled, false);
-                Assert.AreEqual(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).ScriptErrorsSuppressed, true);
-                Assert.AreEqual(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).ScrollBarsEnabled, true);
-                Assert.AreEqual(((WebBrowser)markdownPreviewHandlerControl.Controls[0]).AllowNavigation, false);
+                Assert.AreEqual(DockStyle.Fill, ((WebBrowser)markdownPreviewHandlerControl.Controls[0]).Dock);
+                Assert.AreEqual(false, ((WebBrowser)markdownPreviewHandlerControl.Controls[0]).IsWebBrowserContextMenuEnabled);
+                Assert.AreEqual(true, ((WebBrowser)markdownPreviewHandlerControl.Controls[0]).ScriptErrorsSuppressed);
+                Assert.AreEqual(true, ((WebBrowser)markdownPreviewHandlerControl.Controls[0]).ScrollBarsEnabled);
+                Assert.AreEqual(false, ((WebBrowser)markdownPreviewHandlerControl.Controls[0]).AllowNavigation);
             }
         }
 
@@ -105,10 +105,10 @@ namespace PreviewPaneUnitTests
                 // Assert
                 Assert.IsInstanceOfType(markdownPreviewHandlerControl.Controls[1], typeof(RichTextBox));
                 Assert.IsNotNull(((RichTextBox)markdownPreviewHandlerControl.Controls[1]).Text);
-                Assert.AreEqual(((RichTextBox)markdownPreviewHandlerControl.Controls[1]).Dock, DockStyle.Top);
-                Assert.AreEqual(((RichTextBox)markdownPreviewHandlerControl.Controls[1]).BorderStyle, BorderStyle.None);
-                Assert.AreEqual(((RichTextBox)markdownPreviewHandlerControl.Controls[1]).BackColor, Color.LightYellow);
-                Assert.AreEqual(((RichTextBox)markdownPreviewHandlerControl.Controls[1]).Multiline, true);
+                Assert.AreEqual(DockStyle.Top, ((RichTextBox)markdownPreviewHandlerControl.Controls[1]).Dock);
+                Assert.AreEqual(BorderStyle.None, ((RichTextBox)markdownPreviewHandlerControl.Controls[1]).BorderStyle);
+                Assert.AreEqual(Color.LightYellow, ((RichTextBox)markdownPreviewHandlerControl.Controls[1]).BackColor);
+                Assert.AreEqual(true, ((RichTextBox)markdownPreviewHandlerControl.Controls[1]).Multiline);
             }
         }
     }

src/modules/previewpane/UnitTests-PreviewHandlerCommon/FileBasedPreviewHandlerTests.cs

@@ -38,7 +38,7 @@ namespace PreviewHandlerCommonUnitTests
             fileBasedPreviewHandler.Initialize(filePath, grfMode);
 
             // Assert
-            Assert.AreEqual(fileBasedPreviewHandler.FilePath, filePath);
+            Assert.AreEqual(filePath, fileBasedPreviewHandler.FilePath);
         }
     }
 }

src/modules/previewpane/UnitTests-PreviewHandlerCommon/StreamBasedPreviewHandlerTests.cs

@@ -39,7 +39,7 @@ namespace PreviewHandlerCommonUnitTests
             streamBasedPreviewHandler.Initialize(stream, grfMode);
 
             // Assert
-            Assert.AreEqual(streamBasedPreviewHandler.Stream, stream);
+            Assert.AreEqual(stream, streamBasedPreviewHandler.Stream);
         }
     }
 }

src/modules/previewpane/UnitTests-PreviewHandlerCommon/StreamWrapperTests.cs

@@ -50,7 +50,7 @@ namespace PreviewHandlerCommonUnitTests
             using (var streamWrapper = new ReadonlyStream(streamMock.Object))
             {
                 // Assert
-                Assert.AreEqual(streamWrapper.CanRead, true);
+                Assert.AreEqual(true, streamWrapper.CanRead);
             }
         }
 
@@ -64,7 +64,7 @@ namespace PreviewHandlerCommonUnitTests
             using (var streamWrapper = new ReadonlyStream(streamMock.Object))
             {
                 // Assert
-                Assert.AreEqual(streamWrapper.CanSeek, true);
+                Assert.AreEqual(true, streamWrapper.CanSeek);
             }
         }
 
@@ -78,7 +78,7 @@ namespace PreviewHandlerCommonUnitTests
             using (var streamWrapper = new ReadonlyStream(streamMock.Object))
             {
                 // Assert
-                Assert.AreEqual(streamWrapper.CanWrite, false);
+                Assert.AreEqual(false, streamWrapper.CanWrite);
             }
         }
 
@@ -101,7 +101,7 @@ namespace PreviewHandlerCommonUnitTests
                 var actualLength = streamWrapper.Length;
 
                 // Assert
-                Assert.AreEqual(actualLength, streamLength);
+                Assert.AreEqual(streamLength, actualLength);
             }
         }
 
@@ -127,7 +127,7 @@ namespace PreviewHandlerCommonUnitTests
                 var actualPosition = streamWrapper.Position;
 
                 // Assert
-                Assert.AreEqual(actualPosition, currPosition);
+                Assert.AreEqual(currPosition, actualPosition);
                 streamMock.Verify(_ => _.Seek(It.Is<long>(offset => offset == expectedOffset), It.Is<int>(dworigin => dworigin == expectedDwOrigin), It.IsAny<IntPtr>()), Times.Once);
             }
         }
@@ -207,7 +207,7 @@ namespace PreviewHandlerCommonUnitTests
                 var actualPosition = streamWrapper.Seek(0, SeekOrigin.Begin);
 
                 // Assert
-                Assert.AreEqual(position, actualPosition);
+                Assert.AreEqual(actualPosition, position);
             }
         }
 

src/modules/previewpane/UnitTests-SvgPreviewHandler/SvgPreviewControlTests.cs

@@ -28,7 +28,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(svgPreviewControl.Controls.Count, 1);
+                Assert.AreEqual(1, svgPreviewControl.Controls.Count);
                 Assert.IsInstanceOfType(svgPreviewControl.Controls[0], typeof(WebBrowserExt));
             }
         }
@@ -57,7 +57,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(((WebBrowser)svgPreviewControl.Controls[0]).IsWebBrowserContextMenuEnabled, false);
+                Assert.AreEqual(false, ((WebBrowser)svgPreviewControl.Controls[0]).IsWebBrowserContextMenuEnabled);
             }
         }
 
@@ -71,7 +71,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(((WebBrowser)svgPreviewControl.Controls[0]).Dock, DockStyle.Fill);
+                Assert.AreEqual(DockStyle.Fill, ((WebBrowser)svgPreviewControl.Controls[0]).Dock);
             }
         }
 
@@ -85,7 +85,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(((WebBrowser)svgPreviewControl.Controls[0]).ScriptErrorsSuppressed, true);
+                Assert.AreEqual(true, ((WebBrowser)svgPreviewControl.Controls[0]).ScriptErrorsSuppressed);
             }
         }
 
@@ -99,7 +99,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(((WebBrowser)svgPreviewControl.Controls[0]).ScrollBarsEnabled, true);
+                Assert.AreEqual(true, ((WebBrowser)svgPreviewControl.Controls[0]).ScrollBarsEnabled);
             }
         }
 
@@ -113,7 +113,7 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.DoPreview(GetMockStream("<svg></svg>"));
 
                 // Assert
-                Assert.AreEqual(((WebBrowser)svgPreviewControl.Controls[0]).AllowNavigation, false);
+                Assert.AreEqual(false, ((WebBrowser)svgPreviewControl.Controls[0]).AllowNavigation);
             }
         }
 
@@ -134,13 +134,13 @@ namespace SvgPreviewHandlerUnitTests
 
                 // Assert
                 Assert.IsFalse(string.IsNullOrWhiteSpace(textBox.Text));
-                Assert.AreEqual(svgPreviewControl.Controls.Count, 1);
-                Assert.AreEqual(textBox.Dock, DockStyle.Top);
-                Assert.AreEqual(textBox.BackColor, Color.LightYellow);
+                Assert.AreEqual(1, svgPreviewControl.Controls.Count);
+                Assert.AreEqual(DockStyle.Top, textBox.Dock);
+                Assert.AreEqual(Color.LightYellow, textBox.BackColor);
                 Assert.IsTrue(textBox.Multiline);
                 Assert.IsTrue(textBox.ReadOnly);
-                Assert.AreEqual(textBox.ScrollBars, RichTextBoxScrollBars.None);
-                Assert.AreEqual(textBox.BorderStyle, BorderStyle.None);
+                Assert.AreEqual(RichTextBoxScrollBars.None, textBox.ScrollBars);
+                Assert.AreEqual(BorderStyle.None, textBox.BorderStyle);
             }
         }
 
@@ -165,8 +165,8 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.Width += incrementParentControlWidth;
 
                 // Assert
-                Assert.AreEqual(initialParentWidth, initialTextBoxWidth);
-                Assert.AreEqual(finalParentWidth, textBox.Width);
+                Assert.AreEqual(initialTextBoxWidth, initialParentWidth);
+                Assert.AreEqual(textBox.Width, finalParentWidth);
             }
         }
 
@@ -187,7 +187,7 @@ namespace SvgPreviewHandlerUnitTests
                 // Assert
                 Assert.IsInstanceOfType(svgPreviewControl.Controls[0], typeof(RichTextBox));
                 Assert.IsInstanceOfType(svgPreviewControl.Controls[1], typeof(WebBrowserExt));
-                Assert.AreEqual(svgPreviewControl.Controls.Count, 2);
+                Assert.AreEqual(2, svgPreviewControl.Controls.Count);
             }
         }
 
@@ -208,7 +208,7 @@ namespace SvgPreviewHandlerUnitTests
 
                 // Assert
                 Assert.IsInstanceOfType(svgPreviewControl.Controls[0], typeof(WebBrowserExt));
-                Assert.AreEqual(svgPreviewControl.Controls.Count, 1);
+                Assert.AreEqual(1, svgPreviewControl.Controls.Count);
             }
         }
 
@@ -233,8 +233,8 @@ namespace SvgPreviewHandlerUnitTests
                 svgPreviewControl.Width += incrementParentControlWidth;
 
                 // Assert
-                Assert.AreEqual(initialParentWidth, initialTextBoxWidth);
-                Assert.AreEqual(finalParentWidth, textBox.Width);
+                Assert.AreEqual(initialTextBoxWidth, initialParentWidth);
+                Assert.AreEqual(textBox.Width, finalParentWidth);
             }
         }