added reader tests

rezasm-app/rezasm-tauri/src/tauri_reader.rs

@@ -14,11 +14,6 @@ impl TauriReader {
             buffer: VecDeque::new(),
         }
     }
-
-    pub fn expand_buffer(&mut self, new_input: &str) {
-        self.write(new_input.as_bytes()).unwrap();
-        self.buffer.push_back(b'\n');
-    }
 }
 
 impl Reader for TauriReader {}

tests/common/mod.rs

@@ -1 +1,2 @@
 pub mod writer;
+pub mod reader;

tests/common/reader.rs

@@ -0,0 +1,46 @@
+use std::io::{Read, Write};
+use std::collections::VecDeque;
+
+use rezasm_core::simulation::reader::Reader;
+use rezasm_core::util::as_any::AsAny;
+
+#[derive(Debug)]
+pub struct TestReader {
+    buffer: VecDeque<u8>,
+}
+
+impl TestReader {
+    pub fn new() -> TestReader {
+        TestReader {
+            buffer: VecDeque::new()
+        }
+    }
+}
+
+impl Reader for TestReader {}
+
+impl Read for TestReader {
+    fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
+        self.buffer.read(buf)
+    }
+}
+
+impl Write for TestReader {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.buffer.write(buf)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        self.buffer.flush()
+    }
+}
+
+impl AsAny for TestReader {
+    fn as_any(&self) -> &dyn std::any::Any {
+        self
+    }
+
+    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
+        self
+    }
+}

tests/core.rs

@@ -1,6 +1,7 @@
 mod common;
 
 use crate::common::writer::TestWriter;
+use common::reader::TestReader;
 use rezasm_core::instructions::implementation::arithmetic_instructions::ADD;
 use rezasm_core::instructions::implementation::register_instructions;
 use rezasm_core::parser::lexer::{
@@ -13,6 +14,7 @@ use rezasm_core::simulation::reader_cell::ReaderCell;
 use rezasm_core::simulation::registry::Registry;
 use rezasm_core::simulation::registry::{self, get_register_number};
 use rezasm_core::simulation::simulator::Simulator;
+use rezasm_core::simulation::writer::DummyWriter;
 use rezasm_core::util::error::ParserError;
 use rezasm_core::util::io::RezasmFileReader;
 use rezasm_core::util::raw_data::RawData;
@@ -174,6 +176,43 @@ pub fn test_print_instructions() {
     assert_eq!(output.as_str(), "3\n1.5\nPrint Instructions Work!\n");
 }
 
+#[test]
+pub fn test_read_instructions() { // Test assumes all other instructions work properly
+    register_instructions();
+    let buffer = "10\n10.5\na\nHello"; //doesn't cover everything, should be close enough
+    let program = "
+        readi $t0
+        readf $t1
+        alloc $s0 $t0
+        readc $t2
+        reads $s0
+        printi $t0
+        printc '\\n'
+        printf $t1
+        printc '\\n'
+        printc $t2
+        printc '\\n'
+        prints $s0".to_string();
+
+    let mut reader = ReaderCell::new(TestReader::new());
+    let _ = reader.write(buffer.as_bytes()).unwrap();
+    let writer = Box::new(TestWriter::new());
+    let mut simulator: Simulator = Simulator::new_custom_reader_writer(reader, writer);
+    let lines = parse_lines(&program, simulator.get_word_size()).unwrap();
+    simulator.add_lines(lines, "".to_string()).unwrap();
+    while !simulator.is_done() {
+        simulator.run_line_from_pc().unwrap();
+    }
+    let writer = simulator.get_writer();
+    let output = writer
+        .deref()
+        .as_any()
+        .downcast_ref::<TestWriter>()
+        .unwrap()
+        .get_data();
+    assert_eq!(output.as_str(), "10\n10.5\na\nHello");
+}
+
 #[test]
 pub fn test_simulator_labels() {
     register_instructions();