From 8971426dcd41e9f619f782cfea7c95525ca939d7 Mon Sep 17 00:00:00 2001
From: bel <squeaky2x3@blapointe.com>
Date: Sat, 2 May 2020 15:09:20 -0600
Subject: [PATCH] test gamemaster init

---
 .../src/controller/gamemaster/gamemaster.rs   | 37 +++++++++++++++----
 .../src/controller/gamemaster/mod.rs          |  2 +-
 secert-hitler/src/controller/mod.rs           |  2 +-
 secert-hitler/src/model/mod.rs                |  2 +-
 secert-hitler/src/model/state/mod.rs          | 10 ++---
 secert-hitler/src/model/state/rooms.rs        |  5 ++-
 6 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/secert-hitler/src/controller/gamemaster/gamemaster.rs b/secert-hitler/src/controller/gamemaster/gamemaster.rs
index d3ad63e..710892a 100644
--- a/secert-hitler/src/controller/gamemaster/gamemaster.rs
+++ b/secert-hitler/src/controller/gamemaster/gamemaster.rs
@@ -1,12 +1,13 @@
-#[derive(Debug)]
+use super::super::super::model::state::room::Room;
+
 pub struct GameMaster {
-   room_id: String,
+   room: Box<dyn Room>,
 }
 
 impl GameMaster {
-   fn new() -> GameMaster {
+   fn new(room: Box<dyn Room>) -> GameMaster {
       GameMaster{
-         room_id: "hello".to_string(),
+         room: room,
       }
    }
 }
@@ -14,10 +15,32 @@ impl GameMaster {
 #[cfg(test)]
 mod tests {
    use super::*;
+   use super::super::super::super::model::state::mockroom::MockRoom;
+   use super::super::super::super::model::state::mockrooms::MockRooms;
+   use super::super::super::super::model::state::rooms::Rooms;
 
    #[test]
-   fn new() {
-      let gm = GameMaster::new();
-      println!("made: {:?}", gm);
+   fn new_mockroom() {
+      let _ = GameMaster::new(Box::new(MockRoom::create()));
+      println!("made");
+   }
+
+   #[test]
+   fn new_rooms_mockrooms() {
+      fn get() -> impl Rooms {
+         let mrs = MockRooms::new();
+         mrs
+      }
+      let mut mrs = get();
+      let r = mrs.create();
+      let _ = GameMaster::new(r);
+   }
+
+
+   #[test]
+   fn new_mockrooms() {
+      let mut mrs = MockRooms::new();
+      let r = mrs.create();
+      let _ = GameMaster::new(r);
    }
 }
diff --git a/secert-hitler/src/controller/gamemaster/mod.rs b/secert-hitler/src/controller/gamemaster/mod.rs
index 955c71b..2d0280a 100644
--- a/secert-hitler/src/controller/gamemaster/mod.rs
+++ b/secert-hitler/src/controller/gamemaster/mod.rs
@@ -1 +1 @@
-mod gamemaster;
+pub mod gamemaster;
diff --git a/secert-hitler/src/controller/mod.rs b/secert-hitler/src/controller/mod.rs
index 955c71b..2d0280a 100644
--- a/secert-hitler/src/controller/mod.rs
+++ b/secert-hitler/src/controller/mod.rs
@@ -1 +1 @@
-mod gamemaster;
+pub mod gamemaster;
diff --git a/secert-hitler/src/model/mod.rs b/secert-hitler/src/model/mod.rs
index ceecf47..266c62a 100644
--- a/secert-hitler/src/model/mod.rs
+++ b/secert-hitler/src/model/mod.rs
@@ -1 +1 @@
-mod state;
+pub mod state;
diff --git a/secert-hitler/src/model/state/mod.rs b/secert-hitler/src/model/state/mod.rs
index 0ba16bf..ed4f153 100644
--- a/secert-hitler/src/model/state/mod.rs
+++ b/secert-hitler/src/model/state/mod.rs
@@ -1,5 +1,5 @@
-mod event;
-mod room;
-mod rooms;
-mod mockroom;
-mod mockrooms;
+pub mod event;
+pub mod room;
+pub mod rooms;
+pub mod mockroom;
+pub mod mockrooms;
diff --git a/secert-hitler/src/model/state/rooms.rs b/secert-hitler/src/model/state/rooms.rs
index 77a89ba..d5945dd 100644
--- a/secert-hitler/src/model/state/rooms.rs
+++ b/secert-hitler/src/model/state/rooms.rs
@@ -8,6 +8,7 @@ pub trait Rooms {
 #[cfg(test)]
 mod tests {
    use super::Rooms;
+   use super::Room;
    use super::super::mockrooms::MockRooms;
 
    #[test]
@@ -16,6 +17,8 @@ mod tests {
          let r = MockRooms::new();
          r
       }
-      gen();
+      let mut rooms = gen();
+      let mut room_ptr: Box<dyn Room> = rooms.create();
+      assert!(room_ptr.send("hi".to_string()).is_ok());
    }
 }