Skip to content

Commit 95df45d

Browse files
committed
Move Equal onto ObjectAssertions.
1 parent 50003e0 commit 95df45d

11 files changed

+139
-181
lines changed

doc/MrKWatkins.Assertions.tree

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@
4242
<toc-element toc-title="Value" topic="MrKWatkins.Assertions.EnumerableAssertionsChain-2.Value.md" />
4343
</toc-element>
4444
</toc-element>
45-
<toc-element toc-title="EqualityExtensions">
46-
<toc-element toc-title="EqualityExtensions" topic="MrKWatkins.Assertions.EqualityExtensions.md" />
47-
<toc-element toc-title="Methods">
48-
<toc-element toc-title="Equal" topic="MrKWatkins.Assertions.EqualityExtensions.Equal.md" />
49-
<toc-element toc-title="NotEqual" topic="MrKWatkins.Assertions.EqualityExtensions.NotEqual.md" />
50-
</toc-element>
51-
</toc-element>
5245
<toc-element toc-title="ExceptionExtensions">
5346
<toc-element toc-title="ExceptionExtensions" topic="MrKWatkins.Assertions.ExceptionExtensions.md" />
5447
<toc-element toc-title="Methods">
@@ -94,12 +87,14 @@
9487
<toc-element toc-title="BeNull" topic="MrKWatkins.Assertions.ObjectAssertions-1.BeNull.md" />
9588
<toc-element toc-title="BeOfType" topic="MrKWatkins.Assertions.ObjectAssertions-1.BeOfType.md" />
9689
<toc-element toc-title="BeTheSameInstanceAs" topic="MrKWatkins.Assertions.ObjectAssertions-1.BeTheSameInstanceAs.md" />
90+
<toc-element toc-title="Equal" topic="MrKWatkins.Assertions.ObjectAssertions-1.Equal.md" />
9791
<toc-element toc-title="Equals" topic="MrKWatkins.Assertions.ObjectAssertions-1.Equals.md" />
9892
<toc-element toc-title="GetHashCode" topic="MrKWatkins.Assertions.ObjectAssertions-1.GetHashCode.md" />
9993
<toc-element toc-title="GetType" topic="MrKWatkins.Assertions.ObjectAssertions-1.GetType.md" />
10094
<toc-element toc-title="NotBeNull" topic="MrKWatkins.Assertions.ObjectAssertions-1.NotBeNull.md" />
10195
<toc-element toc-title="NotBeOfType" topic="MrKWatkins.Assertions.ObjectAssertions-1.NotBeOfType.md" />
10296
<toc-element toc-title="NotBeTheSameInstanceAs" topic="MrKWatkins.Assertions.ObjectAssertions-1.NotBeTheSameInstanceAs.md" />
97+
<toc-element toc-title="NotEqual" topic="MrKWatkins.Assertions.ObjectAssertions-1.NotEqual.md" />
10398
<toc-element toc-title="ToString" topic="MrKWatkins.Assertions.ObjectAssertions-1.ToString.md" />
10499
</toc-element>
105100
</toc-element>

doc/topics/API/MrKWatkins.Assertions.EqualityExtensions.Equal.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

doc/topics/API/MrKWatkins.Assertions.EqualityExtensions.NotEqual.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

doc/topics/API/MrKWatkins.Assertions.EqualityExtensions.md

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# ObjectAssertions&lt;T&gt;.Equal Method
2+
## Definition
3+
4+
```c#
5+
public ObjectAssertionsChain<T> Equal(T? expected);
6+
```
7+
8+
## Parameters
9+
10+
| Name | Type | Description |
11+
| ---- | ---- | ----------- |
12+
| expected | T | |
13+
14+
## Returns
15+
16+
[ObjectAssertionsChain&lt;T&gt;](MrKWatkins.Assertions.ObjectAssertionsChain-1.md)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# ObjectAssertions&lt;T&gt;.NotEqual Method
2+
## Definition
3+
4+
```c#
5+
public ObjectAssertionsChain<T> NotEqual(T? expected);
6+
```
7+
8+
## Parameters
9+
10+
| Name | Type | Description |
11+
| ---- | ---- | ----------- |
12+
| expected | T | |
13+
14+
## Returns
15+
16+
[ObjectAssertionsChain&lt;T&gt;](MrKWatkins.Assertions.ObjectAssertionsChain-1.md)

