Skip to content

Commit

Permalink
Bump fluent assertions to 5.10.3. Plus manually replace loads of coll…
Browse files Browse the repository at this point in the history 
…ections asserts which form part of a breaking changed, (#368)
  • Loading branch information
@RolandPheasant
RolandPheasant committed Jun 8, 2020
1 parent 0ee049c commit 1e61faa
Show file tree
Hide file tree
Showing 74 changed files with 262 additions and 261 deletions.
2 changes: 1 addition & 1 deletion src/DynamicData.Tests/Binding/BindingLIstBindListFixture.cs
View file
Expand Up @@ -69,7 +69,7 @@ public void AddRange()
_source.AddRange(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion src/DynamicData.Tests/Binding/BindingListBindCacheFixture.cs
View file
Expand Up @@ -68,7 +68,7 @@ public void BatchAdd()
_source.AddOrUpdate(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/DynamicData.Tests/Binding/BindingListBindCacheSortedFixture.cs
View file
Expand Up @@ -75,7 +75,7 @@ public void BatchAdd()
_source.AddOrUpdate(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand All @@ -92,7 +92,7 @@ public void CollectionIsInSortOrder()
{
_source.AddOrUpdate(_generator.Take(100));
var sorted = _source.Items.OrderBy(p => p, _comparer).ToList();
sorted.ShouldAllBeEquivalentTo(_collection.ToList());
sorted.Should().BeEquivalentTo(_collection.ToList());
}

[Fact]
Expand Down
6 changes: 3 additions & 3 deletions src/DynamicData.Tests/Binding/BindingListToChangeSetFixture.cs
View file
Expand Up @@ -42,7 +42,7 @@ public void Remove()

_results.Data.Count.Should().Be(9);
_results.Data.Items.Contains(3).Should().BeFalse();
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);
}

[Fact]
Expand All @@ -60,7 +60,7 @@ public void Replace()
_collection.AddRange(Enumerable.Range(1, 10));
_collection[8] = 20;

_results.Data.Items.ShouldBeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });
_results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });
}

[Fact]
Expand All @@ -69,7 +69,7 @@ public void ResetFiresClearsAndAdds()
_collection.AddRange(Enumerable.Range(1, 10));

_collection.Reset();
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);

var resetNotification = _results.Messages.Last();
resetNotification.Removes.Should().Be(10);
Expand Down
2 changes: 1 addition & 1 deletion src/DynamicData.Tests/Binding/ObservableCollectionBindCacheFixture.cs
View file
Expand Up @@ -66,7 +66,7 @@ public void BatchAdd()
_source.AddOrUpdate(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/DynamicData.Tests/Binding/ObservableCollectionBindCacheSortedFixture.cs
View file
Expand Up @@ -73,7 +73,7 @@ public void BatchAdd()
_source.AddOrUpdate(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand All @@ -90,7 +90,7 @@ public void CollectionIsInSortOrder()
{
_source.AddOrUpdate(_generator.Take(100));
var sorted = _source.Items.OrderBy(p => p, _comparer).ToList();
sorted.ShouldAllBeEquivalentTo(_collection.ToList());
sorted.Should().BeEquivalentTo(_collection.ToList());
}

[Fact]
Expand Down
2 changes: 1 addition & 1 deletion src/DynamicData.Tests/Binding/ObservableCollectionBindListFixture.cs
View file
Expand Up @@ -67,7 +67,7 @@ public void AddRange()
_source.AddRange(people);

_collection.Count.Should().Be(100, "Should be 100 items in the collection");
_collection.ShouldAllBeEquivalentTo(_collection, "Collections should be equivalent");
_collection.Should().BeEquivalentTo(_collection, "Collections should be equivalent");
}

[Fact]
Expand Down
12 changes: 6 additions & 6 deletions src/DynamicData.Tests/Binding/ObservableCollectionExtendedToChangeSetFixture.cs
View file
Expand Up @@ -31,12 +31,12 @@ public void Move()
{
_collection.AddRange(Enumerable.Range(1, 10));

_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
_collection.Move(5, 8);
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);

_collection.Move(7, 1);
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
}

