Fix tests as per analyzers

Ix.NET/Source/System.Interactive.Tests.Uwp.DeviceRunner/System.Interactive.Tests.Uwp.DeviceRunner.csproj

@@ -211,7 +211,7 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>..\ReactiveX.snk</AssemblyOriginatorKeyFile>

Ix.NET/Source/Tests/AsyncTests.Aggregates.cs

@@ -48,7 +48,7 @@ namespace Tests
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.Aggregate((x, y) => x * y);
-            Assert.Equal(ys.Result, 24);
+            Assert.Equal(24, ys.Result);
         }
 
         [Fact]
@@ -82,7 +82,7 @@ namespace Tests
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.Aggregate(1, (x, y) => x * y);
-            Assert.Equal(ys.Result, 24);
+            Assert.Equal(24, ys.Result);
         }
 
         [Fact]
@@ -90,7 +90,7 @@ namespace Tests
         {
             var xs = new int[0].ToAsyncEnumerable();
             var ys = xs.Aggregate(1, (x, y) => x * y);
-            Assert.Equal(ys.Result, 1);
+            Assert.Equal(1, ys.Result);
         }
 
         [Fact]
@@ -116,7 +116,7 @@ namespace Tests
         {
             var xs = new[] { 1, 2, 3, 4 }.ToAsyncEnumerable();
             var ys = xs.Aggregate(1, (x, y) => x * y, x => x + 1);
-            Assert.Equal(ys.Result, 25);
+            Assert.Equal(25, ys.Result);
         }
 
         [Fact]
@@ -124,7 +124,7 @@ namespace Tests
         {
             var xs = new int[0].ToAsyncEnumerable();
             var ys = xs.Aggregate(1, (x, y) => x * y, x => x + 1);
-            Assert.Equal(ys.Result, 2);
+            Assert.Equal(2, ys.Result);
         }
 
         [Fact]
@@ -169,16 +169,16 @@ namespace Tests
         [Fact]
         public void Count1()
         {
-            Assert.Equal(new int[0].ToAsyncEnumerable().Count().Result, 0);
-            Assert.Equal(new[] { 1, 2, 3 }.ToAsyncEnumerable().Count().Result, 3);
+            Assert.Equal(0, new int[0].ToAsyncEnumerable().Count().Result);
+            Assert.Equal(3, new[] { 1, 2, 3 }.ToAsyncEnumerable().Count().Result);
             AssertThrows<AggregateException>(() => AsyncEnumerable.Throw<int>(new Exception("Bang!")).Count().Wait(WaitTimeoutMs));
         }
 
         [Fact]
         public void Count2()
         {
-            Assert.Equal(new int[0].ToAsyncEnumerable().Count(x => x < 3).Result, 0);
-            Assert.Equal(new[] { 1, 2, 3 }.ToAsyncEnumerable().Count(x => x < 3).Result, 2);
+            Assert.Equal(0, new int[0].ToAsyncEnumerable().Count(x => x < 3).Result);
+            Assert.Equal(2, new[] { 1, 2, 3 }.ToAsyncEnumerable().Count(x => x < 3).Result);
             AssertThrows<AggregateException>(() => AsyncEnumerable.Throw<int>(new Exception("Bang!")).Count(x => x < 3).Wait(WaitTimeoutMs));
         }
 
@@ -205,16 +205,16 @@ namespace Tests
         [Fact]
         public void LongCount1()
         {
-            Assert.Equal(new int[0].ToAsyncEnumerable().LongCount().Result, 0);
-            Assert.Equal(new[] { 1, 2, 3 }.ToAsyncEnumerable().LongCount().Result, 3);
+            Assert.Equal(0, new int[0].ToAsyncEnumerable().LongCount().Result);
+            Assert.Equal(3, new[] { 1, 2, 3 }.ToAsyncEnumerable().LongCount().Result);
             AssertThrows<AggregateException>(() => AsyncEnumerable.Throw<int>(new Exception("Bang!")).LongCount().Wait(WaitTimeoutMs));
         }
 
         [Fact]
         public void LongCount2()
         {
-            Assert.Equal(new int[0].ToAsyncEnumerable().LongCount(x => x < 3).Result, 0);
-            Assert.Equal(new[] { 1, 2, 3 }.ToAsyncEnumerable().LongCount(x => x < 3).Result, 2);
+            Assert.Equal(0, new int[0].ToAsyncEnumerable().LongCount(x => x < 3).Result);
+            Assert.Equal(2, new[] { 1, 2, 3 }.ToAsyncEnumerable().LongCount(x => x < 3).Result);
             AssertThrows<AggregateException>(() => AsyncEnumerable.Throw<int>(new Exception("Bang!")).LongCount(x => x < 3).Wait(WaitTimeoutMs));
         }
 
