Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private String createTestwiseCoverageReport(boolean partial) throws IOException,
availableTests.clear();
testExecutions.clear();

return JsonUtils.serialize(report);
return JsonUtils.serializeToJson(report);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 "]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion common-system-test/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading