Merge pull request #65 from TestStack/netstandard20

netstandard 2.0
TestStack · Jan 13, 2019 · 6377f17 · 6377f17
2 parents 704d76f + 43b7250
commit 6377f17
Show file tree

Hide file tree

Showing 46 changed files with 226 additions and 529 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,7 @@ _ReSharper.*
 packages
 *.DotSettings
 *.ncrunchproject
-*.ncrunchsolution
+*.ncrunchsolution
+
+# Visual Studio 2015 cache/options directory
+.vs/
diff --git a/NuGet.config b/NuGet.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
diff --git a/TestStack.Dossier.Tests/Assembly.cs b/TestStack.Dossier.Tests/Assembly.cs
@@ -0,0 +1,3 @@
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/TestStack.Dossier.Tests/Builder_CreateListTests.cs b/TestStack.Dossier.Tests/Builder_CreateListTests.cs
@@ -170,6 +170,7 @@ public void WhenBuildingObjectsImplicitly_ThenTheAnonymousValueFixtureIsSharedAc
             studentViewModels.Select(x => x.Grade).ShouldBeUnique();
         }
 
+        [Fact]
         public void WhenBuildingObjectsWithCtorAndPrivateSetters_ThenSetPrivateSettersByDefault()
         {
             var dto = Builder<MixedAccessibilityDto>.CreateListOfSize(1)

diff --git a/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs b/TestStack.Dossier.Tests/DataSources/DataSourceConventionTests.cs
@@ -3,14 +3,14 @@
 using Shouldly;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.DataSources
 {
     public class DataSourceConventionTests
     {
         [Theory]
-        [PropertyData("TestCases")]
+        [MemberData(nameof(TestCases))]
         public void DataSourceConventions(DataSource<string> sut, int expectedCount)
         {
             var collection = sut.Data.ToList();

diff --git a/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs b/TestStack.Dossier.Tests/DataSources/Dictionaries/Resources/FileDataConventions.cs
@@ -13,7 +13,7 @@ public class FileDataConventions
         [Fact]
         public void ApplyConventions()
         {
-            var assembly = typeof(IAnonymousValueSupplier).Assembly;
+            var assembly = typeof(IAnonymousValueSupplier).GetTypeInfo().Assembly;
             var resources = assembly
                 .GetManifestResourceNames()
                 .Where(x => x.EndsWith(".txt"))
@@ -27,7 +27,7 @@ public void ApplyConventions()
             }
         }
 
-        public void Should_not_contain_duplicates(List<string> collection, string fileName)
+        private void Should_not_contain_duplicates(List<string> collection, string fileName)
         {
             var duplicates = collection
                 .GroupBy(x => x)
@@ -43,7 +43,7 @@ public void Should_not_contain_duplicates(List<string> collection, string fileNa
             }
         }
 
-        public void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
+        private void Should_not_contain_null_or_empty_values(List<string> collection, string fileName)
         {
             var blanks = collection.Where(string.IsNullOrEmpty).ToList();
             if (blanks.Any())

diff --git a/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs b/TestStack.Dossier.Tests/DataSources/Generators/RandomGeneratorTests.cs
@@ -3,7 +3,6 @@
 using Shouldly;
 using TestStack.Dossier.DataSources.Generators;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.DataSources.Generators
 {

diff --git a/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs b/TestStack.Dossier.Tests/DataSources/Generators/SequentiaGeneratorTests.cs
@@ -2,7 +2,6 @@
 using Shouldly;
 using TestStack.Dossier.DataSources.Generators;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.DataSources.Generators
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressAusEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUkEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/AddressUsEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/ColourEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/CompanyEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FinanceEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/FrequencyEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceClassesTests.cs
@@ -2,7 +2,7 @@
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.EquivalenceClasses.Geo;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
@@ -22,11 +22,11 @@ protected override List<object[]> GetData()
         {
             return new List<object[]>
             {
-                new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Continent)},
-                new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Country)},
-                new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.CountryCode)},
-                new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Latitude)},
-                new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Longitude)},
+                new object[] {new Words(FromDictionary.GeoContinent), GenerateTestCasesForSut(Any.Geography.Continent)},
+                new object[] {new Words(FromDictionary.GeoCountry), GenerateTestCasesForSut(Any.Geography.Country)},
+                new object[] {new Words(FromDictionary.GeoCountryCode), GenerateTestCasesForSut(Any.Geography.CountryCode)},
+                new object[] {new Words(FromDictionary.GeoLatitude), GenerateTestCasesForSut(Any.Geography.Latitude)},
+                new object[] {new Words(FromDictionary.GeoLongitude), GenerateTestCasesForSut(Any.Geography.Longitude)},
             };
         }
     }

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/GeoEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/IdentifierEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/IntegerEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/LoremIpsumEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceClassesTests.cs
@@ -5,7 +5,6 @@
 using TestStack.Dossier.DataSources.Dictionaries;
 using TestStack.Dossier.EquivalenceClasses.Person;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {
@@ -26,10 +25,10 @@ public void WhenGettingUniqueEmail_ThenReturnUniqueEmailsAcrossFixtureInstances(
             var any2 = new AnonymousValueFixture();
 
             PersonEquivalenceExtensions.InitializeUniqueEmailAddressSource();
-            generatedValues.Add(any2.UniqueEmailAddress());
+            generatedValues.Add(any2.Person.UniqueEmailAddress());
             for (var i = 0; i < source.Data.Count - 1; i++)
             {
-                generatedValues.Add(Any.UniqueEmailAddress());
+                generatedValues.Add(Any.Person.UniqueEmailAddress());
             }
 
             generatedValues.Distinct().Count()
@@ -44,17 +43,17 @@ protected override List<object[]> GetData()
             return new List<object[]>
             {
                 new object[]
-                {new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.EmailAddress)},
-                new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Language)},
+                {new Words(FromDictionary.PersonEmailAddress), GenerateTestCasesForSut(Any.Person.EmailAddress)},
+                new object[] {new Words(FromDictionary.PersonLanguage), GenerateTestCasesForSut(Any.Person.Language)},
                 new object[]