@@ -1306,8 +1306,10 @@ namespace Tests
         {
             var xs = new[] { 1, 4, 2 }.ToAsyncEnumerable();
             var res = xs.ToLookup(x => x % 2).Result;
+#pragma warning disable IDE0007 // Use implicit type
             foreach (IGrouping<int, int> g in (IEnumerable)res)
                 Assert.True(g.Key == 0 || g.Key == 1);
+#pragma warning restore IDE0007 // Use implicit type
         }
 
         [Fact]

Ix.NET/Source/Tests/AsyncTests.Single.cs

@@ -2045,7 +2045,7 @@ namespace Tests
             var e = res.GetEnumerator();
 
             Assert.True(e.MoveNext().Result);
-            Assert.Equal(e.Current.Key, 2);
+            Assert.Equal(2, e.Current.Key);
             var g1 = e.Current.GetEnumerator();
             HasNext(g1, xs[0]);
             HasNext(g1, xs[2]);
@@ -2054,19 +2054,19 @@ namespace Tests
             NoNext(g1);
 
             Assert.True(e.MoveNext().Result);
-            Assert.Equal(e.Current.Key, 6);
+            Assert.Equal(6, e.Current.Key);
             var g2 = e.Current.GetEnumerator();
             HasNext(g2, xs[1]);
             NoNext(g2);
 
             Assert.True(e.MoveNext().Result);
-            Assert.Equal(e.Current.Key, 1);
+            Assert.Equal(1, e.Current.Key);
             var g3 = e.Current.GetEnumerator();
             HasNext(g3, xs[3]);
             NoNext(g3);
 
             Assert.True(e.MoveNext().Result);
-            Assert.Equal(e.Current.Key, 4);
+            Assert.Equal(4, e.Current.Key);
             var g4 = e.Current.GetEnumerator();
             HasNext(g4, xs[6]);
             NoNext(g4);
@@ -2095,19 +2095,19 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 2);
+            Assert.Equal(2, g1.Key);
 
             Assert.True(e.MoveNext().Result);
             var g2 = e.Current;
-            Assert.Equal(g2.Key, 6);
+            Assert.Equal(6, g2.Key);
 
             Assert.True(e.MoveNext().Result);
             var g3 = e.Current;
-            Assert.Equal(g3.Key, 1);
+            Assert.Equal(1, g3.Key);
 
             Assert.True(e.MoveNext().Result);
             var g4 = e.Current;
-            Assert.Equal(g4.Key, 4);
+            Assert.Equal(4, g4.Key);
 
             NoNext(e);
 
@@ -2255,7 +2255,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 0);
+            Assert.Equal(0, g1.Key);
             var g1e = g1.GetEnumerator();
             HasNext(g1e, 'a');
             HasNext(g1e, 'd');
@@ -2265,7 +2265,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g2 = e.Current;
-            Assert.Equal(g2.Key, 1);
+            Assert.Equal(1, g2.Key);
             var g2e = g2.GetEnumerator();
             HasNext(g2e, 'b');
             HasNext(g2e, 'e');
@@ -2274,7 +2274,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g3 = e.Current;
-            Assert.Equal(g3.Key, 2);
+            Assert.Equal(2, g3.Key);
             var g3e = g3.GetEnumerator();
             HasNext(g3e, 'c');
             HasNext(g3e, 'f');
@@ -2320,7 +2320,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 0);
+            Assert.Equal(0, g1.Key);
             var g1e = g1.GetEnumerator();
             HasNext(g1e, 0);
             HasNext(g1e, 3);
@@ -2330,7 +2330,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g2 = e.Current;
-            Assert.Equal(g2.Key, 1);
+            Assert.Equal(1, g2.Key);
             var g2e = g2.GetEnumerator();
             HasNext(g2e, 1);
             HasNext(g2e, 4);
