From 879276a057d4805014fef0218a4cbafdd2349b64 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 7 Jan 2023 16:33:46 -0500 Subject: Insert boards in the db using correct keys --- server/tests/table_test.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'server/tests/table_test.rs') diff --git a/server/tests/table_test.rs b/server/tests/table_test.rs index 1db7aa8..a131768 100644 --- a/server/tests/table_test.rs +++ b/server/tests/table_test.rs @@ -1,5 +1,5 @@ use protocol::bridge_engine::TableState; -use rand::{thread_rng, Rng}; +use rand::{thread_rng, Rng, random}; use server::{ error::BridgeError, table::{DbTable, InMemoryTable, Table}, @@ -13,13 +13,13 @@ where T: Table + Send, { assert!(matches!(table.state(), TableState::Unknown)); - table = table.new_deal().await?; + table = table.set_board(0, random()).await?; assert!(matches!(table.state(), TableState::Game(_))); while matches!(table.state(), TableState::Game(_)) { table = server::table::advance_play(table).await?; } assert!(matches!(table.state(), TableState::Result(_))); - table = table.new_deal().await?; + table = table.set_board(1, random()).await?; assert!(matches!(table.state(), TableState::Game(_))); Ok(()) @@ -29,10 +29,11 @@ async fn advance_table(table: Box) -> Result, BridgeError> where T: Table + Send, { + let board_number = table.board_number() + 1; match table.state() { TableState::Unknown => panic!("unexpected state"), TableState::Game(_) => server::table::advance_play(table).await, - TableState::Result(_) => table.new_deal().await, + TableState::Result(_) => table.set_board(board_number, random()).await, } } @@ -83,8 +84,8 @@ async fn db_table_persistence() -> Result<(), anyhow::Error> { DbTable::new(db.db().clone(), Uuid::new_v4(), InMemoryTable::new()) .await?, ); - table = table.new_deal().await?; - for i in 0..(thread_rng().gen_range(0..200)) { + table = table.set_board(1, random()).await?; + for _i in 0..(thread_rng().gen_range(0..200)) { table = advance_table(table).await?; } Ok(()) -- cgit v1.2.3