Skip to content

Commit d38c084

Browse files
committed
improved end-to-end integration tests, cleanup unused js package
1 parent 0f1ebfd commit d38c084

4 files changed

Lines changed: 35 additions & 34 deletions

File tree

demo/frontend/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"@mantine/core": "^7.1.5",
1616
"@mantine/form": "^7.1.5",
1717
"@mantine/hooks": "^7.1.5",
18-
"@mantine/vanilla-extract": "^7.1.5",
1918
"@orbitinghail/sqlsync-react": "workspace:*",
2019
"@orbitinghail/sqlsync-worker": "workspace:*",
2120
"@tabler/icons-react": "^2.39.0",

lib/sqlsync/examples/end-to-end-local-net.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -305,21 +305,23 @@ fn start_client(
305305
}
306306

307307
fn main() -> anyhow::Result<()> {
308-
// seed a random number generater from the command line
309-
// or use a random seed
310-
let mut rng = std::env::args()
311-
.nth(1)
312-
.map(|seed| {
313-
let seed = seed.parse::<u64>().unwrap();
314-
StdRng::seed_from_u64(seed)
315-
})
316-
.unwrap_or_else(|| StdRng::from_entropy());
317-
318308
simple_logger::SimpleLogger::new()
319309
.with_level(log::LevelFilter::Debug)
310+
.without_timestamps()
320311
.env()
321312
.init()?;
322313

314+
// seed a random number generater from the command line
315+
// or use a random seed
316+
let rng_seed: u64 = std::env::args()
317+
.nth(1)
318+
.map(|seed| seed.parse().unwrap())
319+
.unwrap_or_else(|| rand::thread_rng().gen());
320+
321+
log::info!("using rng seed: {}", rng_seed);
322+
323+
let mut rng = StdRng::seed_from_u64(rng_seed);
324+
323325
let addr = "127.0.0.1:8080";
324326
let listener = TcpListener::bind(addr)?;
325327
let doc_id = JournalId::new256(&mut rng);

lib/sqlsync/examples/end-to-end-local.rs

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
///
55
use std::{collections::BTreeMap, format, io};
66

7-
use rand::{rngs::StdRng, SeedableRng};
7+
use rand::{rngs::StdRng, Rng, SeedableRng};
88
use serde::{Deserialize, Serialize};
99
use sqlsync::{
1010
coordinator::CoordinatorDocument,
@@ -14,7 +14,7 @@ use sqlsync::{
1414
JournalId, MemoryJournal, MemoryJournalFactory, Reducer,
1515
};
1616

17-
#[derive(Debug)]
17+
#[derive(Debug, PartialEq)]
1818
#[allow(dead_code)]
1919
struct Task {
2020
id: i64,
@@ -71,22 +71,23 @@ enum Mutation {
7171
}
7272

7373
fn main() -> anyhow::Result<()> {
74-
// seed a random number generater from the command line
75-
// or use a random seed
76-
let mut rng = std::env::args()
77-
.nth(1)
78-
.map(|seed| {
79-
let seed = seed.parse::<u64>().unwrap();
80-
StdRng::seed_from_u64(seed)
81-
})
82-
.unwrap_or_else(|| StdRng::from_entropy());
83-
8474
simple_logger::SimpleLogger::new()
8575
.with_level(log::LevelFilter::Debug)
8676
.without_timestamps()
8777
.env()
8878
.init()?;
8979

80+
// seed a random number generater from the command line
81+
// or use a random seed
82+
let rng_seed: u64 = std::env::args()
83+
.nth(1)
84+
.map(|seed| seed.parse().unwrap())
85+
.unwrap_or_else(|| rand::thread_rng().gen());
86+
87+
log::info!("using rng seed: {}", rng_seed);
88+
89+
let mut rng = StdRng::seed_from_u64(rng_seed);
90+
9091
let doc_id = JournalId::new128(&mut rng);
9192
// build task_reducer.wasm using: `cargo build --target wasm32-unknown-unknown --example task-reducer`
9293
let wasm_bytes =
@@ -333,6 +334,16 @@ fn main() -> anyhow::Result<()> {
333334
print_tasks!(local)?;
334335
print_tasks!(local2)?;
335336

337+
// get both sets of tasks and make sure they are the same
338+
let tasks1 = local.query(|conn| query_tasks(conn))?;
339+
let tasks2 = local2.query(|conn| query_tasks(conn))?;
340+
341+
// compare the two Vec<Task> objects
342+
assert_eq!(tasks1.len(), tasks2.len(), "different number of tasks",);
343+
for (i, task) in tasks1.iter().enumerate() {
344+
assert_eq!(task, &tasks2[i], "tasks differ at index {}", i);
345+
}
346+
336347
log::info!("DONE");
337348

338349
Ok(())

pnpm-lock.yaml

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)