@@ -2339,7 +2339,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g3 = e.Current;
-            Assert.Equal(g3.Key, 2);
+            Assert.Equal(2, g3.Key);
             var g3e = g3.GetEnumerator();
             HasNext(g3e, 2);
             HasNext(g3e, 5);
@@ -2359,7 +2359,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 0);
+            Assert.Equal(0, g1.Key);
             var g1e = g1.GetEnumerator();
             HasNext(g1e, 'a');
             HasNext(g1e, 'd');
@@ -2369,7 +2369,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g2 = e.Current;
-            Assert.Equal(g2.Key, 1);
+            Assert.Equal(1, g2.Key);
             var g2e = g2.GetEnumerator();
             HasNext(g2e, 'b');
             HasNext(g2e, 'e');
@@ -2378,7 +2378,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g3 = e.Current;
-            Assert.Equal(g3.Key, 2);
+            Assert.Equal(2, g3.Key);
             var g3e = g3.GetEnumerator();
             HasNext(g3e, 'c');
             HasNext(g3e, 'f');
@@ -2424,7 +2424,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 0);
+            Assert.Equal(0, g1.Key);
             var g1e = g1.GetEnumerator();
             HasNext(g1e, 'a');
             HasNext(g1e, 'd');
@@ -2435,7 +2435,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g2 = e.Current;
-            Assert.Equal(g2.Key, 1);
+            Assert.Equal(1, g2.Key);
             var g2e = g2.GetEnumerator();
             HasNext(g2e, 'b');
             HasNext(g2e, 'e');
@@ -2445,7 +2445,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g3 = e.Current;
-            Assert.Equal(g3.Key, 2);
+            Assert.Equal(2, g3.Key);
             var g3e = g3.GetEnumerator();
             HasNext(g3e, 'c');
             HasNext(g3e, 'f');
@@ -2480,7 +2480,7 @@ namespace Tests
 
             Assert.True(e.MoveNext().Result);
             var g1 = e.Current;
-            Assert.Equal(g1.Key, 0);
+            Assert.Equal(0, g1.Key);
             var g1e = g1.GetEnumerator();
             HasNext(g1e, 'a');
 

Ix.NET/Source/Tests/AsyncTests.cs

@@ -18,6 +18,7 @@ namespace Tests
 {
     public partial class AsyncTests
     {
+#pragma warning disable xUnit1013 // Public method should be marked as test        
         public void AssertThrows<E>(Action a)
             where E : Exception
         {
@@ -85,5 +86,6 @@ namespace Tests
 
             e1Result.ShouldAllBeEquivalentTo(e2Result);
         }
+#pragma warning restore xUnit1013 // Public method should be marked as test        
     }
 }

Ix.NET/Source/Tests/Tests.Creation.cs

@@ -56,14 +56,14 @@ namespace Tests
                 }
             });
 
-            int j = 0;
-            foreach (int elem in xs)
+            var j = 0;
+            foreach (var elem in xs)
             {
-                Assert.Equal(elem, j);
+                Assert.Equal(j, elem);
                 j++;
             }
 
-            Assert.Equal(j, 10);
+            Assert.Equal(10, j);
         }
 
         [Fact]
@@ -85,14 +85,14 @@ namespace Tests
                 }
             });
 
-            int j = 0;
-            foreach (int elem in xs)
+            var j = 0;
+            foreach (var elem in xs)
             {
                 Assert.Equal(elem, j);
                 j++;
             }
 
-            Assert.Equal(j, 10);
+            Assert.Equal(10, j);
         }
 
         [Fact]

Ix.NET/Source/Tests/Tests.cs

@@ -13,6 +13,7 @@ namespace Tests
     
     public partial class Tests
     {
+#pragma warning disable xUnit1013 // Public method should be marked as test
         public void AssertThrows<E>(Action a)
             where E : Exception
         {
@@ -43,5 +44,6 @@ namespace Tests
             Assert.True(e.MoveNext());
             Assert.Equal(value, e.Current);
         }
+#pragma warning restore xUnit1013 // Public method should be marked as test
     }
 }

Ix.NET/Source/Tests/Tests.csproj

@@ -18,8 +18,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1279" />
-    <PackageReference Include="xunit" Version="2.3.0-beta1-build3561" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+    <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="FluentAssertions" Version="4.19.2 " />
   </ItemGroup>