Merge lp:~brian-murray/mago/gcalc-test-modulus into lp:~mago-contributors/mago/mago-1.0

[Brian Murray]

I added in the modulusdivide button to gcalc and wrote a test for a Debian bug report. I'll be updating the testcases at qa.ubuntu.com shortly.

[Nagappan Alagappan (nagappan)]

Looks okay to commit

review: Approve

=== modified file 'gcalctool/README'
--- gcalctool/README	2010-01-06 19:02:03 +0000
+++ gcalctool/README	2010-11-16 17:46:55 +0000
@@ -44,3 +44,5 @@
   - 10-2=8
   - 14/2=7
   - 5*6=30
+  - 7921 mod 14=11
+    Verify that Debian bug 410763 is still fixed

=== modified file 'gcalctool/gcalctool_calculations.xml'
--- gcalctool/gcalctool_calculations.xml	2010-07-21 09:24:47 +0000
+++ gcalctool/gcalctool_calculations.xml	2010-11-16 17:46:55 +0000
@@ -58,4 +58,13 @@
       <view>BASIC</view>
     </args>
   </case>
+  <case name="7">
+    <method>calculate</method>
+    <description>modulus - debian bug 410763</description>
+    <args>
+      <input>7921m14=</input>
+      <oracle>11</oracle>
+      <view>ADVANCED</view>
+    </args>
+  </case>
 </suite>

=== modified file 'mago/application/gcalc.py'
--- mago/application/gcalc.py	2010-10-20 10:17:11 +0000
+++ mago/application/gcalc.py	2010-11-16 17:46:55 +0000
@@ -59,7 +59,8 @@
                "/" : "btndivide",
                "C" : "btnclear",
                "." : "btnnumeric_point",
-               "s" : "btnsquare_root"}
+               "s" : "btnsquare_root",
+               "m" : "btnmodulusdivide"}
     EDITBAR_ROLE        = "edit bar"
     EDITBAR_INDEX       = 0
     SLEEP_DELAY         = 2