Skip to content

Commit cfddc55

Browse files
xuzhgxuzhg
committed
Change the E2E class Fixture to allow parallel running
1 parent daf49b4 commit cfddc55

File tree

154 files changed

+631
-691
lines changed

Some content is hidden

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

154 files changed

+631
-691
lines changed

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Aggregation/AggregationTests.cs‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@
1717

1818
namespace Microsoft.Test.E2E.AspNet.OData.Aggregation
1919
{
20-
public class AggregationTestsEFClassic: AggregationTests
20+
public class AggregationTestsEFClassic: AggregationTests<AggregationTestsEFClassic>
2121
{
22-
public AggregationTestsEFClassic(WebHostTestFixture fixture)
22+
public AggregationTestsEFClassic(WebHostTestFixture<AggregationTestsEFClassic> fixture)
2323
: base(fixture)
2424
{
2525
}
2626

27-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
27+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
2828
{
2929
configuration.AddControllers(typeof(CustomersController));
30-
base.UpdateConfiguration(configuration);
30+
31+
UpdateConfigureOnBase(configuration);
3132
}
3233

3334
[Theory]
@@ -54,50 +55,50 @@ public async Task CustomAggregateStdDevWorks(string query)
5455
}
5556

5657
#if NETCORE
57-
public class AggregationTestsEFCoreInMemory : AggregationTests
58+
public class AggregationTestsEFCoreInMemory : AggregationTests<AggregationTestsEFCoreInMemory>
5859
{
59-
public AggregationTestsEFCoreInMemory(WebHostTestFixture fixture)
60+
public AggregationTestsEFCoreInMemory(WebHostTestFixture<AggregationTestsEFCoreInMemory> fixture)
6061
: base(fixture)
6162
{
6263
}
6364

64-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
65+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
6566
{
6667
configuration.AddControllers(typeof(CoreCustomersController<AggregationContextCoreInMemory>));
67-
base.UpdateConfiguration(configuration);
68+
69+
UpdateConfigureOnBase(configuration);
6870
}
6971
}
7072

71-
public class AggregationTestsEFCoreSql : AggregationTests
73+
public class AggregationTestsEFCoreSql : AggregationTests<AggregationTestsEFCoreSql>
7274
{
73-
public AggregationTestsEFCoreSql(WebHostTestFixture fixture)
75+
public AggregationTestsEFCoreSql(WebHostTestFixture<AggregationTestsEFCoreSql> fixture)
7476
: base(fixture)
7577
{
7678
}
7779

78-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
80+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
7981
{
8082
configuration.AddControllers(typeof(CoreCustomersController<AggregationContextCoreSql>));
81-
base.UpdateConfiguration(configuration);
83+
84+
UpdateConfigureOnBase(configuration);
8285
}
8386
}
8487
#endif
8588

8689

8790
#if !NETCORE
88-
public class LinqToSqlAggregationTests : WebHostTestBase
91+
public class LinqToSqlAggregationTests : WebHostTestBase<LinqToSqlAggregationTests>
8992
{
9093
protected string AggregationTestBaseUrl => "{0}/aggregation/Customers";
9194

92-
public LinqToSqlAggregationTests(WebHostTestFixture fixture)
95+
public LinqToSqlAggregationTests(WebHostTestFixture<LinqToSqlAggregationTests> fixture)
9396
: base(fixture)
9497
{
9598
}
9699

97-
98-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
100+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
99101
{
100-
101102
configuration.AddControllers(typeof(LinqToSqlCustomersController));
102103
configuration.JsonReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
103104
configuration.Count().Filter().OrderBy().Expand().MaxTop(null);
@@ -128,16 +129,16 @@ public async Task ApplyThrows()
128129
}
129130
#endif
130131

131-
public abstract class AggregationTests : WebHostTestBase
132+
public abstract class AggregationTests<T> : WebHostTestBase<T>
132133
{
133134
protected string AggregationTestBaseUrl => "{0}/aggregation/Customers";
134135

135-
public AggregationTests(WebHostTestFixture fixture)
136+
public AggregationTests(WebHostTestFixture<T> fixture)
136137
:base(fixture)
137138
{
138139
}
139140

140-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
141+
protected static void UpdateConfigureOnBase(WebRouteConfiguration configuration)
141142
{
142143
configuration.JsonReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;
143144
configuration.Count().Filter().OrderBy().Expand().MaxTop(null);

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Aggregation/PagedAggregationTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313

1414
namespace Microsoft.Test.E2E.AspNet.OData.Aggregation
1515
{
16-
public class PagedAggregationTests : WebHostTestBase
16+
public class PagedAggregationTests : WebHostTestBase<PagedAggregationTests>
1717
{
1818
private const string AggregationTestBaseUrl = "{0}/pagedaggregation/Customers";
1919

20-
public PagedAggregationTests(WebHostTestFixture fixture)
20+
public PagedAggregationTests(WebHostTestFixture<PagedAggregationTests> fixture)
2121
:base(fixture)
2222
{
2323
}
2424

25-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
25+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
2626
{
2727
configuration.AddControllers(typeof (Paged.CustomersController));
2828
configuration.JsonReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore;

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/AlternateKeys/AlternateKeysTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
namespace Microsoft.Test.E2E.AspNet.OData.AlternateKeys
2121
{
22-
public class AlternateKeysTest : WebHostTestBase
22+
public class AlternateKeysTest : WebHostTestBase<AlternateKeysTest>
2323
{
24-
public AlternateKeysTest(WebHostTestFixture fixture)
24+
public AlternateKeysTest(WebHostTestFixture<AlternateKeysTest> fixture)
2525
:base(fixture)
2626
{
2727
}
2828

29-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
29+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
3030
{
3131
var controllers = new[]
3232
{

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/AutoExpand/AutoExpandTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
namespace Microsoft.Test.E2E.AspNet.OData.AutoExpand
1717
{
18-
public class AutoExpandTests : WebHostTestBase
18+
public class AutoExpandTests : WebHostTestBase<AutoExpandTests>
1919
{
2020
private const string AutoExpandTestBaseUrl = "{0}/autoexpand/Customers(5)";
2121

22-
public AutoExpandTests(WebHostTestFixture fixture)
22+
public AutoExpandTests(WebHostTestFixture<AutoExpandTests> fixture)
2323
:base(fixture)
2424
{
2525
}
@@ -39,18 +39,18 @@ public static TheoryDataSet<string, int> AutoExpandTestData
3939
}
4040
}
4141

42-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
42+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
4343
{
4444
configuration.AddControllers(
45-
typeof (CustomersController),
45+
typeof (CustomersController),
4646
typeof (PeopleController),
4747
typeof (NormalOrdersController));
4848
configuration.JsonReferenceLoopHandling =
4949
Newtonsoft.Json.ReferenceLoopHandling.Ignore;
5050
configuration.Count().Filter().OrderBy().Expand().MaxTop(null).Select();
5151
configuration.MapODataServiceRoute(
52-
"autoexpand",
53-
"autoexpand",
52+
"autoexpand",
53+
"autoexpand",
5454
AutoExpandEdmModel.GetEdmModel(configuration));
5555
}
5656

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Batch/Tests/DataServicesClient/DefaultODataBatchHandlerTests.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ public DefaultBatchOrderController()
8888
}
8989
}
9090

91-
public class DefaultBatchHandlerCUDBatchTests : WebHostTestBase
91+
public class DefaultBatchHandlerCUDBatchTests : WebHostTestBase<DefaultBatchHandlerCUDBatchTests>
9292
{
93-
public DefaultBatchHandlerCUDBatchTests(WebHostTestFixture fixture)
93+
public DefaultBatchHandlerCUDBatchTests(WebHostTestFixture<DefaultBatchHandlerCUDBatchTests> fixture)
9494
:base(fixture)
9595
{
9696
}
9797

98-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
98+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
9999
{
100100
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
101101
configuration.Count().Filter().OrderBy().Expand().MaxTop(null);
@@ -549,14 +549,14 @@ public async Task CanHandleSingleDeleteInBatch()
549549
}
550550
}
551551

552-
public class DefaultBatchHandlerQueryBatchTests : WebHostTestBase
552+
public class DefaultBatchHandlerQueryBatchTests : WebHostTestBase<DefaultBatchHandlerQueryBatchTests>
553553
{
554-
public DefaultBatchHandlerQueryBatchTests(WebHostTestFixture fixture)
554+
public DefaultBatchHandlerQueryBatchTests(WebHostTestFixture<DefaultBatchHandlerQueryBatchTests> fixture)
555555
:base(fixture)
556556
{
557557
}
558558

559-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
559+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
560560
{
561561
configuration.MapODataServiceRoute(
562562
"batch",
@@ -618,14 +618,14 @@ public async Task CanBatchQueriesWithDataServicesClient()
618618
}
619619

620620

621-
public class DefaultBatchHandlerErrorsBatchTests : WebHostTestBase
621+
public class DefaultBatchHandlerErrorsBatchTests : WebHostTestBase<DefaultBatchHandlerErrorsBatchTests>
622622
{
623-
public DefaultBatchHandlerErrorsBatchTests(WebHostTestFixture fixture)
623+
public DefaultBatchHandlerErrorsBatchTests(WebHostTestFixture<DefaultBatchHandlerErrorsBatchTests> fixture)
624624
:base(fixture)
625625
{
626626
}
627627

628-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
628+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
629629
{
630630
configuration.MapODataServiceRoute(
631631
"batch",
@@ -685,14 +685,14 @@ public async Task SendsIndividualErrorWhenOneOfTheRequestsFails()
685685
}
686686

687687

688-
public class DefaultBatchHandlerLinksBatchTests : WebHostTestBase
688+
public class DefaultBatchHandlerLinksBatchTests : WebHostTestBase<DefaultBatchHandlerLinksBatchTests>
689689
{
690-
public DefaultBatchHandlerLinksBatchTests(WebHostTestFixture fixture)
690+
public DefaultBatchHandlerLinksBatchTests(WebHostTestFixture<DefaultBatchHandlerLinksBatchTests> fixture)
691691
:base(fixture)
692692
{
693693
}
694694

695-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
695+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
696696
{
697697
configuration.MapODataServiceRoute(
698698
"batch",
@@ -738,14 +738,14 @@ public async Task CanSetLinksInABatchWithDataServicesClient()
738738
}
739739
}
740740

741-
public class DefaultBatchHandlerContinueOnErrorBatchTests : WebHostTestBase
741+
public class DefaultBatchHandlerContinueOnErrorBatchTests : WebHostTestBase<DefaultBatchHandlerContinueOnErrorBatchTests>
742742
{
743-
public DefaultBatchHandlerContinueOnErrorBatchTests(WebHostTestFixture fixture)
743+
public DefaultBatchHandlerContinueOnErrorBatchTests(WebHostTestFixture<DefaultBatchHandlerContinueOnErrorBatchTests> fixture)
744744
:base(fixture)
745745
{
746746
}
747747

748-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
748+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
749749
{
750750
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
751751
configuration.MapODataServiceRoute(

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/Batch/Tests/DataServicesClient/UnbufferedODataBatchHandlerTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ public UnbufferedBatchOrderController()
8888
}
8989
}
9090

91-
public class CUDBatchTests : WebHostTestBase
91+
public class CUDBatchTests : WebHostTestBase<CUDBatchTests>
9292
{
93-
public CUDBatchTests(WebHostTestFixture fixture)
94-
: base(fixture)
93+
public CUDBatchTests(WebHostTestFixture<CUDBatchTests> fixture)
94+
:base(fixture)
9595
{
9696
}
9797

98-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
98+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
9999
{
100100
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
101101
configuration.Count().Filter().OrderBy().Expand().MaxTop(null);
@@ -445,14 +445,14 @@ public async Task CanHandleSingleDeleteInBatch()
445445
}
446446
}
447447

448-
public class QueryBatchTests : WebHostTestBase
448+
public class QueryBatchTests : WebHostTestBase<QueryBatchTests>
449449
{
450-
public QueryBatchTests(WebHostTestFixture fixture)
450+
public QueryBatchTests(WebHostTestFixture<QueryBatchTests> fixture)
451451
:base(fixture)
452452
{
453453
}
454454

455-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
455+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
456456
{
457457
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
458458
configuration.MapODataServiceRoute(
@@ -509,14 +509,14 @@ public async Task CanBatchQueriesWithDataServicesClient()
509509
}
510510
}
511511

512-
public class ErrorsBatchTests : WebHostTestBase
512+
public class ErrorsBatchTests : WebHostTestBase<ErrorsBatchTests>
513513
{
514-
public ErrorsBatchTests(WebHostTestFixture fixture)
514+
public ErrorsBatchTests(WebHostTestFixture<ErrorsBatchTests> fixture)
515515
:base(fixture)
516516
{
517517
}
518518

519-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
519+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
520520
{
521521
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
522522
configuration.MapODataServiceRoute(
@@ -570,14 +570,14 @@ public async Task SendsIndividualErrorWhenOneOfTheRequestsFails()
570570
}
571571
}
572572

573-
public class LinksBatchTests : WebHostTestBase
573+
public class LinksBatchTests : WebHostTestBase<LinksBatchTests>
574574
{
575-
public LinksBatchTests(WebHostTestFixture fixture)
575+
public LinksBatchTests(WebHostTestFixture<LinksBatchTests> fixture)
576576
:base(fixture)
577577
{
578578
}
579579

580-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
580+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
581581
{
582582
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
583583
configuration.MapODataServiceRoute(
@@ -616,14 +616,14 @@ public virtual async Task CanSetLinksInABatchWithDataServicesClient()
616616
}
617617
}
618618

619-
public class ContinueOnErrorBatchTests : WebHostTestBase
619+
public class ContinueOnErrorBatchTests : WebHostTestBase<ContinueOnErrorBatchTests>
620620
{
621-
public ContinueOnErrorBatchTests(WebHostTestFixture fixture)
621+
public ContinueOnErrorBatchTests(WebHostTestFixture<ContinueOnErrorBatchTests> fixture)
622622
:base(fixture)
623623
{
624624
}
625625

626-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
626+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
627627
{
628628
ODataModelBuilder builder = configuration.CreateConventionModelBuilder();
629629
configuration.MapODataServiceRoute(

‎test/E2ETest/Microsoft.Test.E2E.AspNet.OData/BoundOperation/BoundOperationTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323

2424
namespace Microsoft.Test.E2E.AspNet.OData.BoundOperation
2525
{
26-
public class BoundOperationTest : WebHostTestBase
26+
public class BoundOperationTest : WebHostTestBase<BoundOperationTest>
2727
{
2828
private const string CollectionOfEmployee = "Collection(NS.Employee)";
2929
private const string CollectionOfManager = "Collection(NS.Manager)";
3030
private const string Employee = "NS.Employee";
3131
private const string Manager = "NS.Manager";
3232

33-
public BoundOperationTest(WebHostTestFixture fixture)
33+
public BoundOperationTest(WebHostTestFixture<BoundOperationTest> fixture)
3434
:base(fixture)
3535
{
3636
}
@@ -43,7 +43,7 @@ private async Task<HttpResponseMessage> ResetDatasource()
4343
return responseForPost;
4444
}
4545

46-
protected override void UpdateConfiguration(WebRouteConfiguration configuration)
46+
protected static void UpdateConfigure(WebRouteConfiguration configuration)
4747
{
4848
var controllers = new[] { typeof(EmployeesController), typeof(MetadataController) };
4949
configuration.AddControllers(controllers);

0 commit comments

Comments
 (0)