Skip to content

Commit 578c6ae

Browse files
committed
MyTested.AspNetCore.Mvc.Options now depends only on MyTested.AspNetCore.Mvc.Abstractions (#125)
1 parent 4325c29 commit 578c6ae

File tree

8 files changed

+24
-197
lines changed

8 files changed

+24
-197
lines changed

samples/ApplicationParts/ApplicationParts.Test/project.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4300,7 +4300,7 @@
43004300
"framework": ".NETStandard,Version=v1.6",
43014301
"dependencies": {
43024302
"Microsoft.Extensions.Options": "1.0.0",
4303-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
4303+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
43044304
},
43054305
"compile": {
43064306
"netstandard1.6/MyTested.AspNetCore.Mvc.Options.dll": {}

samples/MusicStore/MusicStore.Test/project.lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4443,7 +4443,7 @@
44434443
"framework": ".NETStandard,Version=v1.6",
44444444
"dependencies": {
44454445
"Microsoft.Extensions.Options": "1.0.0",
4446-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
4446+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
44474447
},
44484448
"compile": {
44494449
"netstandard1.6/MyTested.AspNetCore.Mvc.Options.dll": {}
@@ -6789,7 +6789,7 @@
67896789
"framework": ".NETFramework,Version=v4.5.1",
67906790
"dependencies": {
67916791
"Microsoft.Extensions.Options": "1.0.0",
6792-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
6792+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
67936793
},
67946794
"compile": {
67956795
"net451/MyTested.AspNetCore.Mvc.Options.dll": {}

src/MyTested.AspNetCore.Mvc.Options/Builders/OptionsBuilder.cs renamed to src/MyTested.AspNetCore.Mvc.Options/Builders/Options/OptionsBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace MyTested.AspNetCore.Mvc.Builders
1+
namespace MyTested.AspNetCore.Mvc.Builders.Options
22
{
33
using System;
44
using Base;
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
namespace MyTested.AspNetCore.Mvc
22
{
33
using System;
4-
using Builders;
4+
using Builders.Base;
5+
using Builders.Contracts.Base;
56
using Builders.Contracts.Options;
6-
using Builders.Contracts.Controllers;
7-
using Builders.Controllers;
7+
using Builders.Options;
88

99
/// <summary>
10-
/// Contains configuration options extension methods for <see cref="IControllerBuilder{TController}"/>.
10+
/// Contains configuration options extension methods for <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/>.
1111
/// </summary>
1212
public static class ControllerBuilderOptionsExtensions
1313
{
1414
/// <summary>
15-
/// Sets initial values to the configuration options on the tested controller.
15+
/// Sets initial values to the configuration options on the tested component.
1616
/// </summary>
17-
/// <typeparam name="TController">Class representing ASP.NET Core MVC controller.</typeparam>
18-
/// <param name="controllerBuilder">Instance of <see cref="IControllerBuilder{TController}"/> type.</param>
17+
/// <typeparam name="TBuilder">Class representing ASP.NET Core MVC test builder.</typeparam>
18+
/// <param name="builder">Instance of <see cref="IBaseTestBuilderWithComponentBuilder{TBuilder}"/> type.</param>
1919
/// <param name="optionsBuilder">Action setting the configuration options by using <see cref="IOptionsBuilder"/>.</param>
20-
/// <returns>The same <see cref="IControllerBuilder{TController}"/>.</returns>
21-
public static IControllerBuilder<TController> WithOptions<TController>(
22-
this IControllerBuilder<TController> controllerBuilder,
20+
/// <returns>The same component builder.</returns>
21+
public static TBuilder WithOptions<TBuilder>(
22+
this IBaseTestBuilderWithComponentBuilder<TBuilder> builder,
2323
Action<IOptionsBuilder> optionsBuilder)
24-
where TController : class
24+
where TBuilder : IBaseTestBuilder
2525
{
26-
var actualControllerBuilder = (ControllerBuilder<TController>)controllerBuilder;
26+
var actualBuilder = (BaseTestBuilderWithComponentBuilder<TBuilder>)builder;
2727

28-
optionsBuilder(new OptionsBuilder(actualControllerBuilder.TestContext));
28+
optionsBuilder(new OptionsBuilder(actualBuilder.TestContext));
2929

30-
return actualControllerBuilder;
30+
return actualBuilder.Builder;
3131
}
3232
}
3333
}

src/MyTested.AspNetCore.Mvc.Options/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
"dependencies": {
3030
"Microsoft.Extensions.Options": "1.0.0-*",
31-
"MyTested.AspNetCore.Mvc.Core": "1.0.0-*"
31+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0-*"
3232
},
3333

3434
"frameworks": {

src/MyTested.AspNetCore.Mvc.Options/project.lock.json

Lines changed: 1 addition & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -128,29 +128,6 @@
128128
"lib/net451/Microsoft.AspNetCore.Http.Features.dll": {}
129129
}
130130
},
131-
"Microsoft.AspNetCore.JsonPatch/1.0.0": {
132-
"type": "package",
133-
"dependencies": {
134-
"Microsoft.CSharp": "4.0.1",
135-
"Newtonsoft.Json": "9.0.1",
136-
"System.Collections.Concurrent": "4.0.12",
137-
"System.ComponentModel.TypeConverter": "4.1.0",
138-
"System.Diagnostics.Debug": "4.0.11",
139-
"System.Globalization": "4.0.11",
140-
"System.Linq": "4.1.0",
141-
"System.Reflection.Extensions": "4.0.1",
142-
"System.Resources.ResourceManager": "4.0.1",
143-
"System.Runtime.Extensions": "4.1.0",
144-
"System.Runtime.Serialization.Primitives": "4.1.1",
145-
"System.Text.Encoding.Extensions": "4.0.11"
146-
},
147-
"compile": {
148-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.dll": {}
149-
},
150-
"runtime": {
151-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.dll": {}
152-
}
153-
},
154131
"Microsoft.AspNetCore.Mvc.Abstractions/1.0.0": {
155132
"type": "package",
156133
"dependencies": {
@@ -186,19 +163,6 @@
186163
"lib/net451/Microsoft.AspNetCore.Mvc.Core.dll": {}
187164
}
188165
},
189-
"Microsoft.AspNetCore.Mvc.Formatters.Json/1.0.0": {
190-
"type": "package",
191-
"dependencies": {
192-
"Microsoft.AspNetCore.JsonPatch": "1.0.0",
193-
"Microsoft.AspNetCore.Mvc.Core": "1.0.0"
194-
},
195-
"compile": {
196-
"lib/net451/Microsoft.AspNetCore.Mvc.Formatters.Json.dll": {}
197-
},
198-
"runtime": {
199-
"lib/net451/Microsoft.AspNetCore.Mvc.Formatters.Json.dll": {}
200-
}
201-
},
202166
"Microsoft.AspNetCore.Routing/1.0.0": {
203167
"type": "package",
204168
"dependencies": {
@@ -256,18 +220,6 @@
256220
"lib/net451/Microsoft.AspNetCore.WebUtilities.dll": {}
257221
}
258222
},
259-
"Microsoft.CSharp/4.0.1": {
260-
"type": "package",
261-
"frameworkAssemblies": [
262-
"Microsoft.CSharp"
263-
],
264-
"compile": {
265-
"ref/net45/_._": {}
266-
},
267-
"runtime": {
268-
"lib/net45/_._": {}
269-
}
270-
},
271223
"Microsoft.DotNet.InternalAbstractions/1.0.0": {
272224
"type": "package",
273225
"compile": {
@@ -728,15 +680,6 @@
728680
"lib/net45/_._": {}
729681
}
730682
},
731-
"System.Reflection.Extensions/4.0.1": {
732-
"type": "package",
733-
"compile": {
734-
"ref/net45/_._": {}
735-
},
736-
"runtime": {
737-
"lib/net45/_._": {}
738-
}
739-
},
740683
"System.Reflection.Metadata/1.3.0": {
741684
"type": "package",
742685
"dependencies": {
@@ -816,18 +759,6 @@
816759
}
817760
}
818761
},
819-
"System.Runtime.Serialization.Primitives/4.1.1": {
820-
"type": "package",
821-
"frameworkAssemblies": [
822-
"System.Runtime.Serialization"
823-
],
824-
"compile": {
825-
"ref/net45/_._": {}
826-
},
827-
"runtime": {
828-
"lib/net45/_._": {}
829-
}
830-
},
831762
"System.Text.Encoding/4.0.11": {
832763
"type": "package",
833764
"compile": {
@@ -837,15 +768,6 @@
837768
"lib/net45/_._": {}
838769
}
839770
},
840-
"System.Text.Encoding.Extensions/4.0.11": {
841-
"type": "package",
842-
"compile": {
843-
"ref/net45/_._": {}
844-
},
845-
"runtime": {
846-
"lib/net45/_._": {}
847-
}
848-
},
849771
"System.Text.Encodings.Web/4.0.0": {
850772
"type": "package",
851773
"compile": {
@@ -910,21 +832,6 @@
910832
"net451/MyTested.AspNetCore.Mvc.Configuration.dll": {}
911833
}
912834
},
913-
"MyTested.AspNetCore.Mvc.Core/1.0.0-preview-final": {
914-
"type": "project",
915-
"framework": ".NETFramework,Version=v4.5.1",
916-
"dependencies": {
917-
"Microsoft.AspNetCore.Mvc.Core": "1.0.0",
918-
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.0",
919-
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
920-
},
921-
"compile": {
922-
"net451/MyTested.AspNetCore.Mvc.Core.dll": {}
923-
},
924-
"runtime": {
925-
"net451/MyTested.AspNetCore.Mvc.Core.dll": {}
926-
}
927-
},
928835
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
929836
"type": "project",
930837
"framework": ".NETFramework,Version=v4.5.1",
@@ -1081,29 +988,6 @@
1081988
"lib/netstandard1.3/Microsoft.AspNetCore.Http.Features.dll": {}
1082989
}
1083990
},
1084-
"Microsoft.AspNetCore.JsonPatch/1.0.0": {
1085-
"type": "package",
1086-
"dependencies": {
1087-
"Microsoft.CSharp": "4.0.1",
1088-
"Newtonsoft.Json": "9.0.1",
1089-
"System.Collections.Concurrent": "4.0.12",
1090-
"System.ComponentModel.TypeConverter": "4.1.0",
1091-
"System.Diagnostics.Debug": "4.0.11",
1092-
"System.Globalization": "4.0.11",
1093-
"System.Linq": "4.1.0",
1094-
"System.Reflection.Extensions": "4.0.1",
1095-
"System.Resources.ResourceManager": "4.0.1",
1096-
"System.Runtime.Extensions": "4.1.0",
1097-
"System.Runtime.Serialization.Primitives": "4.1.1",
1098-
"System.Text.Encoding.Extensions": "4.0.11"
1099-
},
1100-
"compile": {
1101-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.dll": {}
1102-
},
1103-
"runtime": {
1104-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.dll": {}
1105-
}
1106-
},
1107991
"Microsoft.AspNetCore.Mvc.Abstractions/1.0.0": {
1108992
"type": "package",
1109993
"dependencies": {
@@ -1144,19 +1028,6 @@
11441028
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Core.dll": {}
11451029
}
11461030
},
1147-
"Microsoft.AspNetCore.Mvc.Formatters.Json/1.0.0": {
1148-
"type": "package",
1149-
"dependencies": {
1150-
"Microsoft.AspNetCore.JsonPatch": "1.0.0",
1151-
"Microsoft.AspNetCore.Mvc.Core": "1.0.0"
1152-
},
1153-
"compile": {
1154-
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Formatters.Json.dll": {}
1155-
},
1156-
"runtime": {
1157-
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Formatters.Json.dll": {}
1158-
}
1159-
},
11601031
"Microsoft.AspNetCore.Routing/1.0.0": {
11611032
"type": "package",
11621033
"dependencies": {
@@ -3037,21 +2908,6 @@
30372908
"netstandard1.6/MyTested.AspNetCore.Mvc.Configuration.dll": {}
30382909
}
30392910
},
3040-
"MyTested.AspNetCore.Mvc.Core/1.0.0-preview-final": {
3041-
"type": "project",
3042-
"framework": ".NETStandard,Version=v1.6",
3043-
"dependencies": {
3044-
"Microsoft.AspNetCore.Mvc.Core": "1.0.0",
3045-
"Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.0",
3046-
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
3047-
},
3048-
"compile": {
3049-
"netstandard1.6/MyTested.AspNetCore.Mvc.Core.dll": {}
3050-
},
3051-
"runtime": {
3052-
"netstandard1.6/MyTested.AspNetCore.Mvc.Core.dll": {}
3053-
}
3054-
},
30552911
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
30562912
"type": "project",
30572913
"framework": ".NETStandard,Version=v1.4",
@@ -3173,17 +3029,6 @@
31733029
"lib/netstandard1.3/Microsoft.AspNetCore.Http.Features.xml"
31743030
]
31753031
},
3176-
"Microsoft.AspNetCore.JsonPatch/1.0.0": {
3177-
"sha512": "WVaSVS+dDlWCR/qerHnBxU9tIeJ9GMA3M5tg4cxH7/cJYZZLnr2zvaFHGB+cRRNCKKTJ0pFRxT7ES8knhgAAaA==",
3178-
"type": "package",
3179-
"path": "Microsoft.AspNetCore.JsonPatch/1.0.0",
3180-
"files": [
3181-
"Microsoft.AspNetCore.JsonPatch.1.0.0.nupkg.sha512",
3182-
"Microsoft.AspNetCore.JsonPatch.nuspec",
3183-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.dll",
3184-
"lib/netstandard1.1/Microsoft.AspNetCore.JsonPatch.xml"
3185-
]
3186-
},
31873032
"Microsoft.AspNetCore.Mvc.Abstractions/1.0.0": {
31883033
"sha512": "d7KEexDwxSwVeZv+SDbsMRPl2WuKMVckOCp/KTGuI1NJhd/7GvNGW101iRIC3tC/yym0PaajcWwTZNVfjhyoJw==",
31893034
"type": "package",
@@ -3210,19 +3055,6 @@
32103055
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Core.xml"
32113056
]
32123057
},
3213-
"Microsoft.AspNetCore.Mvc.Formatters.Json/1.0.0": {
3214-
"sha512": "XQQLbxYLmdRj2U685NxFIrxVxqsXHLO5zN4ZIhTQ23VxzI6Qk2WN9ska0tl4ZMDV/4pSyE8SlmNeKPCN3pW86w==",
3215-
"type": "package",
3216-
"path": "Microsoft.AspNetCore.Mvc.Formatters.Json/1.0.0",
3217-
"files": [
3218-
"Microsoft.AspNetCore.Mvc.Formatters.Json.1.0.0.nupkg.sha512",
3219-
"Microsoft.AspNetCore.Mvc.Formatters.Json.nuspec",
3220-
"lib/net451/Microsoft.AspNetCore.Mvc.Formatters.Json.dll",
3221-
"lib/net451/Microsoft.AspNetCore.Mvc.Formatters.Json.xml",
3222-
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Formatters.Json.dll",
3223-
"lib/netstandard1.6/Microsoft.AspNetCore.Mvc.Formatters.Json.xml"
3224-
]
3225-
},
32263058
"Microsoft.AspNetCore.Routing/1.0.0": {
32273059
"sha512": "NvFvRtYHXWjBbXz5/7F7JDNcdhrE+tG1/Q9R6LmMxFgu8tkl1bqtFZQbMy17FYFkmm8Fn/T81blRGE2nxCbDRA==",
32283060
"type": "package",
@@ -7279,11 +7111,6 @@
72797111
"path": "../MyTested.AspNetCore.Mvc.Configuration/project.json",
72807112
"msbuildProject": "../MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.xproj"
72817113
},
7282-
"MyTested.AspNetCore.Mvc.Core/1.0.0-preview-final": {
7283-
"type": "project",
7284-
"path": "../MyTested.AspNetCore.Mvc.Core/project.json",
7285-
"msbuildProject": "../MyTested.AspNetCore.Mvc.Core/MyTested.AspNetCore.Mvc.Core.xproj"
7286-
},
72877114
"MyTested.AspNetCore.Mvc.Licensing/1.0.0-preview-final": {
72887115
"type": "project",
72897116
"path": "../MyTested.AspNetCore.Mvc.Licensing/project.json",
@@ -7293,7 +7120,7 @@
72937120
"projectFileDependencyGroups": {
72947121
"": [
72957122
"Microsoft.Extensions.Options >= 1.0.0-*",
7296-
"MyTested.AspNetCore.Mvc.Core >= 1.0.0-*"
7123+
"MyTested.AspNetCore.Mvc.Abstractions >= 1.0.0-*"
72977124
],
72987125
".NETFramework,Version=v4.5.1": [],
72997126
".NETStandard,Version=v1.6": []

src/MyTested.AspNetCore.Mvc/project.lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@
14971497
"framework": ".NETFramework,Version=v4.5.1",
14981498
"dependencies": {
14991499
"Microsoft.Extensions.Options": "1.0.0",
1500-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
1500+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
15011501
},
15021502
"compile": {
15031503
"net451/MyTested.AspNetCore.Mvc.Options.dll": {}
@@ -4549,7 +4549,7 @@
45494549
"framework": ".NETStandard,Version=v1.6",
45504550
"dependencies": {
45514551
"Microsoft.Extensions.Options": "1.0.0",
4552-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
4552+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
45534553
},
45544554
"compile": {
45554555
"netstandard1.6/MyTested.AspNetCore.Mvc.Options.dll": {}

test/MyTested.AspNetCore.Mvc.Options.Test/project.lock.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,7 +3667,7 @@
36673667
"framework": ".NETStandard,Version=v1.6",
36683668
"dependencies": {
36693669
"Microsoft.Extensions.Options": "1.0.0",
3670-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
3670+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
36713671
},
36723672
"compile": {
36733673
"netstandard1.6/MyTested.AspNetCore.Mvc.Options.dll": {}
@@ -5344,7 +5344,7 @@
53445344
"framework": ".NETFramework,Version=v4.5.1",
53455345
"dependencies": {
53465346
"Microsoft.Extensions.Options": "1.0.0",
5347-
"MyTested.AspNetCore.Mvc.Core": "1.0.0"
5347+
"MyTested.AspNetCore.Mvc.Abstractions": "1.0.0"
53485348
},
53495349
"compile": {
53505350
"net451/MyTested.AspNetCore.Mvc.Options.dll": {}

0 commit comments

Comments
 (0)