TS-38628 Git Property Tests

Author: Avanatiker

agent/src/main/kotlin/com/teamscale/jacoco/agent/options/AgentOptions.kt

@@ -496,13 +496,12 @@ open class AgentOptions(private val logger: ILogger) {
 	private fun createTeamscaleMultiProjectUploader(
 		instrumentation: Instrumentation?
 	): DelayedTeamscaleMultiProjectUploader {
-		val uploader = DelayedTeamscaleMultiProjectUploader(
-			BiFunction { project, commitInfo ->
+		val uploader = DelayedTeamscaleMultiProjectUploader { project, commitInfo ->
 				if (commitInfo!!.preferCommitDescriptorOverRevision || isEmpty(commitInfo.revision)) {
-					return@BiFunction teamscaleServer.withProjectAndCommit(project!!, commitInfo.commit!!)
+					return@DelayedTeamscaleMultiProjectUploader teamscaleServer.withProjectAndCommit(project!!, commitInfo.commit!!)
 				}
 				teamscaleServer.withProjectAndRevision(project!!, commitInfo.revision!!)
-			})
+			}
 
 		gitPropertiesJar?.let { jar ->
 			logger.info(

agent/src/main/kotlin/com/teamscale/jacoco/agent/upload/teamscale/DelayedTeamscaleMultiProjectUploader.kt

@@ -10,7 +10,7 @@ import java.util.function.BiFunction
 
 /** Wrapper for [TeamscaleUploader] that allows to upload the same coverage file to multiple Teamscale projects.  */
 class DelayedTeamscaleMultiProjectUploader(
-	private val teamscaleServerFactory: BiFunction<String?, CommitInfo?, TeamscaleServer>
+	private val teamscaleServerFactory: (String?, CommitInfo?) -> TeamscaleServer
 ) : DelayedMultiUploaderBase(), IUploader {
 	@JvmField
 	val teamscaleUploaders = mutableListOf<TeamscaleUploader>()
@@ -20,7 +20,7 @@ class DelayedTeamscaleMultiProjectUploader(
 	 * commit are already registered as an upload target and will prevent duplicate uploads.
 	 */
 	fun addTeamscaleProjectAndCommit(file: File, projectAndCommit: ProjectAndCommit) {
-		val teamscaleServer = teamscaleServerFactory.apply(
+		val teamscaleServer = teamscaleServerFactory(
 			projectAndCommit.project,
 			projectAndCommit.commitInfo
 		)

agent/src/test/java/com/teamscale/jacoco/agent/commit_resolution/git_properties/GitMultiProjectPropertiesLocatorTest.java

@@ -0,0 +1,57 @@
+package com.teamscale.jacoco.agent.commit_resolution.git_properties
+
+import com.teamscale.client.CommitDescriptor
+import com.teamscale.client.TeamscaleServer
+import com.teamscale.jacoco.agent.options.ProjectAndCommit
+import com.teamscale.jacoco.agent.upload.teamscale.DelayedTeamscaleMultiProjectUploader
+import com.teamscale.jacoco.agent.upload.teamscale.TeamscaleUploader
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.Test
+import java.io.File
+import java.util.function.BiFunction
+import java.util.function.Predicate
+import java.util.stream.Collectors
+
+internal class GitMultiProjectPropertiesLocatorTest {
+	@Test
+	fun testNoErrorIsThrownWhenGitPropertiesFileDoesNotHaveAProject() {
+		val projectAndCommits = mutableListOf<ProjectAndCommit>()
+		val locator = GitMultiProjectPropertiesLocator(
+			DelayedTeamscaleMultiProjectUploader { project, revision ->
+				projectAndCommits.add(ProjectAndCommit(project, revision))
+				TeamscaleServer()
+			}, true, null
+		)
+		val jarFile = File(javaClass.getResource("emptyTeamscaleProjectGitProperties")!!.file)
+		locator.searchFile(jarFile, false)
+		Assertions.assertThat(projectAndCommits.size).isEqualTo(1)
+		Assertions.assertThat(projectAndCommits.first().project).isEqualTo("my-teamscale-project")
+	}
+
+	@Test
+	fun testNoMultipleUploadsToSameProjectAndRevision() {
+		val delayedTeamscaleMultiProjectUploader = DelayedTeamscaleMultiProjectUploader { project, revision ->
+				val server = TeamscaleServer()
+				server.project = project
+				server.revision = revision!!.revision
+				server.commit = revision.commit
+				server
+			}
+		val locator = GitMultiProjectPropertiesLocator(
+			delayedTeamscaleMultiProjectUploader, true, null
+		)
+		val jarFile = File(javaClass.getResource("multiple-same-target-git-properties-folder")!!.file)
+		locator.searchFile(jarFile, false)
+		val teamscaleServers = delayedTeamscaleMultiProjectUploader.teamscaleUploaders.map { it.teamscaleServer }
+		Assertions.assertThat(teamscaleServers).hasSize(2)
+		Assertions.assertThat(teamscaleServers).anyMatch { server ->
+			server.project == "demo2" && server.commit == CommitDescriptor(
+				"master",
+				"1645713803000"
+			)
+		}
+		Assertions.assertThat(teamscaleServers).anyMatch { server ->
+			server.project == "demolib" && server.revision == "05b9d066a0c0762be622987de403b5752fa01cc0"
+		}
+	}
+}