WIP

dotnet · Aug 29, 2024 · 89dd1f7 · 89dd1f7
1 parent ecb3ec1
commit 89dd1f7
Showing 1 changed file with 19 additions and 55 deletions.
diff --git a/tests/DotNet.ReproducibleBuilds.Tests/SourceLinkTests.cs b/tests/DotNet.ReproducibleBuilds.Tests/SourceLinkTests.cs
@@ -1,19 +1,10 @@
 using FluentAssertions;
 using Microsoft.Build.Utilities.ProjectCreation;
-using System.Collections;
-using Xunit.Abstractions;
 
 namespace DotNet.ReproducibleBuilds.Tests;
 
 public class SourceLinkTests : TestBase
 {
-    public ITestOutputHelper Output { get; }
-
-    public SourceLinkTests(ITestOutputHelper output)
-    {
-        Output = output;
-    }
-
     [Theory]
     [InlineData(null, true)]
     [InlineData(false, false)]
@@ -60,65 +51,38 @@ public void EmbedUntrackedSourcesIsSet(bool? embedUntrackedSources, bool expecte
     }
 
     [Theory]
-    //[InlineData("GITHUB_REF", "refs/pull/1234/merge", "pr1234")]
-    //[InlineData("GITHUB_REF", "refs/heads/my-branch", "my-branch")]
-    //[InlineData("GITHUB_REF", "refs/tags/v1.2.3", "v1.2.3")]
+    [InlineData("GITHUB_REF", "refs/pull/1234/merge", "pr1234")]
+    [InlineData("GITHUB_REF", "refs/heads/my-branch", "my-branch")]
+    [InlineData("GITHUB_REF", "refs/tags/v1.2.3", "v1.2.3")]
 
-    //[InlineData("BUILD_SOURCEBRANCH", "refs/heads/my-branch", "my-branch")]
-    //[InlineData("BUILD_SOURCEBRANCH", "refs/tags/v1.2.3", "v1.2.3")]
+    [InlineData("BUILD_SOURCEBRANCH", "refs/heads/my-branch", "my-branch")]
+    [InlineData("BUILD_SOURCEBRANCH", "refs/tags/v1.2.3", "v1.2.3")]
 
-    //[InlineData("APPVEYOR_PULL_REQUEST_NUMBER", "1234", "pr1234")]
-    //[InlineData("APPVEYOR_REPO_TAG_NAME", "refs/tags/v1.2.3", "refs/tags/v1.2.3")]
-    //[InlineData("APPVEYOR_REPO_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("APPVEYOR_PULL_REQUEST_NUMBER", "1234", "pr1234")]
+    [InlineData("APPVEYOR_REPO_TAG_NAME", "refs/tags/v1.2.3", "refs/tags/v1.2.3")]
+    [InlineData("APPVEYOR_REPO_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
 
-    //[InlineData("TEAMCITY_BUILD_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("TEAMCITY_BUILD_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
 
-    //[InlineData("TRAVIS_PULL_REQUEST", "1234", "pr1234")]
-    //[InlineData("TRAVIS_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("TRAVIS_PULL_REQUEST", "1234", "pr1234")]
+    [InlineData("TRAVIS_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
 
-    //[InlineData("CIRCLE_PR_NUMBER", "1234", "pr1234")]
-    //[InlineData("CIRCLE_TAG", "refs/heads/v1.2.3", "refs/heads/v1.2.3")]
-    //[InlineData("CIRCLE_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("CIRCLE_PR_NUMBER", "1234", "pr1234")]
+    [InlineData("CIRCLE_TAG", "refs/heads/v1.2.3", "refs/heads/v1.2.3")]
+    [InlineData("CIRCLE_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
 
     [InlineData("CI_COMMIT_TAG", "refs/tags/v1.2.3", "refs/tags/v1.2.3")]
-    //[InlineData("CI_MERGE_REQUEST_IID", "1234", "pr1234")]
-    //[InlineData("CI_COMMIT_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("CI_MERGE_REQUEST_IID", "1234", "pr1234")]
+    [InlineData("CI_COMMIT_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
 
-    //[InlineData("BUDDY_EXECUTION_PULL_REQUEST_NO", "1234", "pr1234")]
-    //[InlineData("BUDDY_EXECUTION_TAG", "refs/tags/v1.2.3", "refs/tags/v1.2.3")]
-    //[InlineData("BUDDY_EXECUTION_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
+    [InlineData("BUDDY_EXECUTION_PULL_REQUEST_NO", "1234", "pr1234")]
+    [InlineData("BUDDY_EXECUTION_TAG", "refs/tags/v1.2.3", "refs/tags/v1.2.3")]
+    [InlineData("BUDDY_EXECUTION_BRANCH", "refs/heads/my-branch", "refs/heads/my-branch")]
     public void RepositoryBranchIsSet(string ci, string original, string expected)
     {
-        Output.WriteLine($"BEFORE: BUILD_SOURCEBRANCH: {Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH")}");
-        Output.WriteLine($"BEFORE: {ci}: {Environment.GetEnvironmentVariable(ci)}");
-
-        foreach (DictionaryEntry de in Environment.GetEnvironmentVariables())
-        {
-            if (de.Value?.ToString() == "refs/pull/49/merge")
-            {
-                Output.WriteLine($"{de.Key} = {de.Value}");
-            }
-        }
-
         using EnvironmentVariableSuppressor hostSuppressor = new("BUILD_SOURCEBRANCH"); // Suppress our own CI provider variables (i.e. Azure DevOps)
         using EnvironmentVariableSuppressor ciSuppressor = new(ci); // Suppress the mock CI provider (just in case)
 
-        Output.WriteLine($"BEFORE: BUILD_SOURCEBRANCH: {Environment.GetEnvironmentVariable("BUILD_SOURCEBRANCH")}");
-        Output.WriteLine($"BEFORE: {ci}: {Environment.GetEnvironmentVariable(ci)}");
-
-        foreach (DictionaryEntry de in Environment.GetEnvironmentVariables())
-        {
-            if (de.Value?.ToString() == "refs/pull/49/merge")
-            {
-                Output.WriteLine($"{de.Key} = {de.Value}");
-            }
-        }
-        //Output.WriteLine("===== AFTER =====");
-        //foreach (DictionaryEntry x in Environment.GetEnvironmentVariables())
-        //{
-        //    Output.WriteLine($"{x.Key} = {x.Value}");
-        //}
-
         ProjectCreator project = ProjectCreator.Templates
             .ReproducibleBuildProject(GetRandomFile(".csproj"))
             .PropertyGroup()