Upgraded dependency to Fluent Assertions 5.0 RC2 (#14)

Author: dennisdoomen

FluentAssertions.Json.sln

@@ -7,10 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		Tests\Default.testsettings = Tests\Default.testsettings
 		Src\FluentAssertions.nuspec = Src\FluentAssertions.nuspec
-		.nuget\nuget.config = .nuget\nuget.config
 		README.md = README.md
-		Settings.StyleCop = Settings.StyleCop
-		Src\SolutionInfo.cs = Src\SolutionInfo.cs
 	EndProjectSection
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Json.Shared.Specs", "Tests\FluentAssertions.Json.Shared.Specs\Json.Shared.Specs.shproj", "{845ED06B-1F6D-4442-BCCC-52483561F447}"

FluentAssertions.Json.sln.DotSettings

@@ -9,7 +9,9 @@
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Safe_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="Safe Cleanup"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;/Profile&gt;</s:String>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">130</s:Int64>
@@ -57,7 +59,11 @@
 	<s:String x:Key="/Default/Environment/Editor/MatchingBraceHighlighting/Style/@EntryValue">OUTLINE</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/LocationType/@EntryValue">SOLUTION_FOLDER</s:String>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/MsTestProvider/RunConfigurationFilename/@EntryValue">D:\Workspaces\FluentAssertions\Default.testsettings</s:String>

Src/FluentAssertions.Json/Common/StringExtensions.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using FluentAssertions.Formatting;
+
+namespace FluentAssertions.Json.Common
+{
+    internal static class StringExtensions
+    {
+        /// <summary>
+        /// Finds the first index at which the <paramref name="value"/> does not match the <paramref name="expected"/>
+        /// string anymore, including the exact casing.
+        /// </summary>
+        public static int IndexOfFirstMismatch(this string value, string expected)
+        {
+            return IndexOfFirstMismatch(value, expected, StringComparison.CurrentCulture);
+        }
+
+        /// <summary>
+        /// Finds the first index at which the <paramref name="value"/> does not match the <paramref name="expected"/>
+        /// string anymore, accounting for the specified <paramref name="stringComparison"/>.
+        /// </summary>
+        public static int IndexOfFirstMismatch(this string value, string expected, StringComparison stringComparison)
+        {
+            for (int index = 0; index < value.Length; index++)
+            {
+                if ((index >= expected.Length) || !value[index].ToString().Equals(expected[index].ToString(), stringComparison))
+                {
+                    return index;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Gets the quoted three characters at the specified index of a string, including the index itself.
+        /// </summary>
+        public static string IndexedSegmentAt(this string value, int index)
+        {
+            int length = Math.Min(value.Length - index, 3);
+
+            return $"{Formatter.ToString(value.Substring(index, length))} (index {index})".Replace("{", "{{").Replace("}", "}}");
+        }
+
+        /// <summary>
+        /// Replaces all characters that might conflict with formatting placeholders and newlines with their escaped counterparts.
+        /// </summary>
+        public static string Escape(this string value, bool escapePlaceholders = false)
+        {
+            value = value.Replace("\"", "\\\"").Replace("\n", @"\n").Replace("\r", @"\r");
+            if (escapePlaceholders)
+            {
+                value = value.Replace("{", "{{").Replace("}", "}}");
+            }
+
+            return value;
+        }
+
+        /// <summary>
+        /// Joins a string with one or more other strings using a specified separator.
+        /// </summary>
+        /// <remarks>
+        /// Any string that is empty (including the original string) is ignored. 
+        /// </remarks>
+        public static string Combine(this string @this, string other, string separator = ".")
+        {
+            var strings = new[] { @this }.Concat(new[] {other}).Where(s => s.Length > 0).ToArray();
+            return string.Join(separator, strings);
+        }
+
+        /// <summary>
+        /// Changes the first character of a string to uppercase.
+        /// </summary>
+        public static string Capitalize(this string @this)
+        {
+            char[] charArray = @this.ToCharArray();
+            charArray[0] = char.ToUpper(charArray[0]);
+            return new string(charArray);
+        }
+
+        public static string RemoveNewLines(this string @this)
+        {
+            return @this.Replace("\n", "").Replace("\r", "").Replace("\\r\\n", "");
+        }
+    }
+}

Src/FluentAssertions.Json/FluentAssertions.Json.csproj

@@ -12,7 +12,7 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.0.0-beta0001" />
+    <PackageReference Include="FluentAssertions" Version="5.0.0-rc0002" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 </Project>

Src/FluentAssertions.Json/JTokenAssertions.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 using FluentAssertions.Collections;
-using FluentAssertions.Common;
+using FluentAssertions.Json.Common;
 using FluentAssertions.Execution;
 using FluentAssertions.Formatting;
 using FluentAssertions.Primitives;
@@ -34,7 +34,7 @@ public JTokenAssertions(JToken subject)
         /// <summary>
         ///     Returns the type of the subject the assertion applies on.
         /// </summary>
-        protected override string Context => nameof(JToken);
+        protected override string Identifier => nameof(JToken);
 
         /// <summary>
         ///     Asserts that the current <see cref="JToken" /> equals the <paramref name="expected" /> element.
@@ -131,10 +131,10 @@ public AndConstraint<JTokenAssertions> BeEquivalentTo(JToken expected, string be
         {
             ObjectDiffPatchResult diff = ObjectDiffPatch.GenerateDiff(Subject, expected);
             JToken firstDifferingToken = diff.NewValues?.First ?? diff.OldValues?.First;
-            JTokenFormatter formatter = new JTokenFormatter();
-
-            var message = $"Expected JSON document {formatter.ToString(Subject, true).Replace("{", "{{").Replace("}", "}}")}" +
-                          $" to be equivalent to {formatter.ToString(expected, true).Replace("{", "{{").Replace("}", "}}")}" +
+          
+                
+            var message = $"Expected JSON document {Format(Subject, true).Replace("{", "{{").Replace("}", "}}")}" +
+                          $" to be equivalent to {Format(expected, true).Replace("{", "{{").Replace("}", "}}")}" +
                           $"{{reason}}, but differs at {firstDifferingToken?.ToString().Replace("{", "{{").Replace("}", "}}")}.";
 
             Execute.Assertion
@@ -304,7 +304,7 @@ public AndWhichConstraint<JTokenAssertions, JToken> NotHaveElement(string unexpe
         public AndWhichConstraint<JTokenAssertions, JToken> ContainSingleItem(string because = "", params object[] becauseArgs)
         {
             var formatter = new JTokenFormatter();
-            string formattedDocument = formatter.ToString(Subject).Replace("{", "{{").Replace("}", "}}");
+            string formattedDocument = Format(Subject).Replace("{", "{{").Replace("}", "}}");
 
             using (new AssertionScope("JSON document " + formattedDocument))
             {
@@ -327,13 +327,22 @@ public AndWhichConstraint<JTokenAssertions, JToken> ContainSingleItem(string bec
         public AndConstraint<JTokenAssertions> HaveCount(int expected, string because = "", params object[] becauseArgs)
         {
             var formatter = new JTokenFormatter();
-            string formattedDocument = formatter.ToString(Subject).Replace("{", "{{").Replace("}", "}}");
+            string formattedDocument = Format(Subject).Replace("{", "{{").Replace("}", "}}");
 
             using (new AssertionScope("JSON document " + formattedDocument))
             {
                 EnumerableSubject.HaveCount(expected, because, becauseArgs);
                 return new AndConstraint<JTokenAssertions>(this);
             }
         }
+        
+        public string Format(JToken value, bool useLineBreaks = false)
+        {
+            return new JTokenFormatter().Format(value, new FormattingContext
+            {
+                UseLineBreaks = useLineBreaks
+            }, null);
+        }
+
     }
 }

Src/FluentAssertions.Json/JTokenFormatter.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using FluentAssertions.Common;
 using FluentAssertions.Formatting;
+using FluentAssertions.Json.Common;
 using Newtonsoft.Json.Linq;
 
 namespace FluentAssertions.Json
@@ -37,11 +37,10 @@ public bool CanHandle(object value)
         /// <returns>
         /// A <see cref="string" /> that represents this instance.
         /// </returns>
-        public string ToString(object value, bool useLineBreaks = false, IList<object> processedObjects = null,
-            int nestedPropertyLevel = 0)
+        public string Format(object value, FormattingContext context, FormatChild formatChild)
         {
             var jToken = (JToken)value;
-            string result = useLineBreaks ? jToken?.ToString(Newtonsoft.Json.Formatting.Indented) : jToken?.ToString().RemoveNewLines();
+            string result = context.UseLineBreaks ? jToken?.ToString(Newtonsoft.Json.Formatting.Indented) : jToken?.ToString().RemoveNewLines();
             return result ?? "<null>";
         }
     }

Src/FluentAssertions.nuspec

@@ -10,7 +10,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Fluent Assertions extensions for Newtonsoft.Json</description>
     <summary>Fluent Assertions extensions for Newtonsoft.Json</summary>
-    <copyright>Copyright Dennis Doomen 2010-2017</copyright>
+    <copyright>Copyright Dennis Doomen 2010-2018</copyright>
     <releaseNotes>
       See https://github.com/fluentassertions/fluentassertions/releases/
     </releaseNotes>

Tests/FluentAssertions.Json.Net45.Specs/Json.Net45.Specs.csproj

@@ -37,8 +37,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.5.0.0-beta0001\lib\net451\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a">
+      <HintPath>..\..\packages\FluentAssertions.5.0.0-rc0002\lib\net45\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

Tests/FluentAssertions.Json.Net45.Specs/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="5.0.0-beta0001" targetFramework="net451" />
+  <package id="FluentAssertions" version="5.0.0-rc0002" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
   <package id="System.Collections" version="4.0.11" targetFramework="net451" />
   <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />