Fix failing unit tests due to static reordering

Author: Mpdreamz

src/Tests/Tests.Core/Extensions/SerializationTesterAssertionExtensions.cs

@@ -1,12 +1,18 @@
-using FluentAssertions;
+using System;
 using Tests.Core.Serialization;
 
 namespace Tests.Core.Extensions
 {
 	public static class SerializationTesterAssertionExtensions
 	{
-		public static void ShouldBeValid(this SerializationResult result, string message = null) =>
-			result.Success.Should().BeTrue("{0}", (message ?? string.Empty) + result);
+		public static void ShouldBeValid(this SerializationResult result, string message = null)
+		{
+			if (result.Success) return;
+
+			throw new Exception($@"Expected serialization to succeed but failed.
+{(message ?? string.Empty) + result}
+");
+		}
 
 		public static T AssertRoundTrip<T>(this SerializationTester tester, T @object, string message = null, bool preserveNullInExpected = false)
 		{

src/Tests/Tests.Domain/CommitActivity.cs

@@ -10,13 +10,23 @@ namespace Tests.Domain
 {
 	public class CommitActivity
 	{
-		public static IList<CommitActivity> CommitActivities { get; } =
-			Generator.Clone().Generate(1000);
-
 		public Developer Committer { get; set; }
 		public double ConfidenceFactor { get; set; }
 		public TimeSpan? Duration { get; set; }
 
+		public string Id { get; set; }
+		public string Message { get; set; }
+		public string ProjectName { get; set; }
+		public long SizeInBytes { get; set; }
+
+		[JsonConverter(typeof(StringTimeSpanConverter))]
+		public TimeSpan? StringDuration
+		{
+			get => Duration;
+			set => Duration = value;
+		}
+
+		// @formatter:off — enable formatter after this line
 		public static Faker<CommitActivity> Generator { get; } =
 			new Faker<CommitActivity>()
 				.UseSeed(TestConfiguration.Instance.Seed)
@@ -37,17 +47,8 @@ public class CommitActivity
 					TimeSpan.FromDays(5),
 				}));
 
-		public string Id { get; set; }
-		public string Message { get; set; }
-		public string ProjectName { get; set; }
-		public long SizeInBytes { get; set; }
-
-		[JsonConverter(typeof(StringTimeSpanConverter))]
-		public TimeSpan? StringDuration
-		{
-			get => Duration;
-			set => Duration = value;
-		}
+		public static IList<CommitActivity> CommitActivities { get; } = Generator.Clone().Generate(1000);
+		// @formatter:on — enable formatter after this line
 	}
 
 	internal class StringTimeSpanConverter : JsonConverter

src/Tests/Tests.Domain/Developer.cs

@@ -9,11 +9,9 @@ namespace Tests.Domain
 {
 	public class Developer : Person
 	{
-		public static IList<Developer> Developers { get; } =
-			Generator.Clone().Generate(1000);
-
 		public Gender Gender { get; set; }
 
+		// @formatter:off — enable formatter after this line
 		public static new Faker<Developer> Generator { get; } =
 			new Faker<Developer>()
 				.UseSeed(TestConfiguration.Instance.Seed)
@@ -27,6 +25,9 @@ public class Developer : Person
 				.RuleFor(p => p.PrivateValue, p => "THIS SHOULD NEVER BE INDEXED")
 				.RuleFor(p => p.IPAddress, p => p.Internet.Ip());
 
+		public static IList<Developer> Developers { get; } = Generator.Clone().Generate(1000);
+		// @formatter:on — enable formatter after this line
+
 		// not populated by generator. Used by ingest geoip test
 		public GeoIp GeoIp { get; set; }
 		public string IPAddress { get; set; }

src/Tests/Tests.Domain/Project.cs

@@ -12,33 +12,26 @@ namespace Tests.Domain
 {
 	public class Project
 	{
-		public static Project Instance = new Project
-		{
-			Name = Projects.First().Name,
-			LeadDeveloper = new Developer() { FirstName = "Martijn", LastName = "Laarman" },
-			StartedOn = new DateTime(2015, 1, 1),
-			DateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
-			Location = new SimpleGeoPoint { Lat = 42.1523, Lon = -80.321 }
-		};
-
-		public static object InstanceAnonymous = new
-		{
-			name = Projects.First().Name,
-			state = "BellyUp",
-			startedOn = "2015-01-01T00:00:00",
-			lastActivity = "0001-01-01T00:00:00",
-			dateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
-			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
-			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon }
-		};
-
 		public IEnumerable<string> Branches { get; set; }
 		public IList<Tag> CuratedTags { get; set; }
 		public string DateString { get; set; }
 		public string Description { get; set; }
 
-		public static Project First { get; } = Projects.First();
+		public DateTime LastActivity { get; set; }
+		public Developer LeadDeveloper { get; set; }
+		public SimpleGeoPoint Location { get; set; }
+		public Dictionary<string, Metadata> Metadata { get; set; }
+		public string Name { get; set; }
+		public int? NumberOfCommits { get; set; }
+		public int? NumberOfContributors { get; set; }
+
+		public Ranges Ranges { get; set; }
+		public DateTime StartedOn { get; set; }
+		public StateOfBeing State { get; set; }
+		public CompletionField Suggest { get; set; }
+		public IEnumerable<Tag> Tags { get; set; }
 
+		// @formatter:off — enable formatter after this line
 		public static Faker<Project> Generator { get; } =
 			new Faker<Project>()
 				.UseSeed(TestConfiguration.Instance.Seed)
@@ -65,20 +58,29 @@ public class Project
 					}
 				);
 
-		public DateTime LastActivity { get; set; }
-		public Developer LeadDeveloper { get; set; }
-		public SimpleGeoPoint Location { get; set; }
-		public Dictionary<string, Metadata> Metadata { get; set; }
-		public string Name { get; set; }
-		public int? NumberOfCommits { get; set; }
-		public int? NumberOfContributors { get; set; }
-
 		public static IList<Project> Projects { get; } = Generator.Clone().Generate(100);
-		public Ranges Ranges { get; set; }
-		public DateTime StartedOn { get; set; }
-		public StateOfBeing State { get; set; }
-		public CompletionField Suggest { get; set; }
-		public IEnumerable<Tag> Tags { get; set; }
+
+		public static Project First { get; } = Projects.First();
+
+		public static Project Instance = new Project
+		{
+			Name = Projects.First().Name,
+			LeadDeveloper = new Developer() { FirstName = "Martijn", LastName = "Laarman" },
+			StartedOn = new DateTime(2015, 1, 1),
+			DateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
+			Location = new SimpleGeoPoint { Lat = 42.1523, Lon = -80.321 }
+		};
+
+		public static object InstanceAnonymous = new
+		{
+			name = Projects.First().Name,
+			state = "BellyUp",
+			startedOn = "2015-01-01T00:00:00",
+			lastActivity = "0001-01-01T00:00:00",
+			dateString = new DateTime(2015, 1, 1).ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"),
+			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
+			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon }
+		};
 	}
 
 	[JsonConverter(typeof(StringEnumConverter))]

src/Tests/Tests/Search/Request/SuggestUsageTests.cs

@@ -20,6 +20,8 @@ public class SuggestUsageTests : SearchUsageTestBase
 	{
 		public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
 
+		protected override bool SupportsDeserialization => false;
+
 		protected override object ExpectJson =>
 			new
 			{