From 25cd70bce1b190d82c6fe5d7a70fb0eed2da1d2a Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 9 Jul 2019 18:36:40 +1000
Subject: [PATCH] fix tests

---
 server/src/instance.rs | 36 +++++++++++++++++++++++++++---------
 server/src/mob.rs      |  5 +----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/server/src/instance.rs b/server/src/instance.rs
index 23787b09..3927a42b 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -17,7 +17,7 @@ use rpc::{InstanceLobbyParams, InstanceJoinParams, InstanceReadyParams, Instance
 use account::Account;
 use player::{Player, player_create};
 use construct::{Construct, construct_get};
-use mob::{bot_player};
+use mob::{bot_player, instance_mobs};
 use game::{Game, Phase, game_get, game_write};
 use item::{Item};
 use rpc::{RpcResult};
@@ -793,13 +793,19 @@ mod tests {
     fn instance_pve_test() {
         let mut instance = Instance::new();
 
-        let player = bot_player();
-        let player_account = player.id;
+        let bot_player = bot_player();
+        let bot = bot_player.id;
+        instance.add_player(bot_player).unwrap();
+
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"test".to_string(), constructs).set_bot(true);
 
         instance.add_player(player).expect("could not add player");
 
         assert_eq!(instance.phase, InstancePhase::Lobby);
         instance.player_ready(player_account).unwrap();
+        instance.player_ready(bot).unwrap();
 
         assert_eq!(instance.phase, InstancePhase::Finished);
         // assert!(instance.players.iter().any(|p| p.wins as usize == instance.max_rounds / 2 + 1));
@@ -808,7 +814,9 @@ mod tests {
     #[test]
     fn instance_bot_vbox_test() {
         let _instance = Instance::new();
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let _player = Player::new(player_account, &"test".to_string(), constructs).set_bot(true);
     }
 
     #[test]
@@ -817,13 +825,17 @@ mod tests {
 
         assert_eq!(instance.max_players, 2);
 
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"a".to_string(), constructs);
         let a_id = player.id;
 
         instance.add_player(player).expect("could not add player");
         assert!(!instance.can_start());
 
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"b".to_string(), constructs);
         let b_id = player.id;
 
         instance.add_player(player).expect("could not add player");
@@ -850,13 +862,17 @@ mod tests {
     fn instance_upkeep_test() {
         let mut instance = Instance::new();
 
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"a".to_string(), constructs);
         let a_id = player.id;
 
         instance.add_player(player).expect("could not add player");
         assert!(!instance.can_start());
 
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"b".to_string(), constructs);
         let b_id = player.id;
         instance.add_player(player).expect("could not add player");
 
@@ -886,7 +902,9 @@ mod tests {
     fn instance_upkeep_idle_lobby_test() {
         let mut instance = Instance::new();
 
-        let player = bot_player();
+        let player_account = Uuid::new_v4();
+        let constructs = instance_mobs(player_account);
+        let player = Player::new(player_account, &"a".to_string(), constructs);
         let _a_id = player.id;
 
         instance.add_player(player).expect("could not add player");
diff --git a/server/src/mob.rs b/server/src/mob.rs
index 9bfc1f50..6bb6aaf1 100644
--- a/server/src/mob.rs
+++ b/server/src/mob.rs
@@ -25,8 +25,5 @@ pub fn instance_mobs(player_id: Uuid) -> Vec<Construct> {
 pub fn bot_player() -> Player {
     let bot_id = Uuid::new_v4();
     let constructs = instance_mobs(bot_id);
-    let mut p = Player::new(bot_id, &name(), constructs).set_bot(true);
-    p.set_ready(true);
-
-    return p;
+    Player::new(bot_id, &name(), constructs).set_bot(true)
 }