Skip to content

Commit 863eba8

Browse files
Copilotedburns
andauthored
Move test files to match generated package structure
Agent-Logs-Url: https://github.com/github/copilot-sdk-java/sessions/0c4c84ed-1cb5-4e79-954f-633c61e99a87 Co-authored-by: edburns <75821+edburns@users.noreply.github.com>
1 parent 99a8145 commit 863eba8

File tree

3 files changed

+20
-155
lines changed

3 files changed

+20
-155
lines changed

src/test/java/com/github/copilot/sdk/GeneratedEventTypesCoverageTest.java renamed to src/test/java/com/github/copilot/sdk/generated/GeneratedEventTypesCoverageTest.java

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,34 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
*--------------------------------------------------------------------------------------------*/
44

5-
package com.github.copilot.sdk;
5+
package com.github.copilot.sdk.generated;
66

77
import static org.junit.jupiter.api.Assertions.*;
88

99
import org.junit.jupiter.api.Test;
1010

11+
import com.fasterxml.jackson.databind.DeserializationFeature;
1112
import com.fasterxml.jackson.databind.ObjectMapper;
12-
13-
import com.github.copilot.sdk.generated.*;
13+
import com.fasterxml.jackson.databind.SerializationFeature;
14+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1415

1516
/**
1617
* Deserialization tests for generated session event types that are not covered
17-
* in {@link SessionEventDeserializationTest}. Verifies that each event
18-
* deserializes correctly from JSON and that the {@code type} discriminator and
19-
* {@code data} fields are accessible.
18+
* in {@link com.github.copilot.sdk.SessionEventDeserializationTest}. Verifies
19+
* that each event deserializes correctly from JSON and that the {@code type}
20+
* discriminator and {@code data} fields are accessible.
2021
*/
2122
public class GeneratedEventTypesCoverageTest {
2223

23-
private static final ObjectMapper MAPPER = JsonRpcClient.getObjectMapper();
24+
private static final ObjectMapper MAPPER = createMapper();
25+
26+
private static ObjectMapper createMapper() {
27+
var mapper = new ObjectMapper();
28+
mapper.registerModule(new JavaTimeModule());
29+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
30+
mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
31+
return mapper;
32+
}
2433

2534
private static SessionEvent parse(String json) throws Exception {
2635
return MAPPER.readValue(json, SessionEvent.class);

src/test/java/com/github/copilot/sdk/GeneratedRpcApiCoverageTest.java renamed to src/test/java/com/github/copilot/sdk/generated/rpc/GeneratedRpcApiCoverageTest.java

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
*--------------------------------------------------------------------------------------------*/
44

5-
package com.github.copilot.sdk;
5+
package com.github.copilot.sdk.generated.rpc;
66

77
import static org.junit.jupiter.api.Assertions.*;
88

@@ -13,36 +13,6 @@
1313

1414
import org.junit.jupiter.api.Test;
1515

16-
import com.github.copilot.sdk.generated.rpc.McpConfigRemoveParams;
17-
import com.github.copilot.sdk.generated.rpc.McpConfigUpdateParams;
18-
import com.github.copilot.sdk.generated.rpc.RpcCaller;
19-
import com.github.copilot.sdk.generated.rpc.ServerRpc;
20-
import com.github.copilot.sdk.generated.rpc.SessionAgentDeselectResult;
21-
import com.github.copilot.sdk.generated.rpc.SessionCommandsHandlePendingCommandParams;
22-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsDisableParams;
23-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsEnableParams;
24-
import com.github.copilot.sdk.generated.rpc.SessionFleetStartParams;
25-
import com.github.copilot.sdk.generated.rpc.SessionFsSetProviderParams;
26-
import com.github.copilot.sdk.generated.rpc.SessionHistoryTruncateParams;
27-
import com.github.copilot.sdk.generated.rpc.SessionLogParams;
28-
import com.github.copilot.sdk.generated.rpc.SessionMcpDisableParams;
29-
import com.github.copilot.sdk.generated.rpc.SessionMcpEnableParams;
30-
import com.github.copilot.sdk.generated.rpc.SessionModeSetParams;
31-
import com.github.copilot.sdk.generated.rpc.SessionPermissionsHandlePendingPermissionRequestParams;
32-
import com.github.copilot.sdk.generated.rpc.SessionPlanUpdateParams;
33-
import com.github.copilot.sdk.generated.rpc.SessionRpc;
34-
import com.github.copilot.sdk.generated.rpc.SessionShellExecParams;
35-
import com.github.copilot.sdk.generated.rpc.SessionShellKillParams;
36-
import com.github.copilot.sdk.generated.rpc.SessionSkillsDisableParams;
37-
import com.github.copilot.sdk.generated.rpc.SessionSkillsEnableParams;
38-
import com.github.copilot.sdk.generated.rpc.SessionToolsHandlePendingToolCallParams;
39-
import com.github.copilot.sdk.generated.rpc.SessionUiElicitationParams;
40-
import com.github.copilot.sdk.generated.rpc.SessionUiHandlePendingElicitationParams;
41-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceCreateFileParams;
42-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceReadFileParams;
43-
import com.github.copilot.sdk.generated.rpc.SessionsForkParams;
44-
import com.github.copilot.sdk.generated.rpc.ToolsListParams;
45-
4616
/**
4717
* Coverage tests for generated RPC API classes that are not exercised in
4818
* {@link RpcWrappersTest}. Uses the same {@link StubCaller} pattern to verify

src/test/java/com/github/copilot/sdk/GeneratedRpcRecordsCoverageTest.java renamed to src/test/java/com/github/copilot/sdk/generated/rpc/GeneratedRpcRecordsCoverageTest.java

Lines changed: 3 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
*--------------------------------------------------------------------------------------------*/
44

5-
package com.github.copilot.sdk;
5+
package com.github.copilot.sdk.generated.rpc;
66

77
import static org.junit.jupiter.api.Assertions.*;
88

@@ -12,127 +12,13 @@
1212

1313
import org.junit.jupiter.api.Test;
1414

15-
import com.fasterxml.jackson.databind.ObjectMapper;
16-
import com.github.copilot.sdk.generated.rpc.AccountGetQuotaResult;
17-
import com.github.copilot.sdk.generated.rpc.McpConfigListResult;
18-
import com.github.copilot.sdk.generated.rpc.McpConfigRemoveParams;
19-
import com.github.copilot.sdk.generated.rpc.McpConfigUpdateParams;
20-
import com.github.copilot.sdk.generated.rpc.McpDiscoverParams;
21-
import com.github.copilot.sdk.generated.rpc.McpDiscoverResult;
22-
import com.github.copilot.sdk.generated.rpc.ModelsListResult;
23-
import com.github.copilot.sdk.generated.rpc.PingParams;
24-
import com.github.copilot.sdk.generated.rpc.PingResult;
25-
import com.github.copilot.sdk.generated.rpc.SessionAgentDeselectParams;
26-
import com.github.copilot.sdk.generated.rpc.SessionAgentDeselectResult;
27-
import com.github.copilot.sdk.generated.rpc.SessionAgentGetCurrentParams;
28-
import com.github.copilot.sdk.generated.rpc.SessionAgentGetCurrentResult;
29-
import com.github.copilot.sdk.generated.rpc.SessionAgentListParams;
30-
import com.github.copilot.sdk.generated.rpc.SessionAgentListResult;
31-
import com.github.copilot.sdk.generated.rpc.SessionAgentReloadParams;
32-
import com.github.copilot.sdk.generated.rpc.SessionAgentReloadResult;
33-
import com.github.copilot.sdk.generated.rpc.SessionAgentSelectParams;
34-
import com.github.copilot.sdk.generated.rpc.SessionAgentSelectResult;
35-
import com.github.copilot.sdk.generated.rpc.SessionCommandsHandlePendingCommandParams;
36-
import com.github.copilot.sdk.generated.rpc.SessionCommandsHandlePendingCommandResult;
37-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsDisableParams;
38-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsDisableResult;
39-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsEnableParams;
40-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsEnableResult;
41-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsListParams;
42-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsListResult;
43-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsReloadParams;
44-
import com.github.copilot.sdk.generated.rpc.SessionExtensionsReloadResult;
45-
import com.github.copilot.sdk.generated.rpc.SessionFleetStartParams;
46-
import com.github.copilot.sdk.generated.rpc.SessionFleetStartResult;
47-
import com.github.copilot.sdk.generated.rpc.SessionFsAppendFileParams;
48-
import com.github.copilot.sdk.generated.rpc.SessionFsExistsParams;
49-
import com.github.copilot.sdk.generated.rpc.SessionFsExistsResult;
50-
import com.github.copilot.sdk.generated.rpc.SessionFsMkdirParams;
51-
import com.github.copilot.sdk.generated.rpc.SessionFsReadFileParams;
52-
import com.github.copilot.sdk.generated.rpc.SessionFsReadFileResult;
53-
import com.github.copilot.sdk.generated.rpc.SessionFsReaddirParams;
54-
import com.github.copilot.sdk.generated.rpc.SessionFsReaddirResult;
55-
import com.github.copilot.sdk.generated.rpc.SessionFsReaddirWithTypesParams;
56-
import com.github.copilot.sdk.generated.rpc.SessionFsReaddirWithTypesResult;
57-
import com.github.copilot.sdk.generated.rpc.SessionFsRenameParams;
58-
import com.github.copilot.sdk.generated.rpc.SessionFsRmParams;
59-
import com.github.copilot.sdk.generated.rpc.SessionFsSetProviderParams;
60-
import com.github.copilot.sdk.generated.rpc.SessionFsSetProviderResult;
61-
import com.github.copilot.sdk.generated.rpc.SessionFsStatParams;
62-
import com.github.copilot.sdk.generated.rpc.SessionFsStatResult;
63-
import com.github.copilot.sdk.generated.rpc.SessionFsWriteFileParams;
64-
import com.github.copilot.sdk.generated.rpc.SessionHistoryCompactParams;
65-
import com.github.copilot.sdk.generated.rpc.SessionHistoryCompactResult;
66-
import com.github.copilot.sdk.generated.rpc.SessionHistoryTruncateParams;
67-
import com.github.copilot.sdk.generated.rpc.SessionHistoryTruncateResult;
68-
import com.github.copilot.sdk.generated.rpc.SessionLogParams;
69-
import com.github.copilot.sdk.generated.rpc.SessionLogResult;
70-
import com.github.copilot.sdk.generated.rpc.SessionMcpDisableParams;
71-
import com.github.copilot.sdk.generated.rpc.SessionMcpDisableResult;
72-
import com.github.copilot.sdk.generated.rpc.SessionMcpEnableParams;
73-
import com.github.copilot.sdk.generated.rpc.SessionMcpEnableResult;
74-
import com.github.copilot.sdk.generated.rpc.SessionMcpListParams;
75-
import com.github.copilot.sdk.generated.rpc.SessionMcpListResult;
76-
import com.github.copilot.sdk.generated.rpc.SessionMcpReloadParams;
77-
import com.github.copilot.sdk.generated.rpc.SessionMcpReloadResult;
78-
import com.github.copilot.sdk.generated.rpc.SessionModeGetParams;
79-
import com.github.copilot.sdk.generated.rpc.SessionModeGetResult;
80-
import com.github.copilot.sdk.generated.rpc.SessionModeSetParams;
81-
import com.github.copilot.sdk.generated.rpc.SessionModeSetResult;
82-
import com.github.copilot.sdk.generated.rpc.SessionModelGetCurrentParams;
83-
import com.github.copilot.sdk.generated.rpc.SessionModelGetCurrentResult;
84-
import com.github.copilot.sdk.generated.rpc.SessionModelSwitchToParams;
85-
import com.github.copilot.sdk.generated.rpc.SessionModelSwitchToResult;
86-
import com.github.copilot.sdk.generated.rpc.SessionPermissionsHandlePendingPermissionRequestParams;
87-
import com.github.copilot.sdk.generated.rpc.SessionPermissionsHandlePendingPermissionRequestResult;
88-
import com.github.copilot.sdk.generated.rpc.SessionPlanDeleteParams;
89-
import com.github.copilot.sdk.generated.rpc.SessionPlanDeleteResult;
90-
import com.github.copilot.sdk.generated.rpc.SessionPlanReadParams;
91-
import com.github.copilot.sdk.generated.rpc.SessionPlanReadResult;
92-
import com.github.copilot.sdk.generated.rpc.SessionPlanUpdateParams;
93-
import com.github.copilot.sdk.generated.rpc.SessionPlanUpdateResult;
94-
import com.github.copilot.sdk.generated.rpc.SessionPluginsListParams;
95-
import com.github.copilot.sdk.generated.rpc.SessionPluginsListResult;
96-
import com.github.copilot.sdk.generated.rpc.SessionShellExecParams;
97-
import com.github.copilot.sdk.generated.rpc.SessionShellExecResult;
98-
import com.github.copilot.sdk.generated.rpc.SessionShellKillParams;
99-
import com.github.copilot.sdk.generated.rpc.SessionShellKillResult;
100-
import com.github.copilot.sdk.generated.rpc.SessionSkillsDisableParams;
101-
import com.github.copilot.sdk.generated.rpc.SessionSkillsDisableResult;
102-
import com.github.copilot.sdk.generated.rpc.SessionSkillsEnableParams;
103-
import com.github.copilot.sdk.generated.rpc.SessionSkillsEnableResult;
104-
import com.github.copilot.sdk.generated.rpc.SessionSkillsListParams;
105-
import com.github.copilot.sdk.generated.rpc.SessionSkillsListResult;
106-
import com.github.copilot.sdk.generated.rpc.SessionSkillsReloadParams;
107-
import com.github.copilot.sdk.generated.rpc.SessionSkillsReloadResult;
108-
import com.github.copilot.sdk.generated.rpc.SessionToolsHandlePendingToolCallParams;
109-
import com.github.copilot.sdk.generated.rpc.SessionToolsHandlePendingToolCallResult;
110-
import com.github.copilot.sdk.generated.rpc.SessionUiElicitationParams;
111-
import com.github.copilot.sdk.generated.rpc.SessionUiElicitationResult;
112-
import com.github.copilot.sdk.generated.rpc.SessionUiHandlePendingElicitationParams;
113-
import com.github.copilot.sdk.generated.rpc.SessionUiHandlePendingElicitationResult;
114-
import com.github.copilot.sdk.generated.rpc.SessionUsageGetMetricsParams;
115-
import com.github.copilot.sdk.generated.rpc.SessionUsageGetMetricsResult;
116-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceCreateFileParams;
117-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceCreateFileResult;
118-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceListFilesParams;
119-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceListFilesResult;
120-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceReadFileParams;
121-
import com.github.copilot.sdk.generated.rpc.SessionWorkspaceReadFileResult;
122-
import com.github.copilot.sdk.generated.rpc.SessionsForkParams;
123-
import com.github.copilot.sdk.generated.rpc.SessionsForkResult;
124-
import com.github.copilot.sdk.generated.rpc.ToolsListParams;
125-
import com.github.copilot.sdk.generated.rpc.ToolsListResult;
126-
12715
/**
12816
* Tests for generated RPC param and result record types. Exercises
12917
* constructors, field accessors, and enum variants to provide JaCoCo coverage
13018
* of the generated code without requiring network access.
13119
*/
13220
class GeneratedRpcRecordsCoverageTest {
13321

134-
private static final ObjectMapper MAPPER = JsonRpcClient.getObjectMapper();
135-
13622
// ── Params records ─────────────────────────────────────────────────────
13723

13824
@Test
@@ -338,11 +224,11 @@ void sessionFsStatParams_record() {
338224

339225
@Test
340226
void sessionFsWriteFileParams_record() {
341-
var params = new SessionFsWriteFileParams("sess-21", "/tmp/out.txt", "content here", 0644.0);
227+
var params = new SessionFsWriteFileParams("sess-21", "/tmp/out.txt", "content here", 644.0);
342228
assertEquals("sess-21", params.sessionId());
343229
assertEquals("/tmp/out.txt", params.path());
344230
assertEquals("content here", params.content());
345-
assertEquals(0644.0, params.mode());
231+
assertEquals(644.0, params.mode());
346232
}
347233

348234
@Test

0 commit comments

Comments
 (0)