[Fact]
Expand All @@ -58,7 +58,7 @@ public void Remove()

_results.Data.Count.Should().Be(9);
_results.Data.Items.Contains(3).Should().BeFalse();
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
}

[Fact]
Expand All @@ -76,7 +76,7 @@ public void Replace()
_collection.AddRange(Enumerable.Range(1, 10));
_collection[8] = 20;

_results.Data.Items.ShouldBeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });
_results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });

}

Expand All @@ -86,7 +86,7 @@ public void Replace()
// _collection.AddRange(Enumerable.Range(1, 10));

// _collection.Reset();
// _results.Data.Items.ShouldAllBeEquivalentTo(_target);
// _results.Data.Items.Should().BeEquivalentTo(_target);

// var resetNotification = _results.Messages.Last();
// resetNotification.Removes.Should().Be(10);
Expand Down
12 changes: 6 additions & 6 deletions src/DynamicData.Tests/Binding/ObservableCollectionToChangeSetFixture.cs
View file
Expand Up @@ -30,12 +30,12 @@ public void Move()
{
_collection.AddRange(Enumerable.Range(1, 10));

_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);
_collection.Move(5, 8);
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);

_collection.Move(7, 1);
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);
}

[Fact]
Expand All @@ -57,7 +57,7 @@ public void Remove()

_results.Data.Count.Should().Be(9);
_results.Data.Items.Contains(3).Should().BeFalse();
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);
}

[Fact]
Expand All @@ -75,7 +75,7 @@ public void Replace()
_collection.AddRange(Enumerable.Range(1, 10));
_collection[8] = 20;

_results.Data.Items.ShouldBeEquivalentTo(new []{1,2,3,4,5,6,7,8,20,10});
_results.Data.Items.Should().BeEquivalentTo(new []{1,2,3,4,5,6,7,8,20,10});

}

Expand All @@ -85,7 +85,7 @@ public void ResetFiresClearsAndAdds()
_collection.AddRange(Enumerable.Range(1, 10));

_collection.Reset();
_results.Data.Items.ShouldAllBeEquivalentTo(_collection);
_results.Data.Items.Should().BeEquivalentTo(_collection);

var resetNotification = _results.Messages.Last();
resetNotification.Removes.Should().Be(10);
Expand Down
12 changes: 6 additions & 6 deletions src/DynamicData.Tests/Binding/ReadOnlyObservableCollectionToChangeSetFixture.cs
View file
Expand Up @@ -32,12 +32,12 @@ public void Move()
{
_collection.AddRange(Enumerable.Range(1, 10));

_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
_collection.Move(5, 8);
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);

_collection.Move(7, 1);
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
}

[Fact]
Expand All @@ -59,7 +59,7 @@ public void Remove()

_results.Data.Count.Should().Be(9);
_results.Data.Items.Contains(3).Should().BeFalse();
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);
}

[Fact]
Expand All @@ -77,7 +77,7 @@ public void Replace()
_collection.AddRange(Enumerable.Range(1, 10));
_collection[8] = 20;

_results.Data.Items.ShouldBeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });
_results.Data.Items.Should().BeEquivalentTo(new[] { 1, 2, 3, 4, 5, 6, 7, 8, 20, 10 });
}

[Fact]
Expand All @@ -86,7 +86,7 @@ public void ResetFiresClearsAndAdds()
_collection.AddRange(Enumerable.Range(1, 10));

_collection.Reset();
_results.Data.Items.ShouldAllBeEquivalentTo(_target);
_results.Data.Items.Should().BeEquivalentTo(_target);

var resetNotification = _results.Messages.Last();
resetNotification.Removes.Should().Be(10);
Expand Down
8 changes: 4 additions & 4 deletions src/DynamicData.Tests/Cache/DistinctFixture.cs
View file
Expand Up @@ -49,7 +49,7 @@ public void FiresBatchResultOnce()
_results.Messages.Count.Should().Be(1, "Should be 1 updates");
_results.Data.Count.Should().Be(3, "Should be 3 items in the cache");

_results.Data.Items.ShouldAllBeEquivalentTo(new[] {20, 21, 22});
_results.Data.Items.Should().BeEquivalentTo(new[] {20, 21, 22});
_results.Data.Items.First().Should().Be(20, "Should 20");
}

