Skip to content

Commit 9269810

Browse files
TynamixTynamix
authored
Merge pull request #95 from Tynamix/Refactor_Project_to_VS_2017
Refactor project to vs 2017
2 parents 8cce369 + d2dadd3 commit 9269810

45 files changed

Lines changed: 1113 additions & 6384 deletions

Some content is hidden

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

‎ObjectFillerNET.sln‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,48 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26206.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EC5FD26-A565-4D47-A192-0FC142C3B7F0}"
7-
ProjectSection(SolutionItems) = preProject
8-
global.json = global.json
9-
EndProjectSection
107
EndProject
11-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tynamix.ObjectFiller", "Tynamix.ObjectFiller\Tynamix.ObjectFiller.xproj", "{3208D63E-1A26-453C-8A31-03491CD23780}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tynamix.ObjectFiller", "Tynamix.ObjectFiller\Tynamix.ObjectFiller.csproj", "{3208D63E-1A26-453C-8A31-03491CD23780}"
129
EndProject
13-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tynamix.ObjectFiller.Test", "Tynamix.ObjectFiller.Test\Tynamix.ObjectFiller.Test.xproj", "{F679FAB4-CE29-48F8-B87C-3C89CDAF0D85}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tynamix.Objectfiller.Test", "Tynamix.Objectfiller.Test\Tynamix.Objectfiller.Test.csproj", "{76592E58-909C-4AE7-9FE4-6AD415AE1D80}"
1411
EndProject
1512
Global
1613
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1714
Debug|Any CPU = Debug|Any CPU
15+
Debug|x64 = Debug|x64
16+
Debug|x86 = Debug|x86
1817
Release|Any CPU = Release|Any CPU
18+
Release|x64 = Release|x64
19+
Release|x86 = Release|x86
1920
EndGlobalSection
2021
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2122
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2223
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|x64.ActiveCfg = Debug|x64
25+
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|x64.Build.0 = Debug|x64
26+
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|x86.ActiveCfg = Debug|x86
27+
{3208D63E-1A26-453C-8A31-03491CD23780}.Debug|x86.Build.0 = Debug|x86
2328
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|Any CPU.ActiveCfg = Release|Any CPU
2429
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{F679FAB4-CE29-48F8-B87C-3C89CDAF0D85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{F679FAB4-CE29-48F8-B87C-3C89CDAF0D85}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{F679FAB4-CE29-48F8-B87C-3C89CDAF0D85}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{F679FAB4-CE29-48F8-B87C-3C89CDAF0D85}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|x64.ActiveCfg = Release|x64
31+
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|x64.Build.0 = Release|x64
32+
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|x86.ActiveCfg = Release|x86
33+
{3208D63E-1A26-453C-8A31-03491CD23780}.Release|x86.Build.0 = Release|x86
34+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|x64.ActiveCfg = Debug|Any CPU
37+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|x64.Build.0 = Debug|Any CPU
38+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|x86.ActiveCfg = Debug|Any CPU
39+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Debug|x86.Build.0 = Debug|Any CPU
40+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|x64.ActiveCfg = Release|Any CPU
43+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|x64.Build.0 = Release|Any CPU
44+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|x86.ActiveCfg = Release|Any CPU
45+
{76592E58-909C-4AE7-9FE4-6AD415AE1D80}.Release|x86.Build.0 = Release|Any CPU
2946
EndGlobalSection
3047
GlobalSection(SolutionProperties) = preSolution
3148
HideSolutionNode = FALSE

‎Tynamix.ObjectFiller.Test/AddressFillingTest.cs‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,88 @@
1-
using Xunit;
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
22
using ObjectFiller.Test.TestPoco.Person;
33
using Tynamix.ObjectFiller;
44

55
namespace ObjectFiller.Test
66
{
77
using System.Linq;
88

9-
9+
[TestClass]
1010
public class AddressFillingTest
1111
{
12-
[Fact]
12+
[TestMethod]
1313
public void FillAllAddressProperties()
1414
{
1515
Filler<Address> addressFiller = new Filler<Address>();
16-
Address a = addressFiller.Create();
16+
Address a = addressFiller.Create();
1717

18-
Assert.NotNull(a.City);
19-
Assert.NotNull(a.Country);
20-
Assert.NotEqual(0, a.HouseNumber);
21-
Assert.NotNull(a.PostalCode);
22-
Assert.NotNull(a.Street);
18+
Assert.IsNotNull(a.City);
19+
Assert.IsNotNull(a.Country);
20+
Assert.AreNotEqual(0, a.HouseNumber);
21+
Assert.IsNotNull(a.PostalCode);
22+
Assert.IsNotNull(a.Street);
2323
}
2424

25-
[Fact]
25+
[TestMethod]
2626
public void IgnoreCountry()
2727
{
2828
Filler<Address> addressFiller = new Filler<Address>();
2929
addressFiller.Setup()
3030
.OnProperty(x => x.Country).IgnoreIt();
3131
Address a = addressFiller.Create();
3232

33-
Assert.NotNull(a.City);
34-
Assert.Null(a.Country);
35-
Assert.NotEqual(0, a.HouseNumber);
36-
Assert.NotNull(a.PostalCode);
37-
Assert.NotNull(a.Street);
33+
Assert.IsNotNull(a.City);
34+
Assert.IsNull(a.Country);
35+
Assert.AreNotEqual(0, a.HouseNumber);
36+
Assert.IsNotNull(a.PostalCode);
37+
Assert.IsNotNull(a.Street);
3838
}
3939

40-
[Fact]
40+
[TestMethod]
4141
public void IgnoreCountryAndCity()
4242
{
4343
Filler<Address> addressFiller = new Filler<Address>();
4444
addressFiller.Setup()
4545
.OnProperty(x => x.Country, x => x.City).IgnoreIt();
4646
Address a = addressFiller.Create();
4747

48-
Assert.Null(a.City);
49-
Assert.Null(a.Country);
50-
Assert.NotEqual(0, a.HouseNumber);
51-
Assert.NotNull(a.PostalCode);
52-
Assert.NotNull(a.Street);
48+
Assert.IsNull(a.City);
49+
Assert.IsNull(a.Country);
50+
Assert.AreNotEqual(0, a.HouseNumber);
51+
Assert.IsNotNull(a.PostalCode);
52+
Assert.IsNotNull(a.Street);
5353
}
5454

55-
[Fact]
55+
[TestMethod]
5656
public void SetupCityPropertyWithConstantValue()
5757
{
5858
Filler<Address> addressFiller = new Filler<Address>();
5959
addressFiller.Setup()
6060
.OnProperty(ad => ad.City).Use(() => "City");
6161
Address a = addressFiller.Create();
6262

63-
Assert.Equal("City", a.City);
64-
Assert.NotNull(a.Country);
65-
Assert.NotEqual(0, a.HouseNumber);
66-
Assert.NotNull(a.PostalCode);
67-
Assert.NotNull(a.Street);
63+
Assert.AreEqual("City", a.City);
64+
Assert.IsNotNull(a.Country);
65+
Assert.AreNotEqual(0, a.HouseNumber);
66+
Assert.IsNotNull(a.PostalCode);
67+
Assert.IsNotNull(a.Street);
6868
}
6969

70-
[Fact]
70+
[TestMethod]
7171
public void SetupCityAndCountryPropertyWithConstantValue()
7272
{
7373
Filler<Address> addressFiller = new Filler<Address>();
7474
addressFiller.Setup()
7575
.OnProperty(ad => ad.City, ad => ad.Country).Use(() => "CityCountry");
7676
Address a = addressFiller.Create();
7777

78-
Assert.Equal("CityCountry", a.City);
79-
Assert.NotNull(a.Country);
80-
Assert.NotEqual(0, a.HouseNumber);
81-
Assert.NotNull(a.PostalCode);
82-
Assert.NotNull(a.Street);
78+
Assert.AreEqual("CityCountry", a.City);
79+
Assert.IsNotNull(a.Country);
80+
Assert.AreNotEqual(0, a.HouseNumber);
81+
Assert.IsNotNull(a.PostalCode);
82+
Assert.IsNotNull(a.Street);
8383
}
8484

85-
[Fact]
85+
[TestMethod]
8686
public void SetupTheAdressWithStaticValues()
8787
{
8888
Filler<Address> addressFiller = new Filler<Address>();
@@ -93,13 +93,13 @@ public void SetupTheAdressWithStaticValues()
9393
.OnProperty(x => x.PostalCode).Use(() => "0011100");
9494

9595
var address = addressFiller.Create();
96-
Assert.Equal("Dresden", address.City);
97-
Assert.Equal("Germany", address.Country);
98-
Assert.Equal("0011100", address.PostalCode);
99-
Assert.Equal(10, address.HouseNumber);
96+
Assert.AreEqual("Dresden", address.City);
97+
Assert.AreEqual("Germany", address.Country);
98+
Assert.AreEqual("0011100", address.PostalCode);
99+
Assert.AreEqual(10, address.HouseNumber);
100100
}
101101

102-
[Fact]
102+
[TestMethod]
103103
public void RandomListPluginShallReturnDifferentValues()
104104
{
105105
Filler<Address> addressFiller = new Filler<Address>();
@@ -108,15 +108,15 @@ public void RandomListPluginShallReturnDifferentValues()
108108

109109
var addresses = addressFiller.Create(1000);
110110

111-
Assert.True(addresses.Any(x => x.City == "Test2"));
111+
Assert.IsTrue(addresses.Any(x => x.City == "Test2"));
112112

113113
addressFiller = new Filler<Address>();
114114

115115
addressFiller.Setup().OnProperty(x => x.City).Use(new RandomListItem<string>("Test1"));
116116

117117
addresses = addressFiller.Create(1000);
118118

119-
Assert.True(addresses.All(x => x.City == "Test1"));
119+
Assert.IsTrue(addresses.All(x => x.City == "Test1"));
120120

121121
}
122122

‎Tynamix.ObjectFiller.Test/BugfixTests/Bug68HashsetCanNotBeCreated.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
56

67
namespace ObjectFiller.Test.BugfixTests
78
{
89
using Tynamix.ObjectFiller;
910

10-
using Xunit;
11+
1112

1213
public class Bug68HashsetCanNotBeCreated
1314
{
14-
[Fact]
15+
[TestMethod]
1516
public void AHashsetShouldBeGenerated()
1617
{
1718
Filler<HashSet<string>> filler = new Filler<HashSet<string>>();
1819

1920
var hashset = filler.Create();
2021

21-
Assert.NotNull(hashset);
22-
Assert.True(hashset.Any());
22+
Assert.IsNotNull(hashset);
23+
Assert.IsTrue(hashset.Any());
2324
}
2425
}
2526
}

‎Tynamix.ObjectFiller.Test/BugfixTests/Bug87ErrorWhenNameInParentIsSameAsParent.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
56

67
namespace ObjectFiller.Test.BugfixTests
78
{
89
using Tynamix.ObjectFiller;
910

10-
using Xunit;
11+
1112

1213
public class Bug87ErrorWhenNameInParentIsSameAsParent
1314
{
@@ -24,15 +25,15 @@ public class Child
2425
public string MakeTheError { get; set; }
2526
}
2627

27-
[Fact]
28+
[TestMethod]
2829
public void ParentShallGetFilledWithourError()
2930
{
3031
Filler<Parent> filler = new Filler<Parent>();
3132

3233
var filledObject = filler.Create();
33-
Assert.NotNull(filledObject);
34-
Assert.NotNull(filledObject.MakeTheError);
35-
Assert.False(string.IsNullOrWhiteSpace(filledObject.Child.MakeTheError));
34+
Assert.IsNotNull(filledObject);
35+
Assert.IsNotNull(filledObject.MakeTheError);
36+
Assert.IsFalse(string.IsNullOrWhiteSpace(filledObject.Child.MakeTheError));
3637
}
3738
}
3839
}

‎Tynamix.ObjectFiller.Test/BugfixTests/Bug89FillTypesInheritsFromDictionary.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
56

67
namespace ObjectFiller.Test.BugfixTests
78
{
89
using Tynamix.ObjectFiller;
910

10-
using Xunit;
11+
1112

1213

1314
public class Bug89FillTypesInheritsFromDictionary
@@ -28,16 +29,16 @@ public class EntityBList : Dictionary<string, EntityB>
2829
public DateTime SomeDate { get; set; }
2930
}
3031

31-
[Fact]
32+
[TestMethod]
3233
public void ADerivedDictionaryShallGetFilledAllProperties()
3334
{
3435
Filler<EntityA> filler = new Filler<EntityA>();
3536

3637
var result = filler.Create();
3738

38-
Assert.NotNull(result.Bs);
39-
Assert.InRange(result.Bs.SomeDate, DateTime.MinValue.AddSeconds(1), DateTime.MaxValue.AddSeconds(-1));
40-
Assert.True(result.Bs.Any());
39+
Assert.IsNotNull(result.Bs);
40+
Assert.IsTrue(result.Bs.SomeDate > DateTime.MinValue.AddSeconds(1) && result.Bs.SomeDate < DateTime.MaxValue.AddSeconds(-1));
41+
Assert.IsTrue(result.Bs.Any());
4142
}
4243
}
4344
}

