test_case.pyおよびcalc_mul.pyの修正

calc_mul.py

@@ -5,11 +5,11 @@
 def calc(A,B):
         ai=str(A)
         bi=str(B)
-        p = re.compile('\d+(\.\d+)?')
-        if p.match(ai) or p.match(bi):
-                a=float(ai)
-                b=float(bi)
-                if 0<a and a<b and b<1000:
+        p = re.compile('\d+$')
+        if p.match(ai) and p.match(bi):
+                a=int(ai)
+                b=int(bi)
+                if 1<=a<=999 and 1<=b<=999:
                         valid=True
                 else:
                         valid=False

test_cases.py

@@ -17,5 +17,34 @@ def test_sample3 (self):
                 self.assertEqual (-1, calc('a','b'))
 
         def test_sample4 (self):
-                self.assertEqual (-1, calc(0.1,999))
+                self.assertEqual (-1, calc(0.5,999))
 
+        def test_sample5 (self):
+                self.assertEqual (1, calc(1,1))
+
+        def test_sample6 (self):
+                self.assertEqual (998001, calc(999,999))
+
+        def test_sample7 (self):
+                self.assertEqual (-1, calc(0,0))
+
+        def test_sample8 (self):
+                self.assertEqual (-1, calc(1000,1000))
+
+        def test_sample9 (self):
+                self.assertEqual (-1, calc(-1,999))
+
+        def test_sample10 (self):
+                self.assertEqual (-1, calc(5,2000))
+
+        def test_sample11 (self):
+                self.assertEqual (-1, calc('B','998'))
+
+        def test_sample12 (self):
+                self.assertEqual (-1, calc(0.123,500))
+
+        def test_sample13 (self):
+                self.assertEqual (-1, calc(1,None))
+
+        def test_sample14 (self):
+                self.assertEqual (-1, calc(20,'a1'))