doc/topics/API/MrKWatkins.Assertions.ObjectAssertions-1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ public class ObjectAssertions<T>
3030
| [BeNull()](MrKWatkins.Assertions.ObjectAssertions-1.BeNull.md) | |
3131
| [BeOfType&lt;TOther&gt;()](MrKWatkins.Assertions.ObjectAssertions-1.BeOfType.md) | |
3232
| [BeTheSameInstanceAs(T)](MrKWatkins.Assertions.ObjectAssertions-1.BeTheSameInstanceAs.md) | |
33+
| [Equal(T)](MrKWatkins.Assertions.ObjectAssertions-1.Equal.md) | |
3334
| [Equals(Object)](MrKWatkins.Assertions.ObjectAssertions-1.Equals.md) | |
3435
| [GetHashCode()](MrKWatkins.Assertions.ObjectAssertions-1.GetHashCode.md) | |
3536
| [GetType()](MrKWatkins.Assertions.ObjectAssertions-1.GetType.md) | |
3637
| [NotBeNull()](MrKWatkins.Assertions.ObjectAssertions-1.NotBeNull.md) | |
3738
| [NotBeOfType&lt;TOther&gt;()](MrKWatkins.Assertions.ObjectAssertions-1.NotBeOfType.md) | |
3839
| [NotBeTheSameInstanceAs(T)](MrKWatkins.Assertions.ObjectAssertions-1.NotBeTheSameInstanceAs.md) | |
40+
| [NotEqual(T)](MrKWatkins.Assertions.ObjectAssertions-1.NotEqual.md) | |
3941
| [ToString()](MrKWatkins.Assertions.ObjectAssertions-1.ToString.md) | |
4042

src/MrKWatkins.Assertions.Tests/EqualityExtensionsTests.cs

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/MrKWatkins.Assertions.Tests/ObjectAssertionsTests.cs

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,81 @@ public async Task NotBeNull_Chain()
7070
await Assert.That(and.Value).IsEqualTo(notNullValue);
7171
}
7272

73+
[Test]
74+
public async Task Equal_Null()
75+
{
76+
string? nullValue = null;
77+
const string nonNullValue = "Not Null";
78+
79+
await Assert.That(() => nullValue.Should().Equal(nonNullValue)).Throws<AssertionException>().WithMessage("Value should equal \"Not Null\" but was null.");
80+
await Assert.That(() => nullValue.Should().Equal(nullValue)).ThrowsNothing();
81+
}
82+
83+
[Test]
84+
public async Task Equal()
85+
{
86+
const string value = "Test";
87+
const string otherValue = "Not Test";
88+
89+
await Assert.That(() => value.Should().Equal(otherValue)).Throws<AssertionException>().WithMessage("Value should equal \"Not Test\" but was \"Test\".");
90+
await Assert.That(() => value.Should().Equal(value)).ThrowsNothing();
91+
}
92+
93+
[Test]
94+
public async Task Equal_Enum()
95+
{
96+
const ConsoleColor value = ConsoleColor.Blue;
97+
const ConsoleColor otherValue = ConsoleColor.Red;
98+
99+
await Assert.That(() => value.Should().Equal(otherValue)).Throws<AssertionException>().WithMessage("Value should equal Red but was Blue.");
100+
await Assert.That(() => value.Should().Equal(value)).ThrowsNothing();
101+
}
102+
103+
[Test]
104+
public async Task Equal_Chain()
105+
{
106+
const string value = "Test";
107+
108+
var chain = value.Should().Equal(value);
109+
await Assert.That(chain.Value).IsEqualTo(value);
110+
111+
var and = chain.And;
112+
await Assert.That(and.Value).IsEqualTo(value);
113+
}
114+
115+
[Test]
116+
public async Task NotEqual_Null()
117+
{
118+
string? nullValue = null;
119+
const string nonNullValue = "Not Null";
120+
121+
await Assert.That(() => nullValue.Should().NotEqual(nonNullValue)).ThrowsNothing();
122+
await Assert.That(() => nullValue.Should().NotEqual(nullValue)).Throws<AssertionException>().WithMessage("Value should not equal null.");
123+
}
124+
125+
[Test]
126+
public async Task NotEqual()
127+
{
128+
const string value = "Test";
129+
const string otherValue = "Not Test";
130+
131+
await Assert.That(() => value.Should().NotEqual(otherValue)).ThrowsNothing();
132+
await Assert.That(() => value.Should().NotEqual(value)).Throws<AssertionException>().WithMessage("Value should not equal \"Test\".");
133+
}
134+
135+
[Test]
136+
public async Task NotEqual_Chain()
137+
{
138+
const string value = "Test";
139+
const string otherValue = "Not Test";
140+
141+
var chain = value.Should().NotEqual(otherValue);
142+
await Assert.That(chain.Value).IsEqualTo(value);
143+
144+
var and = chain.And;
145+
await Assert.That(and.Value).IsEqualTo(value);
146+
}
147+
73148
[Test]
74149
public async Task BeTheSameInstanceAs()
75150
{

src/MrKWatkins.Assertions/EqualityExtensions.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)