From 665a11eb53b082bd0ce71ba0546b1e30f71c520d Mon Sep 17 00:00:00 2001
From: Mike Naberezny <mike@naberezny.com>
Date: Sun, 15 Mar 2009 22:26:47 -0700
Subject: [PATCH] Fixed bugs in monitor "quit" and "~" commands, started
 monitor tests.

---
 src/py65/monitor.py            |   8 +-
 src/py65/tests/test_monitor.py | 139 ++++++++++++++++++++++++++++++++-
 2 files changed, 141 insertions(+), 6 deletions(-)

diff --git a/src/py65/monitor.py b/src/py65/monitor.py
index 75164d1..2b8ce4c 100644
--- a/src/py65/monitor.py
+++ b/src/py65/monitor.py
@@ -126,7 +126,7 @@ class Monitor(cmd.Cmd):
         self._output("To quit, type ^D or use the quit command.")
 
     def do_quit(self, args):
-        return self.do_EOF
+        return self.do_EOF(args)
     
     def help_quit(self):
         return self.help_EOF()
@@ -235,7 +235,7 @@ class Monitor(cmd.Cmd):
         self._output("~ <number>")
         self._output("Display the specified number in decimal, hex, octal, and binary.")
     
-    def do_tilde(self, args):
+    def do_tilde(self, args):   
         try:
             num = self._address_parser.number(args)
         except ValueError:
@@ -269,8 +269,8 @@ class Monitor(cmd.Cmd):
                     if len(register) == 1:
                         intval &= 0xFF
                     setattr(self._mpu, register, intval)
-                except ValueError:
-                    self._output("Syntax error: %s" % value)
+                except KeyError, why:
+                    self._output(why[0])
     
     def help_cd(self, args):
         self._output("cd <directory>")
diff --git a/src/py65/tests/test_monitor.py b/src/py65/tests/test_monitor.py
index d4bf24f..99a2715 100644
--- a/src/py65/tests/test_monitor.py
+++ b/src/py65/tests/test_monitor.py
@@ -2,10 +2,145 @@ import unittest
 import sys
 import re
 from py65.monitor import Monitor
+from StringIO import StringIO
 
 class MonitorTests(unittest.TestCase):
-    pass
-  
+
+    # quit
+
+    def test_do_EOF(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)    
+        exitnow = mon.do_EOF('')
+        self.assertEqual(True, exitnow)
+
+    def test_help_EOF(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_EOF()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("To quit,"))
+
+    def test_do_quit(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)    
+        exitnow = mon.do_quit('')
+        self.assertEqual(True, exitnow)
+
+    def test_help_quit(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_EOF()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("To quit,"))
+   
+    # version
+    
+    def test_do_version(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_version('')
+        out = stdout.getvalue()       
+        self.assertTrue(out.startswith("\nPy65"))
+
+    def test_help_version(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_version()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("version\t"))
+
+    # reset
+    
+    def test_do_reset(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        old_mpu = mon._mpu
+        mon.do_reset('')
+        self.assertNotEqual(old_mpu, mon._mpu)
+
+    def test_help_reset(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_reset()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("reset\t"))        
+
+   # tilde
+   
+    def test_do_tilde(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_tilde('$10')
+        out = stdout.getvalue()  
+        expected = "+16\n$10\n0020\n00010000\n"
+        self.assertEqual(expected, out)
+
+    def test_help_tilde(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_tilde()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("~ <number>"))         
+
+    # registers
+   
+    def test_registers_display_returns_to_prompt(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('')
+        out = stdout.getvalue()
+        self.assertEqual('', out) 
+    
+    def test_registers_syntax_error_bad_format(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('x')
+        out = stdout.getvalue()
+        self.assertEqual("Syntax error: x\n", out)         
+
+    def test_registers_label_error_bad_value(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('x=pony')
+        out = stdout.getvalue()
+        self.assertEqual("Label not found: pony\n", out)         
+
+    def test_registers_invalid_register_error(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('z=3')
+        out = stdout.getvalue()
+        self.assertEqual("Invalid register: z\n", out)         
+
+    def test_registers_updates_single_register(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('x=42')
+        out = stdout.getvalue()
+        self.assertEqual("", out)         
+        self.assertEqual(0x42, mon._mpu.x)
+
+    def test_registers_updates_all_registers(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.do_registers('a=42,x=43,y=44, sp=45, pc=4600')
+        out = stdout.getvalue()
+        self.assertEqual("", out)         
+        self.assertEqual(0x42, mon._mpu.a)
+        self.assertEqual(0x43, mon._mpu.x)
+        self.assertEqual(0x44, mon._mpu.y)
+        self.assertEqual(0x45, mon._mpu.sp)
+        self.assertEqual(0x4600, mon._mpu.pc)
+
+    def test_help_registers(self):
+        stdout = StringIO()
+        mon = Monitor(stdout=stdout)
+        mon.help_registers()
+        out = stdout.getvalue()
+        self.assertTrue(out.startswith("registers[<reg_name>"))         
+       
+
 def test_suite():
     return unittest.findTestCases(sys.modules[__name__])