Skip to content

Commit 9a7cd5e

Browse files
SersemPecaalehander92
SersemPeca
authored and
alehander92
committed
fix: Fix tests
1 parent 1a31234 commit 9a7cd5e

File tree

2 files changed

+43
-28
lines changed

2 files changed

+43
-28
lines changed

‎src/db-backend/tests/dap_backend_server.rs‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use db_backend::dap::{self, DapClient, DapMessage, LaunchRequestArguments};
22
use db_backend::dap_server;
33
use db_backend::dap_types::StackTraceArguments;
4-
use serde_json::json;
4+
use db_backend::transport::DapTransport;
5+
use serde_json::{from_reader, json};
56
use std::io::BufReader;
67

78
#[cfg(target_arch = "x86_64")]
@@ -31,6 +32,7 @@ fn test_backend_dap_server() {
3132

3233
let socket_path = dap_server::socket_path_for(std::process::id() as usize);
3334
let mut child = Command::new(bin).arg("dap-server").arg(&socket_path).spawn().unwrap();
35+
3436
wait_for_socket(&socket_path);
3537

3638
let stream = UnixStream::connect(&socket_path).unwrap();
@@ -39,7 +41,8 @@ fn test_backend_dap_server() {
3941

4042
let mut client = DapClient::default();
4143
let init = client.request("initialize", json!({}));
42-
dap::write_message(&mut writer, &init).unwrap();
44+
// dap::write_message(&mut writer, &init).unwrap();
45+
writer.send(&init);
4346
let launch_args = LaunchRequestArguments {
4447
program: Some("main".to_string()),
4548
trace_folder: Some(trace_dir),
@@ -55,9 +58,10 @@ fn test_backend_dap_server() {
5558
session_id: None,
5659
};
5760
let launch = client.launch(launch_args).unwrap();
58-
dap::write_message(&mut writer, &launch).unwrap();
61+
// dap::write_message(&mut writer, &launch).unwrap();
62+
writer.send(&launch).unwrap();
5963

60-
let msg1 = dap::from_reader(&mut reader).unwrap();
64+
let msg1 = from_reader(&mut reader).unwrap();
6165
match msg1 {
6266
DapMessage::Response(r) => {
6367
assert_eq!(r.command, "initialize");
@@ -71,25 +75,26 @@ fn test_backend_dap_server() {
7175
}
7276
_ => panic!(),
7377
}
74-
let msg2 = dap::from_reader(&mut reader).unwrap();
78+
let msg2 = from_reader(&mut reader).unwrap();
7579
match msg2 {
7680
DapMessage::Event(e) => assert_eq!(e.event, "initialized"),
7781
_ => panic!(),
7882
}
7983
let conf_done = client.request("configurationDone", json!({}));
80-
dap::write_message(&mut writer, &conf_done).unwrap();
81-
let msg3 = dap::from_reader(&mut reader).unwrap();
84+
// dap::write_message(&mut writer, &conf_done).unwrap();
85+
writer.send(&conf_done).unwrap();
86+
let msg3 = from_reader(&mut reader).unwrap();
8287
match msg3 {
8388
DapMessage::Response(r) => assert_eq!(r.command, "launch"),
8489
_ => panic!(),
8590
}
86-
let msg4 = dap::from_reader(&mut reader).unwrap();
91+
let msg4 = from_reader(&mut reader).unwrap();
8792
match msg4 {
8893
DapMessage::Response(r) => assert_eq!(r.command, "configurationDone"),
8994
_ => panic!(),
9095
}
9196

92-
let msg5 = dap::from_reader(&mut reader).unwrap();
97+
let msg5 = from_reader(&mut reader).unwrap();
9398
match msg5 {
9499
DapMessage::Event(e) => {
95100
assert_eq!(e.event, "stopped");
@@ -98,7 +103,7 @@ fn test_backend_dap_server() {
98103
_ => panic!("expected a stopped event, but got {:?}", msg5),
99104
}
100105

101-
let msg_complete_move = dap::from_reader(&mut reader).unwrap();
106+
let msg_complete_move = from_reader(&mut reader).unwrap();
102107
match msg_complete_move {
103108
DapMessage::Event(e) => {
104109
assert_eq!(e.event, "ct/complete-move");
@@ -107,8 +112,9 @@ fn test_backend_dap_server() {
107112
}
108113

109114
let threads_request = client.request("threads", json!({}));
110-
dap::write_message(&mut writer, &threads_request).unwrap();
111-
let msg_threads = dap::from_reader(&mut reader).unwrap();
115+
// dap::write_message(&mut writer, &threads_request).unwrap();
116+
writer.send(&threads_request).unwrap();
117+
let msg_threads = from_reader(&mut reader).unwrap();
112118
match msg_threads {
113119
DapMessage::Response(r) => {
114120
assert_eq!(r.command, "threads");
@@ -130,8 +136,9 @@ fn test_backend_dap_server() {
130136
})
131137
.unwrap(),
132138
);
133-
dap::write_message(&mut writer, &stack_trace_request).unwrap();
134-
let msg_stack_trace = dap::from_reader(&mut reader).unwrap();
139+
// dap::write_message(&mut writer, &stack_trace_request).unwrap();
140+
writer.send(&stack_trace_request).unwrap();
141+
let msg_stack_trace = from_reader(&mut reader).unwrap();
135142
match msg_stack_trace {
136143
DapMessage::Response(r) => assert_eq!(r.command, "stackTrace"), // TODO: test stackFrames / totalFrames ?
137144
_ => panic!(),

‎src/db-backend/tests/dap_backend_stdio.rs‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use db_backend::dap::{self, DapClient, DapMessage, LaunchRequestArguments};
22
use db_backend::dap_types::StackTraceArguments;
3-
use serde_json::json;
3+
use db_backend::transport::DapTransport;
4+
use serde_json::{from_reader, json};
45
use std::io::BufReader;
56
use std::path::PathBuf;
67
use std::process::{Command, Stdio};
@@ -24,7 +25,10 @@ fn test_backend_dap_server_stdio() {
2425

2526
let mut client = DapClient::default();
2627
let init = client.request("initialize", json!({}));
27-
dap::write_message(&mut writer, &init).unwrap();
28+
// dap::write_message(&mut writer, &init).unwrap();
29+
30+
writer.send(&init).unwrap();
31+
2832
let launch_args = LaunchRequestArguments {
2933
program: Some("main".to_string()),
3034
trace_folder: Some(trace_dir),
@@ -40,9 +44,10 @@ fn test_backend_dap_server_stdio() {
4044
session_id: None,
4145
};
4246
let launch = client.launch(launch_args).unwrap();
43-
dap::write_message(&mut writer, &launch).unwrap();
47+
// dap::write_message(&mut writer, &launch).unwrap();
48+
writer.send(&launch).unwrap();
4449

45-
let msg1 = dap::from_reader(&mut reader).unwrap();
50+
let msg1 = from_reader(&mut reader).unwrap();
4651
match msg1 {
4752
DapMessage::Response(r) => {
4853
assert_eq!(r.command, "initialize");
@@ -55,25 +60,26 @@ fn test_backend_dap_server_stdio() {
5560
}
5661
_ => panic!(),
5762
}
58-
let msg2 = dap::from_reader(&mut reader).unwrap();
63+
let msg2 = from_reader(&mut reader).unwrap();
5964
match msg2 {
6065
DapMessage::Event(e) => assert_eq!(e.event, "initialized"),
6166
_ => panic!(),
6267
}
6368
let conf_done = client.request("configurationDone", json!({}));
64-
dap::write_message(&mut writer, &conf_done).unwrap();
65-
let msg3 = dap::from_reader(&mut reader).unwrap();
69+
// dap::write_message(&mut writer, &conf_done).unwrap();
70+
writer.send(&conf_done).unwrap();
71+
let msg3 = from_reader(&mut reader).unwrap();
6672
match msg3 {
6773
DapMessage::Response(r) => assert_eq!(r.command, "launch"),
6874
_ => panic!(),
6975
}
70-
let msg4 = dap::from_reader(&mut reader).unwrap();
76+
let msg4 = from_reader(&mut reader).unwrap();
7177
match msg4 {
7278
DapMessage::Response(r) => assert_eq!(r.command, "configurationDone"),
7379
_ => panic!(),
7480
}
7581

76-
let msg5 = dap::from_reader(&mut reader).unwrap();
82+
let msg5 = from_reader(&mut reader).unwrap();
7783
match msg5 {
7884
DapMessage::Event(e) => {
7985
assert_eq!(e.event, "stopped");
@@ -82,7 +88,7 @@ fn test_backend_dap_server_stdio() {
8288
_ => panic!("expected a stopped event, but got {:?}", msg5),
8389
}
8490

85-
let msg_complete_move = dap::from_reader(&mut reader).unwrap();
91+
let msg_complete_move = from_reader(&mut reader).unwrap();
8692
match msg_complete_move {
8793
DapMessage::Event(e) => {
8894
assert_eq!(e.event, "ct/complete-move");
@@ -91,8 +97,9 @@ fn test_backend_dap_server_stdio() {
9197
}
9298

9399
let threads_request = client.request("threads", json!({}));
94-
dap::write_message(&mut writer, &threads_request).unwrap();
95-
let msg_threads = dap::from_reader(&mut reader).unwrap();
100+
// dap::write_message(&mut writer, &threads_request).unwrap();
101+
writer.send(&threads_request).unwrap();
102+
let msg_threads = from_reader(&mut reader).unwrap();
96103
match msg_threads {
97104
DapMessage::Response(r) => {
98105
assert_eq!(r.command, "threads");
@@ -114,8 +121,9 @@ fn test_backend_dap_server_stdio() {
114121
})
115122
.unwrap(),
116123
);
117-
dap::write_message(&mut writer, &stack_trace_request).unwrap();
118-
let msg_stack_trace = dap::from_reader(&mut reader).unwrap();
124+
// dap::write_message(&mut writer, &stack_trace_request).unwrap();
125+
writer.send(&stack_trace_request).unwrap();
126+
let msg_stack_trace = from_reader(&mut reader).unwrap();
119127
match msg_stack_trace {
120128
DapMessage::Response(r) => assert_eq!(r.command, "stackTrace"), // TODO: test stackFrames / totalFrames ?
121129
_ => panic!(),

0 commit comments

Comments
 (0)