‎Tynamix.ObjectFiller.Test/BugfixTests/Bug89FillTypesInheritsFromList.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
56

67
namespace ObjectFiller.Test.BugfixTests
78
{
89
using Tynamix.ObjectFiller;
910

10-
using Xunit;
11+
1112

1213

1314
public class Bug89FillTypesInheritsFromList
@@ -28,16 +29,16 @@ public class EntityBList : List<EntityB>
2829
public DateTime SomeDate { get; set; }
2930
}
3031

31-
[Fact]
32+
[TestMethod]
3233
public void ADerivedListShallGetFilledAllProperties()
3334
{
3435
Filler<EntityA> filler = new Filler<EntityA>();
3536

3637
var result = filler.Create();
3738

38-
Assert.NotNull(result.Bs);
39-
Assert.InRange(result.Bs.SomeDate, DateTime.MinValue.AddSeconds(1), DateTime.MaxValue.AddSeconds(-1));
40-
Assert.True(result.Bs.Any());
39+
Assert.IsNotNull(result.Bs);
40+
Assert.IsTrue(result.Bs.SomeDate > DateTime.MinValue.AddSeconds(1) && result.Bs.SomeDate < DateTime.MaxValue.AddSeconds(-1));
41+
Assert.IsTrue(result.Bs.Any());
4142
}
4243
}
4344
}

‎Tynamix.ObjectFiller.Test/CityNamesPluginTest.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
13
namespace ObjectFiller.Test
24
{
3-
using Xunit;
5+
46

57
using Tynamix.ObjectFiller;
68

7-
9+
[TestClass]
810
public class CityNamesPluginTest
911
{
10-
[Fact]
12+
[TestMethod]
1113
public void RandomNameIsReturned()
1214
{
1315
var sut = new CityName();
1416
var value = sut.GetValue();
1517

16-
Assert.False(string.IsNullOrEmpty(value));
18+
Assert.IsFalse(string.IsNullOrEmpty(value));
1719
}
1820
}
1921
}

0 commit comments

Comments
 (0)