fix Author/Authors and Intersect.Tests

Author: pandinocoder

Framework/Intersect.Framework.Core/IO/Files/FileSystemHelper.cs

@@ -66,18 +66,8 @@ public static bool EnsureDirectoryExists(string directoryPath)
 
     public static string RelativePath(string from, string to)
     {
-        Contract.Requires(from != null);
-        Contract.Requires(to != null);
-
-        if (string.IsNullOrWhiteSpace(from))
-        {
-            throw new ArgumentException(nameof(from));
-        }
-
-        if (string.IsNullOrWhiteSpace(to))
-        {
-            throw new ArgumentException(nameof(to));
-        }
+        ArgumentException.ThrowIfNullOrWhiteSpace(from);
+        ArgumentException.ThrowIfNullOrWhiteSpace(to);
 
         var fullFrom = CleanPath(Path.GetFullPath(from));
 

Framework/Intersect.Framework.Core/Intersect.Framework.Core.csproj

@@ -9,6 +9,9 @@
     </ItemGroup>
 
   <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+      <_Parameter1>Intersect.Tests</_Parameter1>
+    </AssemblyAttribute>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>Intersect Client</_Parameter1>
     </AssemblyAttribute>
@@ -38,7 +41,7 @@
       <PackageReference Include="NCalcSync" Version="3.8.0" />
       <PackageReference Include="Semver" Version="2.3.0" />
       <PackageReference Include="System.Collections.Immutable" Version="9.0.0" />
-      <PackageReference Include="System.IO.Abstractions" Version="21.1.7" />
+      <PackageReference Include="System.IO.Abstractions" Version="22.0.10" />
       <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     </ItemGroup>
 

Framework/Intersect.Framework.Core/Plugins/Manifests/Types/Author.cs

@@ -1,65 +1,67 @@
-using Newtonsoft.Json;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 
 namespace Intersect.Plugins.Manifests.Types;
 
 /// <summary>
-/// Structure that defines an <see cref="Author"/> that can be represented as an <see cref="Author"/> <see cref="string"/>.
+///     Structure that defines an <see cref="Author" /> that can be represented as an <see cref="Author" />
+///     <see cref="string" />.
 /// </summary>
 [JsonConverter(typeof(AuthorStringConverter))]
 public partial struct Author : IComparable<Author>, IEquatable<Author>, IEquatable<string>, ICloneable, IComparable
 {
     #region Constants
 
     /// <summary>
-    /// Expression that defines what qualifies as an <see cref="Author"/> <see cref="string"/>.
-    ///
-    /// Can be summarized as <code>Name[ &lt;Email&gt;][ (Homepage)]</code>
+    ///     Expression that defines what qualifies as an <see cref="Author" /> <see cref="string" />.
+    ///     Can be summarized as <code>Name[ &lt;Email&gt;][ (Homepage)]</code>
     /// </summary>
-    public static readonly Regex AuthorStringExpression =
-        new Regex(@"^\s*(.+?)(?:\s+<([^>]+)>)?(?:\s+\(([^\\)]+)\))?\s*$");
+    public static readonly Regex AuthorStringExpression = new(@"^\s*(.+?)(?:\s+<([^>]+)>)?(?:\s+\(([^\\)]+)\))?\s*$");
 
     /// <summary>
-    /// The empty <see cref="Author"/> created using the default constructor.
+    ///     The empty <see cref="Author" /> created using the default constructor.
     /// </summary>
-    public static Author Empty => new Author();
+    public static Author Empty => new();
 
     #endregion Constants
 
     #region Fields
 
     /// <summary>
-    /// Email address of the <see cref="Author"/> (not validated).
+    ///     Email address of the <see cref="Author" /> (not validated).
     /// </summary>
     public readonly string Email;
 
     /// <summary>
-    /// Homepage (URL) of the <see cref="Author"/> (not validated).
+    ///     Homepage (URL) of the <see cref="Author" /> (not validated).
     /// </summary>
     public readonly string Homepage;
 
     /// <summary>
-    /// Name of the <see cref="Author"/>.
+    ///     Name of the <see cref="Author" />.
     /// </summary>
     public readonly string Name;
 
     /// <summary>
-    /// Precomputed hash code.
+    ///     Precomputed hash code.
     /// </summary>
-    private readonly int mHashCode;
+    private readonly int _hashCode;
 
     #endregion Fields
 
     #region Constructors
 
     /// <summary>
-    /// Constructs an <see cref="Author"/> from a <see cref="string"/>.
+    ///     Constructs an <see cref="Author" /> from a <see cref="string" />.
     /// </summary>
-    /// <param name="authorString">an <see cref="Author"/> <see cref="string"/></param>
-    /// <exception cref="ArgumentNullException">thrown if <paramref name="authorString"/> is null, empty, or whitespace</exception>
-    /// <exception cref="ArgumentException">thrown if <paramref name="authorString"/> does not match the format defined by <see cref="AuthorStringExpression" /></exception>
-    /// <seealso cref="AuthorStringExpression"/>
+    /// <param name="authorString">an <see cref="Author" /> <see cref="string" /></param>
+    /// <exception cref="ArgumentNullException">thrown if <paramref name="authorString" /> is null, empty, or whitespace</exception>
+    /// <exception cref="ArgumentException">
+    ///     thrown if <paramref name="authorString" /> does not match the format defined by
+    ///     <see cref="AuthorStringExpression" />
+    /// </exception>
+    /// <seealso cref="AuthorStringExpression" />
     public Author(string authorString)
     {
         if (string.IsNullOrWhiteSpace(authorString))
@@ -76,106 +78,149 @@ public Author(string authorString)
         Email = email.Value;
         Homepage = homepage.Value;
 
-        mHashCode = HashCode.Combine(Name, Email, Homepage);
+        _hashCode = HashCode.Combine(Name, Email, Homepage);
     }
 
     /// <summary>
-    /// Constructs an <see cref="Author"/> from an explicitly defined name, email, and homepage.
+    ///     Constructs an <see cref="Author" /> from an explicitly defined name, email, and homepage.
     /// </summary>
-    /// <param name="name">the name of the <see cref="Author"/></param>
-    /// <param name="email">the email address of the <see cref="Author"/></param>
-    /// <param name="homepage">the homepage of the <see cref="Author"/></param>
+    /// <param name="name">the name of the <see cref="Author" /></param>
+    /// <param name="email">the email address of the <see cref="Author" /></param>
+    /// <param name="homepage">the homepage of the <see cref="Author" /></param>
     [JsonConstructor]
     public Author(string name, string email, string? homepage = default)
     {
         Name = name;
         Email = email;
         Homepage = homepage ?? string.Empty;
 
-        mHashCode = HashCode.Combine(Name, Email, Homepage);
+        _hashCode = HashCode.Combine(Name, Email, Homepage);
     }
 
     #endregion Constructors
 
     #region Properties
 
+    private string[]? _parts;
+
     /// <summary>
-    /// Gets the parts as an enumerable for <see cref="CompareTo(Author)"/>.
+    ///     Gets the parts as an enumerable for <see cref="CompareTo(Author)" />.
     /// </summary>
-    private IEnumerable<string> Parts => new[] {Name, Email, Homepage};
+    private string[] Parts => _parts ??= [Name, Email, Homepage];
 
     #endregion Properties
 
     #region Methods
 
-    /// <inheritdoc cref="ICloneable.Clone"/>
-    public Author Clone() => new Author(Name, Email, Homepage);
+    /// <inheritdoc cref="ICloneable.Clone" />
+    public Author Clone()
+    {
+        return new Author(Name, Email, Homepage);
+    }
 
-    object ICloneable.Clone() => Clone();
+    object ICloneable.Clone()
+    {
+        return Clone();
+    }
 
     /// <inheritdoc />
-    public int CompareTo(object obj) =>
-        obj is Author other
+    public int CompareTo(object obj)
+    {
+        return obj is Author other
             ? CompareTo(other)
             : throw new NotSupportedException("Comparison only supported with Author.");
+    }
 
     /// <inheritdoc />
-    public int CompareTo(Author other) => HashCode.Combine(Parts, other.Parts);
+    public int CompareTo(Author other)
+    {
+        var parts = Parts;
+        var otherParts = other.Parts;
+        var lengthComparison = parts.Length.CompareTo(otherParts.Length);
+        return lengthComparison != 0
+            ? lengthComparison
+            : parts.Select((t, index) => string.Compare(t, otherParts[index], StringComparison.Ordinal))
+                .FirstOrDefault(comparison => comparison != 0);
+    }
 
     /// <inheritdoc />
-    public override bool Equals(object? obj) => obj is Author author && Equals(author);
+    public override bool Equals(object? obj)
+    {
+        return obj is Author author && Equals(author);
+    }
 
     /// <inheritdoc />
-    public bool Equals(Author other) => this == other;
+    public bool Equals(Author other)
+    {
+        return this == other;
+    }
 
     /// <inheritdoc />
-    public bool Equals(string? other) => other is not null && other == this;
+    public bool Equals(string? other)
+    {
+        return other is not null && other == this;
+    }
 
     /// <inheritdoc />
-    public override int GetHashCode() => mHashCode;
+    public override int GetHashCode()
+    {
+        return _hashCode;
+    }
 
     /// <inheritdoc />
-    public override string ToString() =>
-        $"{Name}{(string.IsNullOrEmpty(Email) ? "" : $" <{Email}>")}{(string.IsNullOrEmpty(Homepage) ? "" : $" ({Homepage})")}";
+    public override string ToString()
+    {
+        return
+            $"{Name}{(string.IsNullOrEmpty(Email) ? "" : $" <{Email}>")}{(string.IsNullOrEmpty(Homepage) ? "" : $" ({Homepage})")}";
+    }
 
     #endregion Methods
 
     #region Operators
 
     /// <summary>
-    /// Converts a <see cref="string"/> to an <see cref="Author"/>.
+    ///     Converts a <see cref="string" /> to an <see cref="Author" />.
     /// </summary>
-    /// <param name="authorString">an <see cref="Author"/> <see cref="string"/></param>
-    public static implicit operator Author(string authorString) =>
-        authorString == null ? Empty : new Author(authorString);
+    /// <param name="authorString">an <see cref="Author" /> <see cref="string" /></param>
+    public static implicit operator Author(string authorString)
+    {
+        return authorString == null ? Empty : new Author(authorString);
+    }
 
     /// <summary>
-    /// Converts an <see cref="Author"/> to a <see cref="string"/>.
+    ///     Converts an <see cref="Author" /> to a <see cref="string" />.
     /// </summary>
-    /// <param name="author">an <see cref="Author"/></param>
-    public static implicit operator string(Author author) => author.ToString();
+    /// <param name="author">an <see cref="Author" /></param>
+    public static implicit operator string(Author author)
+    {
+        return author.ToString();
+    }
 
     /// <summary>
-    /// Checks if two <see cref="Author"/>s are not equal.
+    ///     Checks if two <see cref="Author" />s are not equal.
     /// </summary>
     /// <param name="a"></param>
     /// <param name="b"></param>
     /// <returns>if any of the parts are not equal</returns>
-    public static bool operator !=(Author a, Author b) =>
-        !string.Equals(a.Name, b.Name, StringComparison.Ordinal) ||
-        !string.Equals(a.Email, b.Email, StringComparison.Ordinal) ||
-        !string.Equals(a.Homepage, b.Homepage, StringComparison.Ordinal);
+    public static bool operator !=(Author a, Author b)
+    {
+        return !string.Equals(a.Name, b.Name, StringComparison.Ordinal) ||
+               !string.Equals(a.Email, b.Email, StringComparison.Ordinal) ||
+               !string.Equals(a.Homepage, b.Homepage, StringComparison.Ordinal);
+    }
 
     /// <summary>
-    /// Checks if two <see cref="Author"/>s are equal.
+    ///     Checks if two <see cref="Author" />s are equal.
     /// </summary>
     /// <param name="a"></param>
     /// <param name="b"></param>
     /// <returns>if all of the parts are equal</returns>
-    public static bool operator ==(Author a, Author b) =>
-        string.Equals(a.Name, b.Name, StringComparison.Ordinal) &&
-        string.Equals(a.Email, b.Email, StringComparison.Ordinal) &&
-        string.Equals(a.Homepage, b.Homepage, StringComparison.Ordinal);
+    public static bool operator ==(Author a, Author b)
+    {
+        return string.Equals(a.Name, b.Name, StringComparison.Ordinal) &&
+               string.Equals(a.Email, b.Email, StringComparison.Ordinal) &&
+               string.Equals(a.Homepage, b.Homepage, StringComparison.Ordinal);
+    }
 
     #endregion Operators
 
@@ -199,15 +244,19 @@ public override Author ReadJson(
             Author existingValue,
             bool hasExistingValue,
             JsonSerializer serializer
-        ) =>
+        )
+        {
             throw new NotImplementedException();
+        }
 
         /// <inheritdoc />
-        public override void WriteJson(JsonWriter writer, Author value, JsonSerializer serializer) =>
+        public override void WriteJson(JsonWriter writer, Author value, JsonSerializer serializer)
+        {
             writer?.WriteValue(value.ToString());
+        }
 
         #endregion Methods
     }
 
     #endregion Classes
-}
+}