From 9d1fe6b63ddc246c00462e79c28918b618d020b2 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Mon, 5 May 2025 04:02:24 +0000 Subject: [PATCH 1/5] add preprocessor definition to enable these tests --- .devcontainer/devcontainer.json | 1 + .../LicenseValidator/UrlToLicenseMappingTest.cs | 3 ++- tests/NuGetUtility.Test/NuGetUtility.Test.csproj | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..76edfa61 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1 @@ +{"image":"mcr.microsoft.com/devcontainers/universal:2"} \ No newline at end of file diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs b/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs index 4b1a3ff9..3387c2ac 100644 --- a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs +++ b/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs @@ -7,12 +7,12 @@ namespace NuGetUtility.Test.LicenseValidator { + #if defined( ENABLE_URL_TO_LICENSE_MAPPING_TESTS) [TestFixture] public class UrlToLicenseMappingTest { [Parallelizable(scope: ParallelScope.All)] [TestCaseSource(typeof(UrlToLicenseMapping), nameof(UrlToLicenseMapping.Default))] - [Platform(Exclude = "Win")] public async Task License_Should_Be_Available_And_Match_Expected_License(KeyValuePair mappedValue) { int retryCount = 0; @@ -67,4 +67,5 @@ public void Dispose() internal INavigation Navigate() => _driver.Navigate(); } } + #endif } diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj index 6fb812e9..1ca1980b 100644 --- a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj +++ b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj @@ -47,4 +47,7 @@ + + $(DefineConstants);ENABLE_URL_TO_LICENSE_MAPPING_TESTS + From c72a676c923ae554f62b9fc1ca217797dcffdd94 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Mon, 5 May 2025 06:45:53 +0000 Subject: [PATCH 2/5] use separate project to test url to license mapping to give tighter control --- .github/workflows/action.yml | 24 +++++++++--- .github/workflows/release.yml | 2 - NuGetUtility.sln | 21 ++++++++++ ...GetUtility.Test.UrlToLicenseMapping.csproj | 38 +++++++++++++++++++ ...cted_License_0a0d7369b800fefd.verified.txt | 0 ...cted_License_22e062c15379c13a.verified.txt | 0 ...cted_License_2b7019084576ccdc.verified.txt | 0 ...cted_License_428b264ee36ee41a.verified.txt | 0 ...cted_License_4361ac729d63963d.verified.txt | 0 ...cted_License_5b045172ae56c820.verified.txt | 0 ...cted_License_5e3ed529434f955d.verified.txt | 0 ...cted_License_5ee1cd856c331a32.verified.txt | 0 ...cted_License_631a3cca888994b1.verified.txt | 0 ...cted_License_63a0ec25be40d11a.verified.txt | 0 ...cted_License_63cad523536fe5ca.verified.txt | 0 ...cted_License_675228b0289c97b9.verified.txt | 0 ...cted_License_6d2eeb842e225813.verified.txt | 0 ...cted_License_81bab0f76a137fc6.verified.txt | 0 ...cted_License_847892e5f3e913b2.verified.txt | 0 ...cted_License_8d04a55b9c210908.verified.txt | 0 ...cted_License_97f12ec44714bb11.verified.txt | 0 ...cted_License_a8bbd9c75d4635f7.verified.txt | 0 ...cted_License_b1be5a7303cd1845.verified.txt | 0 ...cted_License_d22662ea445fd590.verified.txt | 0 ...cted_License_dacc9e1876bd896e.verified.txt | 0 .../UrlToLicenseMappingTest.cs | 2 - .../NuGetUtility.Test.csproj | 5 --- 27 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt (100%) rename tests/{NuGetUtility.Test/LicenseValidator => NuGetUtility.Test.UrlToLicenseMapping}/UrlToLicenseMappingTest.cs (97%) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 4df38610..6b8c4e66 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -37,8 +37,6 @@ jobs: with: dotnet-version: 9.0.x - - uses: browser-actions/setup-chrome@latest - - name: restore run: dotnet restore @@ -46,7 +44,25 @@ jobs: run: dotnet build --configuration Release --no-restore - name: test - run: dotnet test --configuration Release -f ${{ matrix.framework }} --no-restore + run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.csproj --configuration Release -f ${{ matrix.framework }} --no-restore + + test_url_to_license_mapping: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - name: Setup dotnet 9.0.x + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x + + - uses: browser-actions/setup-chrome@latest + + - name: restore + run: dotnet restore + + - name: test + run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.UrlToLicenseMapping.csproj --configuration Release --no-restore + test_windows: runs-on: windows-latest strategy: @@ -75,8 +91,6 @@ jobs: - uses: nuget/setup-nuget@v2 - run: nuget restore NuGetUtility.sln - - uses: browser-actions/setup-chrome@latest - - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1d26a47b..6b2507f8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,8 +33,6 @@ jobs: - name: build run: msbuild -t:rebuild -property:Configuration=Release - - uses: browser-actions/setup-chrome@latest - - name: test uses: josepho0918/vstest-action@main with: diff --git a/NuGetUtility.sln b/NuGetUtility.sln index 72588b70..c6eeceff 100644 --- a/NuGetUtility.sln +++ b/NuGetUtility.sln @@ -46,6 +46,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersionRangesProject", "tes EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTargetProjectWithDifferentDependencies", "tests\targets\MultiTargetProjectWithDifferentDependencies\MultiTargetProjectWithDifferentDependencies.csproj", "{A19BF89A-8B1F-4612-A923-08F52B53DC84}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGetUtility.Test.UrlToLicenseMapping", "tests\NuGetUtility.Test.UrlToLicenseMapping\NuGetUtility.Test.UrlToLicenseMapping.csproj", "{A77F9673-8296-4680-A713-8AC26B7DE41C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -305,6 +307,24 @@ Global {A19BF89A-8B1F-4612-A923-08F52B53DC84}.TestWindows|x64.Build.0 = Debug|Any CPU {A19BF89A-8B1F-4612-A923-08F52B53DC84}.TestWindows|x86.ActiveCfg = Debug|Any CPU {A19BF89A-8B1F-4612-A923-08F52B53DC84}.TestWindows|x86.Build.0 = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|x64.ActiveCfg = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|x64.Build.0 = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|x86.ActiveCfg = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Debug|x86.Build.0 = Debug|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|Any CPU.Build.0 = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|x64.ActiveCfg = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|x64.Build.0 = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|x86.ActiveCfg = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.Release|x86.Build.0 = Release|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|Any CPU.ActiveCfg = TestWindows|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|Any CPU.Build.0 = TestWindows|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|x64.ActiveCfg = TestWindows|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|x64.Build.0 = TestWindows|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|x86.ActiveCfg = TestWindows|Any CPU + {A77F9673-8296-4680-A713-8AC26B7DE41C}.TestWindows|x86.Build.0 = TestWindows|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -325,6 +345,7 @@ Global {9B107A91-87F9-420C-ADF8-732C77DAFB93} = {FA92392F-D895-4D1E-A5ED-E6DC3C08223E} {6C96D10E-6CB6-4387-922F-C7C97C037495} = {FA92392F-D895-4D1E-A5ED-E6DC3C08223E} {A19BF89A-8B1F-4612-A923-08F52B53DC84} = {FA92392F-D895-4D1E-A5ED-E6DC3C08223E} + {A77F9673-8296-4680-A713-8AC26B7DE41C} = {C00E0699-ACCD-44CD-91A7-243A30504DB9} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {70887D40-0182-4C32-BFA1-B5A02E405F11} diff --git a/tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj b/tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj new file mode 100644 index 00000000..932c9a36 --- /dev/null +++ b/tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj @@ -0,0 +1,38 @@ + + + + net9.0 + enable + enable + + false + + Debug;Release;TestWindows + + AnyCPU + True + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_0a0d7369b800fefd.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_22e062c15379c13a.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_2b7019084576ccdc.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_428b264ee36ee41a.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_4361ac729d63963d.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5b045172ae56c820.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5e3ed529434f955d.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_5ee1cd856c331a32.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_631a3cca888994b1.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63a0ec25be40d11a.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_63cad523536fe5ca.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_675228b0289c97b9.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_6d2eeb842e225813.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_81bab0f76a137fc6.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_847892e5f3e913b2.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_8d04a55b9c210908.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_97f12ec44714bb11.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_a8bbd9c75d4635f7.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_b1be5a7303cd1845.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_d22662ea445fd590.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt similarity index 100% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.License_Should_Be_Available_And_Match_Expected_License_dacc9e1876bd896e.verified.txt diff --git a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.cs similarity index 97% rename from tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs rename to tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.cs index 3387c2ac..84f763d9 100644 --- a/tests/NuGetUtility.Test/LicenseValidator/UrlToLicenseMappingTest.cs +++ b/tests/NuGetUtility.Test.UrlToLicenseMapping/UrlToLicenseMappingTest.cs @@ -7,7 +7,6 @@ namespace NuGetUtility.Test.LicenseValidator { - #if defined( ENABLE_URL_TO_LICENSE_MAPPING_TESTS) [TestFixture] public class UrlToLicenseMappingTest { @@ -67,5 +66,4 @@ public void Dispose() internal INavigation Navigate() => _driver.Navigate(); } } - #endif } diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj index 1ca1980b..acdbe564 100644 --- a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj +++ b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj @@ -32,7 +32,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - @@ -46,8 +45,4 @@ - - - $(DefineConstants);ENABLE_URL_TO_LICENSE_MAPPING_TESTS - From 8c5af3023610ad13f73118b39fdd6a8f855028be Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Mon, 5 May 2025 06:48:41 +0000 Subject: [PATCH 3/5] fix --- .github/workflows/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 6b8c4e66..1235f343 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -61,7 +61,7 @@ jobs: run: dotnet restore - name: test - run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.UrlToLicenseMapping.csproj --configuration Release --no-restore + run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.UrlToLicenseMapping.csproj --configuration Release --no-restore test_windows: runs-on: windows-latest From 799ca233719adefc3a803dd26d8bf54778cdbf91 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Mon, 5 May 2025 06:54:27 +0000 Subject: [PATCH 4/5] fix tests --- .github/workflows/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 1235f343..9b01a7fd 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -44,7 +44,7 @@ jobs: run: dotnet build --configuration Release --no-restore - name: test - run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.csproj --configuration Release -f ${{ matrix.framework }} --no-restore + run: dotnet test ./tests/NuGetLicense.Test/NuGetLicense.Test.csproj --configuration Release -f ${{ matrix.framework }} --no-restore test_url_to_license_mapping: runs-on: macos-latest @@ -61,7 +61,7 @@ jobs: run: dotnet restore - name: test - run: dotnet test ./tests/NuGetLicense.Test.NuGetLicenseTest.UrlToLicenseMapping.csproj --configuration Release --no-restore + run: dotnet test ./tests/NuGetLicense.Test.UrlToLicenseMapping/NuGetLicense.Test.UrlToLicenseMapping.csproj --configuration Release --no-restore test_windows: runs-on: windows-latest From 316d2540b01ecc455c0b988a4a27a55faf68e2ba Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Mon, 5 May 2025 06:57:01 +0000 Subject: [PATCH 5/5] tests again --- .github/workflows/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 9b01a7fd..f49e4574 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -44,7 +44,7 @@ jobs: run: dotnet build --configuration Release --no-restore - name: test - run: dotnet test ./tests/NuGetLicense.Test/NuGetLicense.Test.csproj --configuration Release -f ${{ matrix.framework }} --no-restore + run: dotnet test ./tests/NuGetUtility.Test/NuGetUtility.Test.csproj --configuration Release -f ${{ matrix.framework }} --no-restore test_url_to_license_mapping: runs-on: macos-latest @@ -61,7 +61,7 @@ jobs: run: dotnet restore - name: test - run: dotnet test ./tests/NuGetLicense.Test.UrlToLicenseMapping/NuGetLicense.Test.UrlToLicenseMapping.csproj --configuration Release --no-restore + run: dotnet test ./tests/NuGetUtility.Test.UrlToLicenseMapping/NuGetUtility.Test.UrlToLicenseMapping.csproj --configuration Release --no-restore test_windows: runs-on: windows-latest