include pr info checks to CITagsProviderTest

daniel-mohedano · daniel-mohedano · commit e40154996d83 · 2025-05-23T14:14:10.000+02:00
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/AppVeyorInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/AppVeyorInfoTest.groovy
@@ -24,4 +24,18 @@ class AppVeyorInfoTest extends CITagsProviderTest {
     map.put(AppVeyorInfo.APPVEYOR_REPO_COMMIT, "0000000000000000000000000000000000000000")
     return map
   }
+
+  @Override
+  void setupPullRequestInfoBuild() {
+    environmentVariables.set(AppVeyorInfo.APPVEYOR_REPO_BRANCH, "base-branch")
+  }
+
+  @Override
+  PullRequestInfo expectedPullRequestInfo() {
+    return new PullRequestInfo(
+      "base-branch",
+      null,
+      null,
+      )
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/BitBucketInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/BitBucketInfoTest.groovy
@@ -23,4 +23,18 @@ class BitBucketInfoTest extends CITagsProviderTest {
     map.put(BitBucketInfo.BITBUCKET_GIT_COMMIT, "0000000000000000000000000000000000000000")
     return map
   }
+
+  @Override
+  void setupPullRequestInfoBuild() {
+    environmentVariables.set(BitBucketInfo.BITBUCKET_PR_DESTINATION_BRANCH, "base-branch")
+  }
+
+  @Override
+  PullRequestInfo expectedPullRequestInfo() {
+    return new PullRequestInfo(
+      "base-branch",
+      null,
+      null,
+      )
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/BuddyInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/BuddyInfoTest.groovy
@@ -22,6 +22,20 @@ class BuddyInfoTest extends CITagsProviderTest {
     return map
   }
 
+  @Override
+  void setupPullRequestInfoBuild() {
+    environmentVariables.set(BuddyInfo.BUDDY_RUN_PR_BASE_BRANCH, "base-branch")
+  }
+
+  @Override
+  PullRequestInfo expectedPullRequestInfo() {
+    return new PullRequestInfo(
+      "base-branch",
+      null,
+      null
+      )
+  }
+
   boolean isWorkspaceAwareCi() {
     false
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CITagsProviderTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/CITagsProviderTest.groovy
@@ -158,8 +158,28 @@ abstract class CITagsProviderTest extends Specification {
     }
   }
 
+  def "test pull request info building"() {
+    setup:
+    setupPullRequestInfoBuild()
+
+    expect:
+    if (isCi()) {
+      CIProviderInfoFactory ciProviderInfoFactory = new CIProviderInfoFactory(Config.get(), GIT_FOLDER_FOR_TESTS, new CiEnvironmentImpl(System.getenv()))
+      def ciProviderInfo = ciProviderInfoFactory.createCIProviderInfo(getWorkspacePath())
+      def actualPullRequestInfo = ciProviderInfo.buildPullRequestInfo()
+
+      actualPullRequestInfo == expectedPullRequestInfo()
+    }
+  }
+
   abstract String getProviderName()
 
+  void setupPullRequestInfoBuild() {}
+
+  PullRequestInfo expectedPullRequestInfo() {
+    return PullRequestInfo.EMPTY
+  }
+
   Map<String, String> buildRemoteGitInfoEmpty() {
     return new HashMap<String, String>()
   }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/GitLabInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/GitLabInfoTest.groovy
@@ -23,4 +23,20 @@ class GitLabInfoTest extends CITagsProviderTest {
     map.put(GitLabInfo.GITLAB_GIT_COMMIT, "0000000000000000000000000000000000000000")
     return map
   }
+
+  @Override
+  void setupPullRequestInfoBuild() {
+    environmentVariables.set(GitLabInfo.GITLAB_PULL_REQUEST_BASE_BRANCH, "base-branch")
+    environmentVariables.set(GitLabInfo.GITLAB_PULL_REQUEST_BASE_BRANCH_SHA, "cab317e178b740e6cb651dd7486bd925338b2843")
+    environmentVariables.set(GitLabInfo.GITLAB_PULL_REQUEST_COMMIT_HEAD_SHA, "b861e7fbb94b4949972b528ff7315c329e36092c")
+  }
+
+  @Override
+  PullRequestInfo expectedPullRequestInfo() {
+    return new PullRequestInfo(
+      "base-branch",
+      "cab317e178b740e6cb651dd7486bd925338b2843",
+      "b861e7fbb94b4949972b528ff7315c329e36092c"
+      )
+  }
 }
diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/GithubActionsInfoTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/ci/GithubActionsInfoTest.groovy
@@ -1,6 +1,5 @@
 package datadog.trace.civisibility.ci
 
-import datadog.trace.civisibility.ci.env.CiEnvironmentImpl
 
 import java.nio.file.Paths
 
@@ -28,20 +27,20 @@ class GithubActionsInfoTest extends CITagsProviderTest {
     return map
   }
 
-  def "test pull request info parsing"() {
-    setup:
+  @Override
+  void setupPullRequestInfoBuild() {
     def githubEvent = GithubActionsInfoTest.getResource("/ci/github-event.json")
     def githubEventPath = Paths.get(githubEvent.toURI())
 
     environmentVariables.set(GithubActionsInfo.GITHUB_BASE_REF, "base-ref")
     environmentVariables.set(GithubActionsInfo.GITHUB_EVENT_PATH, githubEventPath.toString())
+  }
 
-    when:
-    def pullRequestInfo = new GithubActionsInfo(new CiEnvironmentImpl(System.getenv())).buildPullRequestInfo()
-
-    then:
-    pullRequestInfo.pullRequestBaseBranch == "base-ref"
-    pullRequestInfo.pullRequestBaseBranchSha == "52e0974c74d41160a03d59ddc73bb9f5adab054b"
-    pullRequestInfo.gitCommitHeadSha == "df289512a51123083a8e6931dd6f57bb3883d4c4"
+  @Override
+  PullRequestInfo expectedPullRequestInfo() {
+    return new PullRequestInfo(
+      "base-ref",
+      "52e0974c74d41160a03d59ddc73bb9f5adab054b",
+      "df289512a51123083a8e6931dd6f57bb3883d4c4")
   }
 }
