Merge pull request #705 from cqse/ts/38628_system_tests_new

[TS-38628] [System Tests] Kotlin Migration New

Author: DreierF

agent/src/main/java/com/teamscale/jacoco/agent/testimpact/CoverageToJsonStrategyBase.java

@@ -141,7 +141,7 @@ private String createTestwiseCoverageReport(boolean partial) throws IOException,
 		availableTests.clear();
 		testExecutions.clear();
 
-		return JsonUtils.serialize(report);
+		return JsonUtils.serializeToJson(report);
 	}
 
 }

agent/src/main/java/com/teamscale/jacoco/agent/testimpact/TestExecutionWriter.java

@@ -29,7 +29,7 @@ public TestExecutionWriter(File testExecutionFile) {
 
 	/** Appends the given {@link TestExecution} to the test execution list file. */
 	public synchronized void append(TestExecution testExecution) throws IOException {
-		String json = JsonUtils.serialize(testExecution);
+		String json = JsonUtils.serializeToJson(testExecution);
 
 		// the file contains a JSON array if it exists and to append to it, we strip the trailing "]" and append
 		// our new entry and a closing "]"

agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsParserTest.java

@@ -101,7 +101,7 @@ public void environmentConfigIdOverridesCommandLineOptions() throws Exception {
 		registration.profilerConfiguration = new ProfilerConfiguration();
 		registration.profilerConfiguration.configurationId = "my-config";
 		registration.profilerConfiguration.configurationOptions = "teamscale-partition=foo";
-		mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serialize(registration)));
+		mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serializeToJson(registration)));
 		AgentOptionsParser parser = new AgentOptionsParser(new CommandLineLogger(), "my-config",
 				null, teamscaleCredentials, null);
 		AgentOptions options = parseAndThrow(parser, "teamscale-partition=bar");
@@ -125,7 +125,7 @@ public void environmentConfigFileOverridesConfigId() throws Exception {
 		registration.profilerConfiguration = new ProfilerConfiguration();
 		registration.profilerConfiguration.configurationId = "my-config";
 		registration.profilerConfiguration.configurationOptions = "teamscale-partition=from-config-id";
-		mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serialize(registration)));
+		mockWebServer.enqueue(new MockResponse().setBody(JsonUtils.serializeToJson(registration)));
 		AgentOptionsParser parser = new AgentOptionsParser(new CommandLineLogger(), "my-config", configFile.toString(),
 				teamscaleCredentials, null);
 		AgentOptions options = parseAndThrow(parser, "teamscale-partition=from-command-line");

agent/src/test/java/com/teamscale/jacoco/agent/options/AgentOptionsTest.java

@@ -389,7 +389,7 @@ public void testTeamscaleProxyOptionsAreUsedWhileFetchingConfigFromTeamscale() t
 			profilerRegistration.profilerConfiguration = expectedProfilerConfiguration;
 
 			mockProxyServer.enqueue(new MockResponse().setResponseCode(407));
-			mockProxyServer.enqueue(new MockResponse().setResponseCode(200).setBody(JsonUtils.serialize(profilerRegistration)));
+			mockProxyServer.enqueue(new MockResponse().setResponseCode(200).setBody(JsonUtils.serializeToJson(profilerRegistration)));
 
 			AgentOptions agentOptions= parseProxyOptions("config-id=config,", ProxySystemProperties.Protocol.HTTP, expectedHost, expectedPort, expectedUser, unexpectedPassword, passwordFile);
 

common-system-test/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     `java-library`
-    com.teamscale.`java-convention`
+    com.teamscale.`kotlin-convention`
     // we do not enable code coverage recording for the system tests as we already need our agent attached
     // it would conflict with JaCoCo's
 }