Skip to content

Commit

Permalink
Adds some additional test framework methods and rearranges some as we…
Browse files Browse the repository at this point in the history 
…ll (#43). Also updates some nullability support (#65).
  • Loading branch information
@scottdorman
scottdorman committed Jan 31, 2021
1 parent 6e48d7f commit d6f702c
Show file tree
Hide file tree
Showing 28 changed files with 1,922 additions and 2,000 deletions.
52 changes: 12 additions & 40 deletions src/Cadru.UnitTest.Framework/AssertExtensions.Emptiness.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ public static partial class AssertExtensions
/// </summary>
/// <param name="assert">The <see cref="Assert"/> instance to extend.</param>
/// <param name="value">The value to be tested.</param>
public static void IsEmpty(this Assert assert, string? value)
{
assert.IsEmpty(value, Strings.IsEmptyStringFailMsg);
}
[Obsolete("Use StringAssert.That.IsEmpty", error: true)]
public static void IsEmpty(this Assert assert, string? value) => StringAssert.That.IsEmpty(value);

/// <summary>
/// Asserts that a string is empty.
Expand All @@ -31,10 +29,8 @@ public static void IsEmpty(this Assert assert, string? value)
/// <param name="message">
/// A message to display. This message can be seen in the unit test results.
/// </param>
public static void IsEmpty(this Assert assert, string? value, string message)
{
assert.IsEmpty(value, message, value?.Length!);
}
[Obsolete("Use StringAssert.That.IsEmpty", error: true)]
public static void IsEmpty(this Assert assert, string? value, string message) => StringAssert.That.IsEmpty(value, message);

/// <summary>
/// Asserts that a string is empty.
Expand All @@ -47,28 +43,16 @@ public static void IsEmpty(this Assert assert, string? value, string message)
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsEmpty(this Assert assert, string? value, string message, params object[] parameters)
{
if (value == null)
{
Helpers.HandleFail("Assert.IsEmpty", Strings.IsEmptyStringFailOnNullMsg);
}

if (value!.Length != 0)
{
Helpers.HandleFail("Assert.IsEmpty", message, parameters);
}
}
[Obsolete("Use StringAssert.That.IsEmpty", error: true)]
public static void IsEmpty(this Assert assert, string? value, string message, params object?[] parameters) => StringAssert.That.IsEmpty(value, message, parameters);

/// <summary>
/// Asserts that a string is not empty.
/// </summary>
/// <param name="assert">The <see cref="Assert"/> instance to extend.</param>
/// <param name="value">The value to be tested.</param>
public static void IsNotEmpty(this Assert assert, string? value)
{
assert.IsNotEmpty(value, Strings.IsNotEmptyStringFailMsg);
}
[Obsolete("Use StringAssert.That.IsNotEmpty", error: true)]
public static void IsNotEmpty(this Assert assert, string? value) => StringAssert.That.IsNotEmpty(value);

/// <summary>
/// Asserts that a string is not empty.
Expand All @@ -78,10 +62,8 @@ public static void IsNotEmpty(this Assert assert, string? value)
/// <param name="message">
/// A message to display. This message can be seen in the unit test results.
/// </param>
public static void IsNotEmpty(this Assert assert, string? value, string message)
{
assert.IsNotEmpty(value, message, Array.Empty<object>());
}
[Obsolete("Use StringAssert.That.IsNotEmpty", error: true)]
public static void IsNotEmpty(this Assert assert, string? value, string message) => StringAssert.That.IsNotEmpty(value, message);

/// <summary>
/// Asserts that a string is not empty.
Expand All @@ -94,17 +76,7 @@ public static void IsNotEmpty(this Assert assert, string? value, string message)
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsNotEmpty(this Assert assert, string? value, string message, params object[] parameters)
{
if (value == null)
{
Helpers.HandleFail("Assert.IsNotEmpty", Strings.IsNotEmptyStringFailOnNullMsg);
}

if (value?.Length == 0)
{
Helpers.HandleFail("Assert.IsNotEmpty", message, parameters);
}
}
[Obsolete("Use StringAssert.That.IsNotEmpty", error: true)]
public static void IsNotEmpty(this Assert assert, string? value, string message, params object?[] parameters) => StringAssert.That.IsNotEmpty(value, message, parameters);
}
}
43 changes: 12 additions & 31 deletions src/Cadru.UnitTest.Framework/AssertExtensions.Equality.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ public static partial class AssertExtensions
/// <param name="assert">The <see cref="Assert"/> instance to extend.</param>
/// <param name="expected">The expected string.</param>
/// <param name="actual">The actual string.</param>
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual)
{
assert.AreEqualIgnoringCase(expected, actual, Strings.Assertion_GenericFailure);
}
[Obsolete("Use StringAssert.That.AreEqualIgnoringCase", error: true)]
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual) => StringAssert.That.AreEqualIgnoringCase(expected, actual);

