Merge branch 'master' of https://github.com/rsdn/CodeJam

Author: andrewvk

Main/src/CodeJam.Main.csproj

@@ -110,7 +110,6 @@
     <Compile Include="Collections\EnumerableExtensions.Page.cs" />
     <Compile Include="Collections\EnumerableExtensions.Slice.cs" />
     <Compile Include="Collections\NamespaceDoc.cs" />
-    <Compile Include="Collections\PublicMemberEqualityComparer.cs" />
     <Compile Include="Collections\QueryableExtensions.ApplyOrder.cs" />
     <Compile Include="Collections\QueryableExtensions.cs" />
     <Compile Include="EnumHelper.cs" />

Main/src/Collections/PublicMemberEqualityComparer.cs

@@ -59,7 +59,6 @@
     <Compile Include="Collections\MinMaxByTests.cs" />
     <Compile Include="Collections\ArrayExtensionsTest.cs" />
     <Compile Include="Collections\ComparerBuilderTests.cs" />
-    <Compile Include="Collections\PublicMemberEqualityComparerTests.cs" />
     <Compile Include="Collections\QueryableExtensionsTests.ApplyOrder.cs" />
     <Compile Include="Collections\DictionaryExtensionsTest.cs" />
     <Compile Include="Collections\MinMaxByTests.generated.cs">

Main/tests/CodeJam.Main-Tests.csproj

@@ -32,7 +32,7 @@ public void GetHashCodeTest()
 		[Test]
 		public void EqualsTest()
 		{
-			var eq = new PublicMemberEqualityComparer<TestClass>();
+			var eq = ComparerBuilder<TestClass>.GetEqualityComparer();
 
 			Assert.That(eq.Equals(new TestClass(), new TestClass()),              Is.True);
 			Assert.That(eq.Equals(null,            null),                         Is.True);
@@ -85,7 +85,8 @@ public void DistinctTest()
 				null,
 				new TestClass { Field1 = 2, Prop2 = "1"  },
 				new TestClass { Field1 = 2, Prop2 = "2"  },
-				new TestClass { Field1 = 2, Prop2 = "2"  }
+				new TestClass { Field1 = 2, Prop2 = "2"  },
+				null,
 			};
 
 			Assert.That(arr.Distinct(eq).Count(), Is.EqualTo(5));
@@ -102,7 +103,8 @@ public void DistinctByMember1Test()
 				null,
 				new TestClass { Field1 = 2, Prop2 = "1"  },
 				new TestClass { Field1 = 2, Prop2 = "2"  },
-				new TestClass { Field1 = 2, Prop2 = "2"  }
+				new TestClass { Field1 = 2, Prop2 = "2"  },
+				null,
 			};
 
 			Assert.That(arr.Distinct(eq).Count(), Is.EqualTo(3));
@@ -119,7 +121,8 @@ public void DistinctByMember2Test()
 				null,
 				new TestClass { Field1 = 2, Prop2 = "1"  },
 				new TestClass { Field1 = 2, Prop2 = "2"  },
-				new TestClass { Field1 = 2, Prop2 = "2"  }
+				new TestClass { Field1 = 2, Prop2 = "2"  },
+				null,
 			};
 
 			Assert.That(arr.Distinct(eq).Count(), Is.EqualTo(5));