Moved on_query test to lib testing.

src/document/create.rs

@@ -913,6 +913,7 @@ mod document_files {
         }
     }
 
+    /*
     #[test]
     fn query_sends_on_query_message() {
         let count = 5;
@@ -957,6 +958,7 @@ mod document_files {
             _ => unreachable!("should never get here"),
         }
     }
+    */
 
     #[test]
     fn send_on_addition_message() {

src/lib.rs

@@ -13,7 +13,7 @@ use queue::{
     router::Queue,
 };
 use std::{
-    sync::mpsc::{channel, Receiver, Sender},
+    sync::mpsc::{channel, Receiver, RecvTimeoutError, Sender},
     time::Duration,
 };
 use uuid::Uuid;
@@ -198,6 +198,7 @@ impl MoreThanText {
 pub struct TestMoreThanText {
     mtt: MoreThanText,
     queue: Queue,
+    channel: Option<Receiver<Message>>,
 }
 
 impl TestMoreThanText {
@@ -207,22 +208,12 @@ impl TestMoreThanText {
         Self {
             mtt: mtt,
             queue: queue,
+            channel: None,
         }
     }
 
-    pub fn validate_session(&mut self, session: Option<String>) -> Uuid {
-        self.mtt.validate_session(session)
-    }
-
-    pub fn records<UA>(&mut self, request: UA) -> Result<Records, MTTError>
-    where
-        UA: Into<UserAction>,
-    {
-        self.mtt.records(request)
-    }
-
-    pub fn create_document(&mut self, docdef: DocDef) -> Result<(), MTTError> {
-        self.mtt.create_document(docdef)
+    pub fn get_morethantext(&self) -> MoreThanText {
+        self.mtt.clone()
     }
 
     pub fn send_time_pulse(&self) {
@@ -230,7 +221,7 @@ impl TestMoreThanText {
         self.queue.send(msg);
     }
 
-    pub fn register_channel(&self, paths: Vec<Path>) -> Receiver<Message> {
+    pub fn register_channel(&mut self, paths: Vec<Path>) {
         let mut queue = self.mtt.queue.clone();
         let (tx, rx) = channel();
         let sender_id = queue.add_sender(tx);
@@ -239,6 +230,29 @@ impl TestMoreThanText {
             queue.send(Message::new(reg_msg));
             rx.recv().unwrap(); // Wait for completion.
         }
-        rx
+        self.channel = Some(rx);
+    }
+
+    pub fn recv(&self) -> Result<Message, RecvTimeoutError> {
+        match &self.channel {
+            Some(rx) => rx.recv_timeout(Duration::from_millis(500)),
+            None => panic!("test environment does not have a channel setup"),
+        }
+    }
+
+    pub fn get_trigger_records(&self, action: Action) -> Records {
+        let msg = self.recv().unwrap();
+        let msg_action = msg.get_action();
+        if action == msg_action.clone().into() {
+            match msg_action {
+                MsgAction::OnAddition(data) => data.clone(),
+                MsgAction::OnDelete(data) => data.clone(),
+                MsgAction::OnQuery(data) => data.clone(),
+                MsgAction::OnUpdate(data) => data.clone(),
+                _ => panic!("{:?} is not a trigger", action),
+            }
+        } else {
+            panic!("received {:?} instead of {:?} trigger", msg, action);
+        }
     }
 }