Skip to content

Commit 6377f17

Browse files
robdmoorerobdmoore
authored
Merge pull request #65 from TestStack/netstandard20
netstandard 2.0
2 parents 704d76f + 43b7250 commit 6377f17

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+226
-529
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ _ReSharper.*
1111
packages
1212
*.DotSettings
1313
*.ncrunchproject
14-
*.ncrunchsolution
14+
*.ncrunchsolution
15+
16+
# Visual Studio 2015 cache/options directory
17+
.vs/

‎NuGet.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
</packageSources>
6+
</configuration>

‎TestStack.Dossier.Tests/Assembly.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Xunit;
2+
3+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎TestStack.Dossier.Tests/Builder_CreateListTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ public void WhenBuildingObjectsImplicitly_ThenTheAnonymousValueFixtureIsSharedAc
170170
studentViewModels.Select(x => x.Grade).ShouldBeUnique();
171171
}
172172

173+
[Fact]
173174
public void WhenBuildingObjectsWithCtorAndPrivateSetters_ThenSetPrivateSettersByDefault()
174175
{
175176
var dto = Builder<MixedAccessibilityDto>.CreateListOfSize(1)

‎TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
using Shouldly;
44
using TestStack.Dossier.DataSources;
55
using TestStack.Dossier.DataSources.Dictionaries;
6-
using Xunit.Extensions;
6+
using Xunit;
77

88
namespace TestStack.Dossier.Tests.DataSources
99
{
1010
public class DataSourceConventionTests
1111
{
1212
[Theory]
13-
[PropertyData("TestCases")]
13+
[MemberData(nameof(TestCases))]
1414
public void DataSourceConventions(DataSource<string> sut, int expectedCount)
1515
{
1616
var collection = sut.Data.ToList();

‎TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class FileDataConventions
1313
[Fact]
1414
public void ApplyConventions()
1515
{
16-
var assembly = typeof(IAnonymousValueSupplier).Assembly;
16+
var assembly = typeof(IAnonymousValueSupplier).GetTypeInfo().Assembly;
1717
var resources = assembly
1818
.GetManifestResourceNames()
1919
.Where(x => x.EndsWith(".txt"))
@@ -27,7 +27,7 @@ public void ApplyConventions()
2727
}
2828
}
2929

30-
public void Should_not_contain_duplicates(List<string> collection, string fileName)
30+
private void Should_not_contain_duplicates(List<string> collection, string fileName)
3131
{
3232
var duplicates = collection
3333
.GroupBy(x => x)
@@ -43,7 +43,7 @@ public void Should_not_contain_duplicates(List<string> collection, string fileNa
4343
}
4444
}
4545

46-
public void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
46+
private void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
4747
{
4848
var blanks = collection.Where(string.IsNullOrEmpty).ToList();
4949
if (blanks.Any())

‎TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Shouldly;
44
using TestStack.Dossier.DataSources.Generators;
55
using Xunit;
6-
using Xunit.Extensions;
76

87
namespace TestStack.Dossier.Tests.DataSources.Generators
98
{

‎TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Shouldly;
33
using TestStack.Dossier.DataSources.Generators;
44
using Xunit;
5-
using Xunit.Extensions;
65

76
namespace TestStack.Dossier.Tests.DataSources.Generators
87
{

‎TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using TestStack.Dossier.DataSources;
33
using TestStack.Dossier.DataSources.Dictionaries;
4-
using Xunit.Extensions;
4+
using Xunit;
55

66
namespace TestStack.Dossier.Tests.EquivalenceClasses
77
{

‎TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.Generic;
22
using TestStack.Dossier.DataSources;
33
using TestStack.Dossier.DataSources.Dictionaries;
4-
using Xunit.Extensions;
4+
using Xunit;
55

66
namespace TestStack.Dossier.Tests.EquivalenceClasses
77
{

0 commit comments

Comments
 (0)