Skip to content

modify for report02 #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

modify for report02 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44683aa
modify test_cases
Feb 11, 2025
5ee1568
modify calc_mul.py
Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions calc_mul.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
p = re.compile('\d+')
if p.fullmatch(ai) and p.fullmatch(bi):
a=float(ai)
b=float(bi)
if 0<a and a<b and b<1000:
if 0<a<1000 and 0<b<1000:
valid=True
else:
valid=False
Expand Down
78 changes: 73 additions & 5 deletions test_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,84 @@
# Run with testrunner so needs to be in file test_

class TestCalc (unittest.TestCase):

def test_sample1 (self):
self.assertEqual (21, calc(3,7))
self.assertEqual (-1, calc(0.9,0.9))

def test_sample2 (self):
self.assertEqual (-1, calc(0,150))
self.assertEqual (-1, calc(0.9,10))

def test_sample3 (self):
self.assertEqual (-1, calc('a','b'))
self.assertEqual (-1, calc(10,0.9))

def test_sample4 (self):
self.assertEqual (-1, calc(0.1,999))
self.assertEqual (-1, calc(0,0))

def test_sample5 (self):
self.assertEqual (-1, calc(0,10))

def test_sample6 (self):
self.assertEqual (-1, calc(10,0))

def test_sample7 (self):
self.assertEqual (1, calc(1,1))

def test_sample8 (self):
self.assertEqual (10, calc(1,10))

def test_sample9 (self):
self.assertEqual (10, calc(10,1))

def test_sample10 (self):
self.assertEqual (-1, calc(1.1,10))

def test_sample11 (self):
self.assertEqual (-1, calc(10,1.1))

def test_sample12 (self):
self.assertEqual (-1, calc(1.1,1.1))

def test_sample13 (self):
self.assertEqual (9990, calc(999,10))

def test_sample14 (self):
self.assertEqual (9990, calc(10,999))

def test_sample15 (self):
self.assertEqual (998001, calc(999,999))

def test_sample16 (self):
self.assertEqual (-1, calc(998.9,998.9))

def test_sample17 (self):
self.assertEqual (-1, calc(998.9,10))

def test_sample18 (self):
self.assertEqual (-1, calc(10,998.9))

def test_sample19 (self):
self.assertEqual (-1, calc(1000,10))

def test_sample20 (self):
self.assertEqual (-1, calc(10,1000))

def test_sample21 (self):
self.assertEqual (-1, calc(1000,1000))

def test_sample22 (self):
self.assertEqual (-1, calc(999.9,10))

def test_sample23 (self):
self.assertEqual (-1, calc(10,999.9))

def test_sample24 (self):
self.assertEqual (-1, calc(999.9,999.9))

def test_sample25 (self):
self.assertEqual (-1, calc('A',10))

def test_sample26 (self):
self.assertEqual (-1, calc(10,'B'))

def test_sample27 (self):
self.assertEqual (-1, calc('A','B'))

Loading