Skip to content

Commit 0be7b8c

Browse files
committed
Renames IEnumerable check method IsEmptyOrNull to IsNullOrEmpty.
1 parent dcb5ec7 commit 0be7b8c

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

NFluent.Tests/EnumerableRelatedTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,39 +126,39 @@ public void IsEmptyThrowsExceptionWhenNotEmpty()
126126
}
127127

128128
[Test]
129-
public void IsEmptyOrNullWorks()
129+
public void IsNullOrEmptyWorks()
130130
{
131-
Check.That(EmptyEnumerable).IsEmptyOrNull();
132-
Check.That((IEnumerable)null).IsEmptyOrNull();
131+
Check.That(EmptyEnumerable).IsNullOrEmpty();
132+
Check.That((IEnumerable)null).IsNullOrEmpty();
133133
}
134134

135135
[Test]
136-
[ExpectedException(typeof(FluentCheckException), ExpectedMessage = "\nThe checked IEnumerable contains items, whereas it must be empty or null.\nThe checked IEnumerable:\n\t[null, null, Thomas]")]
137-
public void IsEmptyOrNullFailsAppropriately()
136+
[ExpectedException(typeof(FluentCheckException), ExpectedMessage = "\nThe checked IEnumerable contains items, whereas it must be null or empty.\nThe checked IEnumerable:\n\t[null, null, Thomas]")]
137+
public void IsNullOrEmptyFailsAppropriately()
138138
{
139139
var persons = new List<Person> { null, null, new Person { Name = "Thomas" } };
140-
Check.That(persons).IsEmptyOrNull();
140+
Check.That(persons).IsNullOrEmpty();
141141
}
142142

143143
[Test]
144-
public void NotIsEmptyOrNullWorks()
144+
public void NotIsNullOrEmptyWorks()
145145
{
146146
var persons = new List<Person> { null, null, new Person { Name = "Thomas" } };
147-
Check.That(persons).Not.IsEmptyOrNull();
147+
Check.That(persons).Not.IsNullOrEmpty();
148148
}
149149

150150
[Test]
151151
[ExpectedException(typeof(FluentCheckException), ExpectedMessage = "\nThe checked IEnumerable is empty, where as it must contain at least one item.")]
152-
public void NotIsEmptyOrNullFailsIfEmpty()
152+
public void NotIsNullOrEmptyFailsIfEmpty()
153153
{
154-
Check.That(EmptyEnumerable).Not.IsEmptyOrNull();
154+
Check.That(EmptyEnumerable).Not.IsNullOrEmpty();
155155
}
156156

157157
[Test]
158158
[ExpectedException(typeof(FluentCheckException), ExpectedMessage = "\nThe checked IEnumerable is null, where as it must contain at least one item.")]
159-
public void NotIsEmptyOrNullFailsIfNull()
159+
public void NotIsNullOrEmptyFailsIfNull()
160160
{
161-
Check.That((IEnumerable)null).Not.IsEmptyOrNull();
161+
Check.That((IEnumerable)null).Not.IsNullOrEmpty();
162162
}
163163

164164
[Test]

NFluent/Assertions/EnumerableCheckExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ public static ICheckLink<ICheck<IEnumerable>> IsEmpty(this ICheck<IEnumerable> c
399399
/// A check link.
400400
/// </returns>
401401
/// <exception cref="FluentCheckException">The enumerable is not empty.</exception>
402-
public static ICheckLink<ICheck<IEnumerable>> IsEmptyOrNull(this ICheck<IEnumerable> check)
402+
public static ICheckLink<ICheck<IEnumerable>> IsNullOrEmpty(this ICheck<IEnumerable> check)
403403
{
404404
var runnableCheck = check as IRunnableCheck<IEnumerable>;
405405
var value = runnableCheck.Value;
@@ -412,7 +412,7 @@ public static ICheckLink<ICheck<IEnumerable>> IsEmptyOrNull(this ICheck<IEnumera
412412
if (!negated)
413413
{
414414
message =
415-
FluentMessage.BuildMessage("The {0} contains items, whereas it must be empty or null.")
415+
FluentMessage.BuildMessage("The {0} contains items, whereas it must be null or empty.")
416416
.For("IEnumerable")
417417
.On(value)
418418
.ToString();

0 commit comments

Comments
 (0)