Skip to content

Commit 3f9644d

Browse files
committed
test: fix db-backend Handler::new, launch request args for tests, delete generated test
tcp test by mistake committed before: generated with gemini/zed iirc: removing, maybe if we add full tcp support we can add it problem: dap backend server still seems to have an error, at least stdio one works
1 parent b395273 commit 3f9644d

File tree

4 files changed

+13
-191
lines changed

4 files changed

+13
-191
lines changed

src/db-backend/src/handler.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,7 @@ mod tests {
15631563
#[test]
15641564
fn test_struct_handling() {
15651565
let db = setup_db();
1566-
let handler: Handler = Handler::new(Box::new(db));
1566+
let handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
15671567
let value = handler.db.to_ct_value(&ValueRecord::Struct {
15681568
field_values: vec![],
15691569
type_id: TypeId(1),
@@ -1576,7 +1576,7 @@ mod tests {
15761576
let db = setup_db();
15771577

15781578
// Act: Create a new Handler instance
1579-
let handler: Handler = Handler::new(Box::new(db));
1579+
let handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
15801580

15811581
// Assert: Check that the Handler instance is correctly initialized
15821582
assert_eq!(handler.step_id, StepId(0));
@@ -1587,7 +1587,7 @@ mod tests {
15871587
#[test]
15881588
fn test_run_single_tracepoint() -> Result<(), Box<dyn Error>> {
15891589
let db = setup_db();
1590-
let mut handler: Handler = Handler::new(Box::new(db));
1590+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
15911591
handler.event_load(dap::Request::default())?;
15921592
handler.run_tracepoints(dap::Request::default(), make_tracepoints_args(1, 0))?;
15931593
assert_eq!(handler.event_db.single_tables.len(), 2);
@@ -1598,7 +1598,7 @@ mod tests {
15981598
#[test]
15991599
fn test_multiple_tracepoints() -> Result<(), Box<dyn Error>> {
16001600
let db = setup_db();
1601-
let mut handler: Handler = Handler::new(Box::new(db));
1601+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
16021602
handler.event_load(dap::Request::default())?;
16031603
// TODO
16041604
// this way we are resetting them after reforms
@@ -1633,7 +1633,7 @@ mod tests {
16331633
fn test_multile_tracepoints_with_multiline_logs() -> Result<(), Box<dyn Error>> {
16341634
let size: usize = 10000;
16351635
let db: Db = setup_db();
1636-
let mut handler: Handler = Handler::new(Box::new(db));
1636+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
16371637
handler.event_load(dap::Request::default())?;
16381638
handler.run_tracepoints(
16391639
dap::Request::default(),
@@ -1660,7 +1660,7 @@ mod tests {
16601660
fn test_tracepoint_in_loop() -> Result<(), Box<dyn Error>> {
16611661
let size = 10000;
16621662
let db: Db = setup_db_loop(size);
1663-
let mut handler: Handler = Handler::new(Box::new(db));
1663+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
16641664
handler.event_load(dap::Request::default())?;
16651665
handler.run_tracepoints(dap::Request::default(), make_tracepoints_args(2, 0))?;
16661666
assert_eq!(handler.event_db.single_tables[1].events.len(), size);
@@ -1674,7 +1674,7 @@ mod tests {
16741674
// Number of tracepoints and steps
16751675
let count: usize = 10000;
16761676
let db: Db = setup_db_with_step_count(count);
1677-
let mut handler: Handler = Handler::new(Box::new(db));
1677+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
16781678
handler.event_load(dap::Request::default())?;
16791679
handler.run_tracepoints(dap::Request::default(), make_tracepoints_with_count(count))?;
16801680

@@ -1687,7 +1687,7 @@ mod tests {
16871687
let db = setup_db();
16881688

16891689
// Act: Create a new Handler instance
1690-
let mut handler: Handler = Handler::new(Box::new(db));
1690+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
16911691
let request = dap::Request::default();
16921692
handler.step(request, make_step_in())?;
16931693
assert_eq!(handler.step_id, StepId(1_i64));
@@ -1697,7 +1697,7 @@ mod tests {
16971697
#[test]
16981698
fn test_source_jumps() -> Result<(), Box<dyn Error>> {
16991699
let db = setup_db();
1700-
let mut handler: Handler = Handler::new(Box::new(db));
1700+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
17011701
let path = "/test/workdir";
17021702
let source_location: SourceLocation = SourceLocation {
17031703
path: path.to_string(),
@@ -1728,7 +1728,7 @@ mod tests {
17281728
#[test]
17291729
fn test_local_calltrace() -> Result<(), Box<dyn Error>> {
17301730
let db = setup_db_with_calls();
1731-
let mut handler: Handler = Handler::new(Box::new(db));
1731+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
17321732

17331733
let calltrace_load_args = CalltraceLoadArgs {
17341734
location: handler
@@ -1770,7 +1770,7 @@ mod tests {
17701770
let path = &PathBuf::from(raw_path);
17711771
// (&PathBuf::from("/home/alexander92/codetracer-desktop/src/db-backend/example-trace/")
17721772
let db = load_db_for_trace(path);
1773-
let mut handler: Handler = Handler::new(Box::new(db));
1773+
let mut handler: Handler = Handler::new(TraceKind::DB, CtRRArgs::default(), Box::new(db));
17741774

17751775
// step-in from 1 to end(maybe also a parameter?)
17761776
// on each step check validity, load locals, load callstack

src/db-backend/tests/dap_backend_server.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ fn test_backend_dap_server() {
8989
request: None,
9090
typ: None,
9191
session_id: None,
92+
ct_rr_worker_exe: None,
9293
};
9394

9495
let launch = client.launch(launch_args).expect("failed to build launch request");

src/db-backend/tests/dap_backend_stdio.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fn test_backend_dap_server_stdio() {
4444
request: None,
4545
typ: None,
4646
session_id: None,
47+
ct_rr_worker_exe: None,
4748
};
4849
let launch = client.launch(launch_args).unwrap();
4950
// dap::write_message(&mut writer, &launch).unwrap();

src/db-backend/tests/dap_backend_tcp.rs

Lines changed: 0 additions & 180 deletions
This file was deleted.

0 commit comments

Comments
 (0)