/// <summary>
/// Asserts that two strings are equal, without regard to case.
Expand All @@ -33,10 +31,8 @@ public static void AreEqualIgnoringCase(this Assert assert, string expected, str
/// <param name="message">
/// A message to display. This message can be seen in the unit test results.
/// </param>
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual, string message)
{
assert.AreEqualIgnoringCase(expected, actual, Strings.Assertion_GenericFailure, expected, actual);
}
[Obsolete("Use StringAssert.That.AreEqualIgnoringCase", error: true)]
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual, string message) => StringAssert.That.AreEqualIgnoringCase(expected, actual, message);

/// <summary>
/// Asserts that two strings are equal, without regard to case.
Expand All @@ -50,24 +46,17 @@ public static void AreEqualIgnoringCase(this Assert assert, string expected, str
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual, string message, params object[] parameters)
{
if (String.Compare(expected, actual, StringComparison.CurrentCultureIgnoreCase) != 0)
{
Helpers.HandleFail("Assert.AreEqualIgnoringCase", message, parameters);
}
}
[Obsolete("Use StringAssert.That.AreEqualIgnoringCase", error: true)]
public static void AreEqualIgnoringCase(this Assert assert, string expected, string actual, string message, params object[] parameters) => StringAssert.That.AreEqualIgnoringCase(expected, actual, message, parameters);

/// <summary>
/// Asserts that two strings are not equal, without regard to case.
/// </summary>
/// <param name="assert">The <see cref="Assert"/> instance to extend.</param>
/// <param name="expected">The expected string.</param>
/// <param name="actual">The actual string.</param>
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual)
{
assert.AreNotEqualIgnoringCase(expected, actual, Strings.Assertion_GenericFailure);
}
[Obsolete("Use StringAssert.That.AreNotEqualIgnoringCase", error: true)]
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual) => StringAssert.That.AreNotEqualIgnoringCase(expected, actual);

/// <summary>
/// Asserts that two strings are not equal, without regard to case.
Expand All @@ -78,10 +67,8 @@ public static void AreNotEqualIgnoringCase(this Assert assert, string expected,
/// <param name="message">
/// A message to display. This message can be seen in the unit test results.
/// </param>
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual, string message)
{
assert.AreNotEqualIgnoringCase(expected, actual, Strings.Assertion_GenericFailure, expected, actual);
}
[Obsolete("Use StringAssert.That.AreNotEqualIgnoringCase", error: true)]
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual, string message) => StringAssert.That.AreNotEqualIgnoringCase(expected, actual, message);

/// <summary>
/// Asserts that two strings are not equal, without regard to case.
Expand All @@ -95,13 +82,7 @@ public static void AreNotEqualIgnoringCase(this Assert assert, string expected,
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual, string message, params object[] parameters)
{
if (String.Compare(expected, actual, StringComparison.CurrentCultureIgnoreCase) == 0)
{
Helpers.HandleFail("Assert.AreEqualIgnoringCase", message, parameters);
}
}

