Skip to content

Commit 72d8c0e

Browse files
committed
Merging from master
2 parents ece50e4 + 9b49bfd commit 72d8c0e

36 files changed

+2764
-411
lines changed

NetStandardPolyfills.UnitTests.Net40/NetStandardPolyfills.UnitTests.Net40.csproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
34-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
33+
<Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
34+
<HintPath>..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
3535
</Reference>
3636
<Reference Include="System" />
3737
<Reference Include="System.Core" />
@@ -45,7 +45,11 @@
4545
<Compile Include="Properties\AssemblyInfo.cs" />
4646
<Compile Include="WhenCheckingTypeData.cs" />
4747
<Compile Include="WhenRetrievingTypeCodes.cs" />
48+
<Compile Include="WhenRetrievingTypeConstructors.cs" />
49+
<Compile Include="WhenRetrievingTypeFields.cs" />
4850
<Compile Include="WhenRetrievingTypeMembers.cs" />
51+
<Compile Include="WhenRetrievingTypeMethods.cs" />
52+
<Compile Include="WhenRetrievingTypeProperties.cs" />
4953
</ItemGroup>
5054
<ItemGroup>
5155
<ProjectReference Include="..\NetStandardPolyfills.UnitTests\NetStandardPolyfills.UnitTests.csproj">
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
namespace AgileObjects.NetStandardPolyfills.UnitTests.Net40
2+
{
3+
using NUnit.Framework;
4+
5+
[TestFixture]
6+
public class WhenRetrievingTypeConstructors : ConstructorTestsBase
7+
{
8+
[Test]
9+
public override void ShouldFindPublicInstanceConstructors() => DoShouldFindPublicInstanceConstructors();
10+
11+
[Test]
12+
public override void ShouldFindAnImplicitPublicInstanceConstructor() => DoShouldFindAnImplicitPublicInstanceConstructor();
13+
14+
[Test]
15+
public override void ShouldFindAnExplicitPublicInstanceConstructor() =>
16+
DoShouldFindAnExplicitPublicInstanceConstructor();
17+
18+
[Test]
19+
public override void ShouldFindAPublicInstanceConstructorByParameterTypes() =>
20+
DoShouldFindAPublicInstanceConstructorByParameterTypes();
21+
22+
[Test]
23+
public override void ShouldExcludeAPublicInstanceConstructorByParameterTypes() =>
24+
DoShouldExcludeAPublicInstanceConstructorByParameterTypes();
25+
26+
[Test]
27+
public override void ShouldFindNonPublicInstanceConstructors() => DoShouldFindNonPublicInstanceConstructors();
28+
29+
[Test]
30+
public override void ShouldFindANonPublicInstanceConstructor() => DoShouldFindANonPublicInstanceConstructor();
31+
32+
[Test]
33+
public override void ShouldExcludeANonPublicInstanceConstructor() =>
34+
DoShouldExcludeANonPublicInstanceConstructor();
35+
36+
[Test]
37+
public override void ShouldFindANonPublicInstanceConstructorByParameterTypes() =>
38+
DoShouldFindANonPublicInstanceConstructorByParameterTypes();
39+
40+
[Test]
41+
public override void ShouldExcludeANonPublicInstanceConstructorByParameterTypes() =>
42+
DoShouldExcludeANonPublicInstanceConstructorByParameterTypes();
43+
}
44+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
namespace AgileObjects.NetStandardPolyfills.UnitTests.Net40
2+
{
3+
using NUnit.Framework;
4+
5+
[TestFixture]
6+
public class WhenRetrievingTypeFields : FieldTestsBase
7+
{
8+
[Test]
9+
public override void ShouldRetrievePublicStaticFields() => DoShouldRetrievePublicStaticFields();
10+
11+
[Test]
12+
public override void ShouldRetrieveAPublicStaticFieldByName() => DoShouldRetrieveAPublicStaticFieldByName();
13+
14+
[Test]
15+
public override void ShouldExcludeAPublicStaticFieldByName() => DoShouldExcludeAPublicStaticFieldByName();
16+
17+
[Test]
18+
public override void ShouldRetrieveNonPublicStaticFields() => DoShouldRetrieveNonPublicStaticFields();
19+
20+
[Test]
21+
public override void ShouldRetrieveANonPublicStaticFieldByName() =>
22+
DoShouldRetrieveANonPublicStaticFieldByName();
23+
24+
[Test]
25+
public override void ShouldExcludeANonPublicStaticFieldByName() => DoShouldExcludeANonPublicStaticFieldByName();
26+
27+
[Test]
28+
public override void ShouldRetrievePublicInstanceFields() => DoShouldRetrievePublicInstanceFields();
29+
30+
[Test]
31+
public override void ShouldRetrieveAPublicInstanceFieldByName() => DoShouldRetrieveAPublicInstanceFieldByName();
32+
33+
[Test]
34+
public override void ShouldExcludeAPublicInstanceFieldByName() => DoShouldExcludeAPublicInstanceFieldByName();
35+
36+
[Test]
37+
public override void ShouldRetrieveNonPublicInstanceFields() => DoShouldRetrieveNonPublicInstanceFields();
38+
39+
[Test]
40+
public override void ShouldRetrieveANonPublicInstanceFieldByName() =>
41+
DoShouldRetrieveANonPublicInstanceFieldByName();
42+
43+
[Test]
44+
public override void ShouldExcludeANonPublicInstanceFieldByName() =>
45+
DoShouldExcludeANonPublicInstanceFieldByName();
46+
}
47+
}

NetStandardPolyfills.UnitTests.Net40/WhenRetrievingTypeMembers.cs

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,56 @@ namespace AgileObjects.NetStandardPolyfills.UnitTests.Net40
33
using NUnit.Framework;
44

55
[TestFixture]
6-
public class WhenRetrievingTypeMembers : TypeMemberTestsBase
6+
public class WhenRetrievingTypeMembers : MemberTestsBase
77
{
88
[Test]
9-
public override void ShouldFindAnImplicitPublicInstanceConstructor() => DoShouldFindAnImplicitPublicInstanceConstructor();
9+
public override void ShouldRetrievePublicStaticMembers() => DoShouldRetrievePublicStaticMembers();
1010

1111
[Test]
12-
public override void ShouldFindAPublicInstanceConstructor() => DoShouldFindAPublicInstanceConstructor();
12+
public override void ShouldRetrievePublicStaticMembersByName() => DoShouldRetrievePublicStaticMembersByName();
1313

1414
[Test]
15-
public override void ShouldFindANonPublicInstanceConstructor() => DoShouldFindANonPublicInstanceConstructor();
15+
public override void ShouldExcludePublicStaticMembersByName() => DoShouldExcludePublicStaticMembersByName();
1616

1717
[Test]
18-
public override void ShouldRetrieveAPublicInstanceField() => DoShouldRetrieveAPublicInstanceField();
18+
public override void ShouldRetrievePublicStaticMemberByName() => DoShouldRetrievePublicStaticMemberByName();
1919

2020
[Test]
21-
public override void ShouldRetrieveAPublicInstanceProperty() => DoShouldRetrieveAPublicInstanceProperty();
21+
public override void ShouldRetrievePublicInstanceMembers() => DoShouldRetrievePublicInstanceMembers();
2222

2323
[Test]
24-
public override void ShouldFindAPublicInstanceMethod() => DoShouldFindAPublicInstanceMethod();
24+
public override void ShouldRetrievePublicInstanceMembersByName() => DoShouldRetrievePublicInstanceMembersByName();
2525

2626
[Test]
27-
public override void ShouldFindAnInheritedPublicInstanceMethod() => DoShouldFindAnInheritedPublicInstanceMethod();
27+
public override void ShouldExcludePublicInstanceMembersByName() => DoShouldExcludePublicInstanceMembersByName();
2828

2929
[Test]
30-
public override void ShouldFindANonPublicInstanceMethod() => DoShouldFindANonPublicInstanceMethod();
30+
public override void ShouldRetrievePublicInstanceMemberByName() => DoShouldRetrievePublicInstanceMemberByName();
3131

3232
[Test]
33-
public override void ShouldFindAPublicStaticMethod() => DoShouldFindAPublicStaticMethod();
33+
public override void ShouldRetrieveNonPublicStaticMembers() => DoShouldRetrieveNonPublicStaticMembers();
3434

3535
[Test]
36-
public override void ShouldFindANonPublicStaticMethod() => DoShouldFindANonPublicStaticMethod();
36+
public override void ShouldRetrieveNonPublicStaticMembersByName() => DoShouldRetrieveNonPublicStaticMembersByName();
37+
38+
[Test]
39+
public override void ShouldExcludeNonPublicStaticMembersByName() => DoShouldExcludeNonPublicStaticMembersByName();
40+
41+
[Test]
42+
public override void ShouldRetrieveNonPublicStaticMemberByName() =>
43+
DoShouldRetrieveNonPublicStaticMemberByName();
44+
45+
[Test]
46+
public override void ShouldRetrieveNonPublicInstanceMembers() => DoShouldRetrieveNonPublicInstanceMembers();
47+
48+
[Test]
49+
public override void ShouldRetrieveNonPublicInstanceMembersByName() => DoShouldRetrieveNonPublicInstanceMembersByName();
50+
51+
[Test]
52+
public override void ShouldExcludeNonPublicInstanceMembersByName() => DoShouldExcludeNonPublicInstanceMembersByName();
53+
54+
[Test]
55+
public override void ShouldRetrieveNonPublicInstanceMemberByName() =>
56+
DoShouldRetrieveNonPublicInstanceMemberByName();
3757
}
3858
}
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
namespace AgileObjects.NetStandardPolyfills.UnitTests.Net40
2+
{
3+
using NUnit.Framework;
4+
5+
[TestFixture]
6+
public class WhenRetrievingTypeMethods : MethodTestsBase
7+
{
8+
[Test]
9+
public override void ShouldFindPublicStaticMethods() => DoShouldFindPublicStaticMethods();
10+
11+
[Test]
12+
public override void ShouldFindAPublicStaticMethodByName() => DoShouldFindAPublicStaticMethodByName();
13+
14+
[Test]
15+
public override void ShouldExcludeAPublicStaticMethodByName() => DoShouldExcludeAPublicStaticMethodByName();
16+
17+
[Test]
18+
public override void ShouldFindAPublicStaticMethodByNameAndParamCount() =>
19+
DoShouldFindAPublicStaticMethodByNameAndParamCount();
20+
21+
[Test]
22+
public override void ShouldFindAPublicStaticMethodByNameAndParamTypes() =>
23+
DoShouldFindAPublicStaticMethodByNameAndParamTypes();
24+
25+
[Test]
26+
public override void ShouldFindPublicInstanceMethods() => DoShouldFindPublicInstanceMethods();
27+
28+
[Test]
29+
public override void ShouldFindAPublicInstanceMethodByName() => DoShouldFindAPublicInstanceMethodByName();
30+
31+
[Test]
32+
public override void ShouldFindAPublicInstanceMethodByNameAndParamCount() =>
33+
DoShouldFindAPublicInstanceMethodByNameAndParamCount();
34+
35+
[Test]
36+
public override void ShouldExcludeAPublicInstanceMethodByParamCount() =>
37+
DoShouldExcludeAPublicInstanceMethodByParamCount();
38+
39+
[Test]
40+
public override void ShouldFindAPublicInstanceMethodByNameAndParamTypes() =>
41+
DoShouldFindAPublicInstanceMethodByNameAndParamTypes();
42+
43+
[Test]
44+
public override void ShouldErrorIfPublicInstanceMethodsHaveSameNameAndParamCount() =>
45+
DoShouldErrorIfPublicInstanceMethodsHaveSameNameAndParamCount();
46+
47+
[Test]
48+
public override void ShouldFindAnInheritedPublicInstanceMethodByName() =>
49+
DoShouldFindAnInheritedPublicInstanceMethodByName();
50+
51+
[Test]
52+
public override void ShouldFindAnInheritedPublicInstanceMethodByNameAndParamCount() =>
53+
DoShouldFindAnInheritedPublicInstanceMethodByNameAndParamCount();
54+
55+
[Test]
56+
public override void ShouldFindNonPublicStaticMethods() => DoShouldFindNonPublicStaticMethods();
57+
58+
[Test]
59+
public override void ShouldFindANonPublicStaticMethodByName() => DoShouldFindANonPublicStaticMethodByName();
60+
61+
[Test]
62+
public override void ShouldFindANonPublicStaticMethodByNameAndParamCount() =>
63+
DoShouldFindANonPublicStaticMethodByNameAndParamCount();
64+
65+
[Test]
66+
public override void ShouldFindANonPublicStaticMethodByNameAndParamTypes() =>
67+
DoShouldFindANonPublicStaticMethodByNameAndParamTypes();
68+
69+
[Test]
70+
public override void ShouldFindNonPublicInstanceMethods() => DoShouldFindNonPublicInstanceMethods();
71+
72+
[Test]
73+
public override void ShouldFindANonPublicInstanceMethodByName() => DoShouldFindANonPublicInstanceMethodByName();
74+
75+
[Test]
76+
public override void ShouldFindANonPublicInstanceMethodByNameAndParamCount() =>
77+
DoShouldFindANonPublicInstanceMethodByNameAndParamCount();
78+
79+
[Test]
80+
public override void ShouldFindANonPublicInstanceMethodByNameAndParamTypes() =>
81+
DoShouldFindANonPublicInstanceMethodByNameAndParamTypes();
82+
83+
[Test]
84+
public override void ShouldExcludeANonPublicInstanceMethodByNameAndParamTypes() =>
85+
DoShouldExcludeANonPublicInstanceMethodByNameAndParamTypes();
86+
}
87+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
namespace AgileObjects.NetStandardPolyfills.UnitTests.Net40
2+
{
3+
using NUnit.Framework;
4+
5+
[TestFixture]
6+
public class WhenRetrievingTypeProperties : PropertyTestsBase
7+
{
8+
[Test]
9+
public override void ShouldRetrievePublicStaticProperties() => DoShouldRetrievePublicStaticProperties();
10+
11+
[Test]
12+
public override void ShouldRetrieveAPublicStaticPropertyByName() => DoShouldRetrieveAPublicStaticPropertyByName();
13+
14+
[Test]
15+
public override void ShouldExcludeAPublicStaticPropertyByName() => DoShouldExcludeAPublicStaticPropertyByName();
16+
17+
[Test]
18+
public override void ShouldRetrieveNonPublicStaticProperties() => DoShouldRetrieveNonPublicStaticProperties();
19+
20+
[Test]
21+
public override void ShouldRetrieveANonPublicStaticPropertyByName() =>
22+
DoShouldRetrieveANonPublicStaticPropertyByName();
23+
24+
[Test]
25+
public override void ShouldExcludeANonPublicStaticPropertyByName() => DoShouldExcludeANonPublicStaticPropertyByName();
26+
27+
[Test]
28+
public override void ShouldRetrievePublicInstanceProperties() => DoShouldRetrievePublicInstanceProperties();
29+
30+
[Test]
31+
public override void ShouldRetrieveAPublicInstancePropertyByName() => DoShouldRetrieveAPublicInstancePropertyByName();
32+
33+
[Test]
34+
public override void ShouldExcludeAPublicInstancePropertyByName() => DoShouldExcludeAPublicInstancePropertyByName();
35+
36+
[Test]
37+
public override void ShouldRetrieveNonPublicInstanceProperties() => DoShouldRetrieveNonPublicInstanceProperties();
38+
39+
[Test]
40+
public override void ShouldRetrieveANonPublicInstancePropertyByName() =>
41+
DoShouldRetrieveANonPublicInstancePropertyByName();
42+
43+
[Test]
44+
public override void ShouldExcludeANonPublicInstancePropertyByName() =>
45+
DoShouldExcludeANonPublicInstancePropertyByName();
46+
}
47+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
3+
<package id="NUnit" version="3.8.1" targetFramework="net40" />
44
</packages>

NetStandardPolyfills.UnitTests.NetCore/NetStandardPolyfills.UnitTests.NetCore.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
1515
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1616
<RootNamespace>AgileObjects.NetStandardPolyfills.UnitTests.NetCore</RootNamespace>
17-
<Version>0.2.1</Version>
17+
<Version>1.0.0</Version>
1818
</PropertyGroup>
1919

2020
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
21-
<PackageReference Include="System.Data.Common" Version="4.1.0" />
22-
<PackageReference Include="Shouldly" Version="2.8.2" />
21+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
2322
</ItemGroup>
2423

2524
<ItemGroup>
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
27-
<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
26+
<PackageReference Include="xunit" Version="2.3.1" />
2827
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2928
</ItemGroup>
3029

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
namespace AgileObjects.NetStandardPolyfills.UnitTests.NetCore
2+
{
3+
using Xunit;
4+
5+
public class WhenRetrievingTypeConstructors : ConstructorTestsBase
6+
{
7+
[Fact]
8+
public override void ShouldFindPublicInstanceConstructors() => DoShouldFindPublicInstanceConstructors();
9+
10+
[Fact]
11+
public override void ShouldFindAnImplicitPublicInstanceConstructor() => DoShouldFindAnImplicitPublicInstanceConstructor();
12+
13+
[Fact]
14+
public override void ShouldFindAnExplicitPublicInstanceConstructor() =>
15+
DoShouldFindAnExplicitPublicInstanceConstructor();
16+
17+
[Fact]
18+
public override void ShouldFindAPublicInstanceConstructorByParameterTypes() =>
19+
DoShouldFindAPublicInstanceConstructorByParameterTypes();
20+
21+
[Fact]
22+
public override void ShouldExcludeAPublicInstanceConstructorByParameterTypes() =>
23+
DoShouldExcludeAPublicInstanceConstructorByParameterTypes();
24+
25+
[Fact]
26+
public override void ShouldFindNonPublicInstanceConstructors() => DoShouldFindNonPublicInstanceConstructors();
27+
28+
[Fact]
29+
public override void ShouldFindANonPublicInstanceConstructor() => DoShouldFindANonPublicInstanceConstructor();
30+
31+
[Fact]
32+
public override void ShouldExcludeANonPublicInstanceConstructor() =>
33+
DoShouldExcludeANonPublicInstanceConstructor();
34+
35+
[Fact]
36+
public override void ShouldFindANonPublicInstanceConstructorByParameterTypes() =>
37+
DoShouldFindANonPublicInstanceConstructorByParameterTypes();
38+
39+
[Fact]
40+
public override void ShouldExcludeANonPublicInstanceConstructorByParameterTypes() =>
41+
DoShouldExcludeANonPublicInstanceConstructorByParameterTypes();
42+
}
43+
}

0 commit comments

Comments
 (0)