Skip to content

Commit

Permalink
Restructure E2E tests projects (#3176)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ElizabethOkerio
ElizabethOkerio authored Feb 12, 2025
1 parent ae104c9 commit aba9a63
Show file tree
Hide file tree
Showing 134 changed files with 5,940 additions and 5,331 deletions.
4 changes: 3 additions & 1 deletion buildandtest.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ steps:
- task: DotNetCoreCLI@2
condition: eq(variables.buildConfiguration, 'Release')
displayName: 'Test - Microsoft.OData.Client.E2E.Tests'
displayName: 'Test - E2E Tests'
inputs:
command: 'test'
arguments: '--configuration $(buildConfiguration) --settings $(Build.SourcesDirectory)\test.runsettings --collect "Code Coverage"'
projects: |
$(Build.SourcesDirectory)\test\EndToEndTests\Tests\Client\Microsoft.OData.Client.E2E.Tests\Microsoft.OData.Client.E2E.Tests.csproj
$(Build.SourcesDirectory)\test\EndToEndTests\Tests\Core\Microsoft.OData.Core.E2E.Tests\Microsoft.OData.Core.E2E.Tests.csproj
$(Build.SourcesDirectory)\test\EndToEndTests\Tests\Edm\Microsoft.OData.Edm.E2E.Tests\Microsoft.OData.Edm.E2E.Tests.csproj
28 changes: 21 additions & 7 deletions sln/OData.E2E.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Spatial.Tests", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.E2E.TestCommon", "..\test\EndToEndTests\Common\Microsoft.OData.Client.E2E.TestCommon\Microsoft.OData.Client.E2E.TestCommon.csproj", "{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "helper", "helper", "{C2ADD565-E633-42A9-9956-9FF9FAF5E4B5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.TestCommon", "..\test\Common\Microsoft.OData.TestCommon\Microsoft.OData.TestCommon.csproj", "{F9BF7E61-402B-4492-A4FE-F9549921741B}"
Expand All @@ -37,6 +35,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.Depend
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Client.E2E.Tests", "..\test\EndToEndTests\Tests\Client\Microsoft.OData.Client.E2E.Tests\Microsoft.OData.Client.E2E.Tests.csproj", "{F9D836BC-2289-4B6E-8295-2B9F3888E3A1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Core.E2E.Tests", "..\test\EndToEndTests\Tests\Core\Microsoft.OData.Core.E2E.Tests\Microsoft.OData.Core.E2E.Tests.csproj", "{40BEFA92-B319-43F6-9382-AD07AC45A3F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Edm.E2E.Tests", "..\test\EndToEndTests\Tests\Edm\Microsoft.OData.Edm.E2E.Tests\Microsoft.OData.Edm.E2E.Tests.csproj", "{42A09960-B0BD-49CC-AA6E-A6E9572E63CD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.E2E.TestCommon", "..\test\EndToEndTests\Common\Microsoft.OData.E2E.TestCommon\Microsoft.OData.E2E.TestCommon.csproj", "{44932037-DDF0-4B5D-A2F4-385A7617BDD9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -75,10 +79,6 @@ Global
{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F40112C3-4150-41DB-BDF2-1C34FC9B49D6}.Release|Any CPU.Build.0 = Release|Any CPU
{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D}.Release|Any CPU.Build.0 = Release|Any CPU
{F9BF7E61-402B-4492-A4FE-F9549921741B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9BF7E61-402B-4492-A4FE-F9549921741B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9BF7E61-402B-4492-A4FE-F9549921741B}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -91,6 +91,18 @@ Global
{F9D836BC-2289-4B6E-8295-2B9F3888E3A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9D836BC-2289-4B6E-8295-2B9F3888E3A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9D836BC-2289-4B6E-8295-2B9F3888E3A1}.Release|Any CPU.Build.0 = Release|Any CPU
{40BEFA92-B319-43F6-9382-AD07AC45A3F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{40BEFA92-B319-43F6-9382-AD07AC45A3F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{40BEFA92-B319-43F6-9382-AD07AC45A3F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{40BEFA92-B319-43F6-9382-AD07AC45A3F0}.Release|Any CPU.Build.0 = Release|Any CPU
{42A09960-B0BD-49CC-AA6E-A6E9572E63CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42A09960-B0BD-49CC-AA6E-A6E9572E63CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42A09960-B0BD-49CC-AA6E-A6E9572E63CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42A09960-B0BD-49CC-AA6E-A6E9572E63CD}.Release|Any CPU.Build.0 = Release|Any CPU
{44932037-DDF0-4B5D-A2F4-385A7617BDD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{44932037-DDF0-4B5D-A2F4-385A7617BDD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44932037-DDF0-4B5D-A2F4-385A7617BDD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44932037-DDF0-4B5D-A2F4-385A7617BDD9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -106,11 +118,13 @@ Global
{17E925D3-8840-41BD-B0DF-884334FB9812} = {F2A816DD-1537-4D00-B3BF-535F4FA8D724}
{F40112C3-4150-41DB-BDF2-1C34FC9B49D6} = {F2A816DD-1537-4D00-B3BF-535F4FA8D724}
{57146ABA-0B08-4B0A-8D27-9A477FA0C2B5} = {5D4916FD-F73F-422D-90C3-4E1203D2EFD1}
{70A2EB6E-8B18-49A5-A1C7-2863A535BC9D} = {57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}
{C2ADD565-E633-42A9-9956-9FF9FAF5E4B5} = {5D4916FD-F73F-422D-90C3-4E1203D2EFD1}
{F9BF7E61-402B-4492-A4FE-F9549921741B} = {C2ADD565-E633-42A9-9956-9FF9FAF5E4B5}
{AB1B80D6-EAE2-41C0-A089-7CD492E85FE9} = {C2ADD565-E633-42A9-9956-9FF9FAF5E4B5}
{F9D836BC-2289-4B6E-8295-2B9F3888E3A1} = {57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}
{40BEFA92-B319-43F6-9382-AD07AC45A3F0} = {57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}
{42A09960-B0BD-49CC-AA6E-A6E9572E63CD} = {57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}
{44932037-DDF0-4B5D-A2F4-385A7617BDD9} = {57146ABA-0B08-4B0A-8D27-9A477FA0C2B5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6CBE9B94-7DB7-4304-8670-252389D79D5E}
Expand Down
28 changes: 21 additions & 7 deletions sln/OData.Pipeline.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Test.OData.Depend
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "e2eTests", "e2eTests", "{F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.E2E.TestCommon", "..\test\EndToEndTests\Common\Microsoft.OData.Client.E2E.TestCommon\Microsoft.OData.Client.E2E.TestCommon.csproj", "{F99A96F2-AB70-4AEC-BAF2-265B8995D60C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OData.Client.E2E.Tests", "..\test\EndToEndTests\Tests\Client\Microsoft.OData.Client.E2E.Tests\Microsoft.OData.Client.E2E.Tests.csproj", "{7258F248-569E-4D8A-827D-A1126D794338}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.E2E.TestCommon", "..\test\EndToEndTests\Common\Microsoft.OData.E2E.TestCommon\Microsoft.OData.E2E.TestCommon.csproj", "{32E9241F-70C2-4C32-B2E7-6C836E91102A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Core.E2E.Tests", "..\test\EndToEndTests\Tests\Core\Microsoft.OData.Core.E2E.Tests\Microsoft.OData.Core.E2E.Tests.csproj", "{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Edm.E2E.Tests", "..\test\EndToEndTests\Tests\Edm\Microsoft.OData.Edm.E2E.Tests\Microsoft.OData.Edm.E2E.Tests.csproj", "{8505C7B6-46E3-4410-B436-FC6B444C13A3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -83,14 +87,22 @@ Global
{91526796-57BB-44C0-B9EB-905F47F902AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91526796-57BB-44C0-B9EB-905F47F902AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91526796-57BB-44C0-B9EB-905F47F902AF}.Release|Any CPU.Build.0 = Release|Any CPU
{F99A96F2-AB70-4AEC-BAF2-265B8995D60C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F99A96F2-AB70-4AEC-BAF2-265B8995D60C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F99A96F2-AB70-4AEC-BAF2-265B8995D60C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F99A96F2-AB70-4AEC-BAF2-265B8995D60C}.Release|Any CPU.Build.0 = Release|Any CPU
{7258F248-569E-4D8A-827D-A1126D794338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7258F248-569E-4D8A-827D-A1126D794338}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7258F248-569E-4D8A-827D-A1126D794338}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7258F248-569E-4D8A-827D-A1126D794338}.Release|Any CPU.Build.0 = Release|Any CPU
{32E9241F-70C2-4C32-B2E7-6C836E91102A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32E9241F-70C2-4C32-B2E7-6C836E91102A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32E9241F-70C2-4C32-B2E7-6C836E91102A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32E9241F-70C2-4C32-B2E7-6C836E91102A}.Release|Any CPU.Build.0 = Release|Any CPU
{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062}.Release|Any CPU.ActiveCfg = Release|Any CPU
{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062}.Release|Any CPU.Build.0 = Release|Any CPU
{8505C7B6-46E3-4410-B436-FC6B444C13A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8505C7B6-46E3-4410-B436-FC6B444C13A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8505C7B6-46E3-4410-B436-FC6B444C13A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8505C7B6-46E3-4410-B436-FC6B444C13A3}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -109,8 +121,10 @@ Global
{A9CC879D-AF23-4505-B263-23BAC2B096C7} = {69A333F6-82AC-4B53-951C-300A8340DE8B}
{91526796-57BB-44C0-B9EB-905F47F902AF} = {69A333F6-82AC-4B53-951C-300A8340DE8B}
{F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22} = {403A5A8E-A819-4A9F-B803-8381F5170099}
{F99A96F2-AB70-4AEC-BAF2-265B8995D60C} = {F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}
{7258F248-569E-4D8A-827D-A1126D794338} = {F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}
{32E9241F-70C2-4C32-B2E7-6C836E91102A} = {F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}
{75EEB7ED-BEAE-48F3-BD48-D9E22C24B062} = {F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}
{8505C7B6-46E3-4410-B436-FC6B444C13A3} = {F1CCA204-8C99-4DBC-A6C4-5A2B5D5E6C22}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {653421B2-1603-4D3F-B3F3-9C25FD912CE4}
Expand Down
Loading

0 comments on commit aba9a63

Please sign in to comment.