Expand Down Expand Up @@ -94,12 +94,12 @@ public void BreakWithLoadsOfUpdates()
updater.AddOrUpdate(new Person("Person4", 14));
});

_results.Data.Items.ShouldAllBeEquivalentTo(new[] {1, 12, 13, 14});
_results.Data.Items.Should().BeEquivalentTo(new[] {1, 12, 13, 14});

//This previously threw
_source.Remove(new Person("Person3", 13));

_results.Data.Items.ShouldAllBeEquivalentTo(new[] {1, 12, 14});
_results.Data.Items.Should().BeEquivalentTo(new[] {1, 12, 14});
}

[Fact]
Expand All @@ -118,7 +118,7 @@ public void DuplicateKeysRefreshAfterRemove()
source1.Refresh(person); // would previously throw KeyNotFoundException here

results.Messages.Should().HaveCount(1);
results.Data.Items.ShouldAllBeEquivalentTo(new[] {12});
results.Data.Items.Should().BeEquivalentTo(new[] {12});

source1.Remove(person);

Expand Down
2 changes: 1 addition & 1 deletion src/DynamicData.Tests/Cache/DynamicAndFixture.cs
View file
Expand Up @@ -105,7 +105,7 @@ public void AddAndRemoveLists()
_source.Add(_source2.Connect());

_results.Data.Count.Should().Be(10);
_results.Data.Items.ShouldAllBeEquivalentTo(items.Skip(10).Take(10));
_results.Data.Items.Should().BeEquivalentTo(items.Skip(10).Take(10));

_source.Add(_source3.Connect());
_results.Data.Count.Should().Be(0);
Expand Down
6 changes: 3 additions & 3 deletions src/DynamicData.Tests/Cache/DynamicExceptFixture.cs
View file
Expand Up @@ -91,15 +91,15 @@ public void AddAndRemoveLists()
_source.Add(_source3.Connect());

_results.Data.Count.Should().Be(80);
_results.Data.Items.ShouldAllBeEquivalentTo(items.Skip(10).Take(80));
_results.Data.Items.Should().BeEquivalentTo(items.Skip(10).Take(80));

_source.RemoveAt(2);
_results.Data.Count.Should().Be(90);
_results.Data.Items.ShouldAllBeEquivalentTo(items.Skip(10));
_results.Data.Items.Should().BeEquivalentTo(items.Skip(10));

_source.RemoveAt(0);
_results.Data.Count.Should().Be(10);
_results.Data.Items.ShouldAllBeEquivalentTo(items.Take(10));
_results.Data.Items.Should().BeEquivalentTo(items.Take(10));
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/DynamicData.Tests/Cache/DynamicOrFixture.cs
View file
Expand Up @@ -108,14 +108,14 @@ public void AddAndRemoveLists()
_source.Add(_source3.Connect());

_results.Data.Count.Should().Be(100);
_results.Data.Items.ShouldAllBeEquivalentTo(items);
_results.Data.Items.Should().BeEquivalentTo(items);

_source.RemoveAt(1);
var result = items.Take(10)
.Union(items.Skip(20));

_results.Data.Count.Should().Be(90);
_results.Data.Items.ShouldAllBeEquivalentTo(result);
_results.Data.Items.Should().BeEquivalentTo(result);
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/DynamicData.Tests/Cache/DynamicXorFixture.cs
View file
Expand Up @@ -106,13 +106,13 @@ public void AddAndRemoveLists()
_source.Add(_source3.Connect());

_results.Data.Count.Should().Be(100);
_results.Data.Items.ShouldAllBeEquivalentTo(items);
_results.Data.Items.Should().BeEquivalentTo(items);

_source.RemoveAt(1);

var result = items.Take(10).Union(items.Skip(20));
_results.Data.Count.Should().Be(90);
_results.Data.Items.ShouldAllBeEquivalentTo(result);
_results.Data.Items.Should().BeEquivalentTo(result);
}

[Fact]
Expand Down

0 comments on commit 1e61faa

Please sign in to comment.