-                {new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.FemaleFirstName)},
-                new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.FirstName)},
-                new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.FullName)},
-                new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.LastName)},
+                {new Words(FromDictionary.PersonNameFirstFemale), GenerateTestCasesForSut(Any.Person.NameFirstFemale)},
+                new object[] {new Words(FromDictionary.PersonNameFirst), GenerateTestCasesForSut(Any.Person.NameFirst)},
+                new object[] {new Words(FromDictionary.PersonNameFull), GenerateTestCasesForSut(Any.Person.NameFull)},
+                new object[] {new Words(FromDictionary.PersonNameLast), GenerateTestCasesForSut(Any.Person.NameLast)},
                 new object[]
-                {new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.MaleFirstName)},
-                new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Suffix)},
-                new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Title)},
+                {new Words(FromDictionary.PersonNameFirstMale), GenerateTestCasesForSut(Any.Person.NameFirstMale)},
+                new object[] {new Words(FromDictionary.PersonNameSuffix), GenerateTestCasesForSut(Any.Person.NameSuffix)},
+                new object[] {new Words(FromDictionary.PersonNameTitle), GenerateTestCasesForSut(Any.Person.NameTitle)},
             };
         }
     }

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/PersonEquivalenceTests.cs
@@ -4,7 +4,6 @@
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
 using Xunit;
-using Xunit.Extensions;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs b/TestStack.Dossier.Tests/EquivalenceClasses/ShirtSizeEquivalenceTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using TestStack.Dossier.DataSources;
 using TestStack.Dossier.DataSources.Dictionaries;
-using Xunit.Extensions;
+using Xunit;
 
 namespace TestStack.Dossier.Tests.EquivalenceClasses
 {

diff --git a/TestStack.Dossier.Tests/Properties/AssemblyInfo.cs b/TestStack.Dossier.Tests/Properties/AssemblyInfo.cs
diff --git a/TestStack.Dossier.Tests/ProxyBuilderTests.cs b/TestStack.Dossier.Tests/ProxyBuilderTests.cs
@@ -7,7 +7,7 @@
 
 namespace TestStack.Dossier.Tests
 {
-    class ProxyBuilderTests
+    public class ProxyBuilderTests
     {
         [Fact]
         public void GivenClassToProxyWithNoProperties_WhenBuildingProxy_ReturnAClassWithNoReturnsValuesSet()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		using Xunit;

		[assembly: CollectionBehavior(DisableTestParallelization = true)]
-Original file line number
+Diff line change
@@ Expand Up @@
                 studentViewModels.Select(x => x.Grade).ShouldBeUnique();
             }
+            [Fact]
             public void WhenBuildingObjectsWithCtorAndPrivateSetters_ThenSetPrivateSettersByDefault()
             {
                 var dto = Builder<MixedAccessibilityDto>.CreateListOfSize(1)
@@ Expand Down @@