diff --git a/calc_mul.py b/calc_mul.py
index b55a367..27a1516 100755
--- a/calc_mul.py
+++ b/calc_mul.py
@@ -3,19 +3,23 @@
 import re
                 
 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:
-                        valid=True
+        if type(A) is str or type(B) is str:
+                valid = False
+        else:
+                ai=str(A)
+                bi=str(B)
+
+                p = re.compile('^\d+$')
+                if p.match(ai) and p.match(bi):
+                        a=int(ai)
+                        b=int(bi)
+                        if 0<a and a<1000 and 0<b and b<1000:
+                                valid=True
+                        else:
+                                valid=False
                 else:
                         valid=False
-        else:
-                valid=False
-                
+                        
         if valid:
                 ans=a*b
                 return ans
diff --git a/test_cases.py b/test_cases.py
index 6f08065..8b57f50 100644
--- a/test_cases.py
+++ b/test_cases.py
@@ -7,15 +7,43 @@
 
 class TestCalc (unittest.TestCase):
 
+        # 有効範囲内でのテスト
         def test_sample1 (self):
-                self.assertEqual (21, calc(3,7))
+                self.assertEqual (1, calc(1, 1))
 
         def test_sample2 (self):
-                self.assertEqual (-1, calc(0,150))
+                self.assertEqual (998001, calc(999, 999))
 
         def test_sample3 (self):
-                self.assertEqual (-1, calc('a','b'))
+                self.assertEqual (999, calc(1, 999))
 
         def test_sample4 (self):
-                self.assertEqual (-1, calc(0.1,999))
+                self.assertEqual (999, calc(999, 1))
 
+        # 無効な値である０が渡された場合
+        def test_sample5 (self):
+                self.assertEqual (-1, calc(0, 500))
+
+        def test_sample6 (self):
+                self.assertEqual (-1, calc(500, 0))
+
+        # 無効な値である1000が入力された場合
+        def test_sample7 (self):
+                self.assertEqual (-1, calc(1000, 500))
+
+        def test_sample8 (self):
+                self.assertEqual (-1, calc(500, 1000))
+
+        # 無効な入力として文字列が与えられた場合
+        def test_sample9 (self):
+                self.assertEqual (-1, calc("100", 500))
+        
+        def test_sample10 (self):
+                self.assertEqual (-1, calc(500, "100"))
+
+        # 無効な値として小数が与えられた場合
+        def test_sample11 (self):
+                self.assertEqual (-1, calc(1.1, 500))
+
+        def test_sample12 (self):
+                self.assertEqual (-1, calc(500, 1.1))
\ No newline at end of file