[Obsolete("Use StringAssert.That.AreNotEqualIgnoringCase", error: true)]
public static void AreNotEqualIgnoringCase(this Assert assert, string expected, string actual, string message, params object[] parameters) => StringAssert.That.AreNotEqualIgnoringCase(expected, actual, message, parameters);
}
}
7 changes: 2 additions & 5 deletions src/Cadru.UnitTest.Framework/AssertExtensions.Exceptions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ public static void DoesNotThrowException(this Assert assert, Action action, stri
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "<Pending>")]
public static void DoesNotThrowException(this Assert assert, Action action, string message, params object[] parameters)
public static void DoesNotThrowException(this Assert assert, Action action, string message, params object?[] parameters)
{
if (action == null)
{
Expand All @@ -79,9 +78,7 @@ public static void DoesNotThrowException(this Assert assert, Action action, stri
}
catch (Exception ex)
{
Helpers.HandleFail("Assert.DoesNotThrowException", message, parameters, ex.GetType().Name,
ex.Message,
ex.StackTrace);
Helpers.HandleFail("Assert.DoesNotThrowException", message, parameters, ex.GetType().Name, ex.Message, ex.StackTrace);
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions src/Cadru.UnitTest.Framework/AssertExtensions.IsGreater.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static void IsGreater(this Assert assert, byte expected, byte actual, str
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, byte expected, byte actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, byte expected, byte actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -99,7 +99,7 @@ public static void IsGreater(this Assert assert, sbyte expected, sbyte actual, s
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, sbyte expected, sbyte actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, sbyte expected, sbyte actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -147,7 +147,7 @@ public static void IsGreater(this Assert assert, char expected, char actual, str
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, char expected, char actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, char expected, char actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -194,7 +194,7 @@ public static void IsGreater(this Assert assert, decimal expected, decimal actua
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, decimal expected, decimal actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, decimal expected, decimal actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -241,7 +241,7 @@ public static void IsGreater(this Assert assert, double expected, double actual,
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, double expected, double actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, double expected, double actual, string message, params object?[] parameters)
{
if (Double.IsNaN(expected) || Double.IsNaN(actual) || expected <= actual)
{
Expand Down Expand Up @@ -288,7 +288,7 @@ public static void IsGreater(this Assert assert, float expected, float actual, s
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, float expected, float actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, float expected, float actual, string message, params object?[] parameters)
{
if (Single.IsNaN(expected) || Single.IsNaN(actual) || expected <= actual)
{
Expand Down Expand Up @@ -335,7 +335,7 @@ public static void IsGreater(this Assert assert, int expected, int actual, strin
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, int expected, int actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, int expected, int actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -382,7 +382,7 @@ public static void IsGreater(this Assert assert, uint expected, uint actual, str
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, uint expected, uint actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, uint expected, uint actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -429,7 +429,7 @@ public static void IsGreater(this Assert assert, long expected, long actual, str
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, long expected, long actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, long expected, long actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -477,7 +477,7 @@ public static void IsGreater(this Assert assert, ulong expected, ulong actual, s
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, ulong expected, ulong actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, ulong expected, ulong actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -524,7 +524,7 @@ public static void IsGreater(this Assert assert, short expected, short actual, s
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, short expected, short actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, short expected, short actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -571,7 +571,7 @@ public static void IsGreater(this Assert assert, ushort expected, ushort actual,
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater(this Assert assert, ushort expected, ushort actual, string message, params object[] parameters)
public static void IsGreater(this Assert assert, ushort expected, ushort actual, string message, params object?[] parameters)
{
if (expected <= actual)
{
Expand Down Expand Up @@ -622,7 +622,7 @@ public static void IsGreater(this Assert assert, ushort expected, ushort actual,
/// <param name="parameters">
/// An array of parameters to use when formatting <paramref name="message"/>.
/// </param>
public static void IsGreater<T>(this Assert assert, T expected, T actual, string message, params object[] parameters) where T : IComparable
public static void IsGreater<T>(this Assert assert, T expected, T actual, string message, params object?[] parameters) where T : IComparable
{
if (expected.CompareTo(actual) <= 0)
{
Expand Down
Loading

0 comments on commit d6f702c

Please sign in to comment.