Skip to content

Commit 4efd5df

Browse files
committed
TR updates, first round
1 parent b599198 commit 4efd5df

File tree

11 files changed

+41
-45
lines changed

11 files changed

+41
-45
lines changed

python-unittest/calculations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def multiply(x, y):
1515

1616
def divide(x, y):
1717
if y == 0:
18-
raise ValueError("Cannot divide by zero.")
18+
raise ZeroDivisionError("Cannot divide by zero.")
1919
return x / y
2020

2121

python-unittest/employee.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def __init__(self, name, age, job, salary):
1111
self.salary = salary
1212

1313
def profile(self):
14-
for key, value in self.__dict__.items():
15-
print(f"{key.capitalize()}: {value}")
14+
for attr in self.__slots__:
15+
print(f"{attr.capitalize()}: {getattr(self, attr)}")
1616
print()
1717

1818

@@ -24,9 +24,9 @@ def from_csv_file(file_path):
2424
employees.append(
2525
Employee(
2626
name=row["name"],
27-
age=row["age"],
27+
age=int(row["age"]),
2828
job=row["job"],
29-
salary=row["salary"],
29+
salary=float(row["salary"]),
3030
)
3131
)
3232
return employees

python-unittest/fake_date.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

python-unittest/stack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ def __iter__(self):
1515
return iter(self.items)
1616

1717
def __reversed__(self):
18-
return type(self)(reversed(self.items))
18+
return reversed(self.items)

python-unittest/test_calculations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_multiply(self):
1919
def test_divide(self):
2020
self.assertEqual(divide(10, 5), 2)
2121
self.assertEqual(divide(-1, 1), -1)
22-
with self.assertRaises(ValueError):
22+
with self.assertRaises(ZeroDivisionError):
2323
divide(10, 0)
2424

2525

@@ -83,7 +83,7 @@ def test_mode_multiple(self):
8383
# runner.run(suite)
8484

8585

86-
def load_tests(loader, tests, pattern):
86+
def load_tests(loader, standard_tests, pattern):
8787
suite = unittest.TestSuite()
8888
suite.addTests(loader.loadTestsFromTestCase(TestArithmeticOperations))
8989
suite.addTests(loader.loadTestsFromTestCase(TestStatisticalOperations))

python-unittest/test_collections.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ def test_dictionary_objects(self):
2323
self.assertDictEqual(a, b)
2424

2525
def test_set_objects(self):
26-
a = {1, 2, 3, 4, 5}
27-
b = {1, 2, 3, 4, 5}
26+
a = {1, 2, 4, 3, 5}
27+
b = {1, 5, 3, 4, 2}
2828
self.assertSetEqual(a, b)
2929

3030

python-unittest/test_custom.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33

44
class CustomTestCase(unittest.TestCase):
55
def assertAllIntegers(self, values):
6-
for index, value in enumerate(values):
6+
for value in values:
77
self.assertIsInstance(
88
value,
99
int,
10-
f"Value at index {index} is not an integer: {value}",
1110
)
1211

1312

python-unittest/test_employee.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ def test_from_csv_file_total_employees(self):
3535

3636
def test_from_csv_file_employee_attributes(self):
3737
self.assertEqual(self.employees[0].name, "Alice")
38-
self.assertEqual(self.employees[0].age, "25")
38+
self.assertEqual(self.employees[0].age, 25)
3939
self.assertEqual(self.employees[0].job, "Engineer")
40-
self.assertEqual(self.employees[0].salary, "50000")
40+
self.assertEqual(self.employees[0].salary, 50000.0)
4141

4242
def test_from_csv_file_employee_name(self):
4343
self.assertEqual(self.employees[0].name, "Alice")

python-unittest/test_stack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_reversed(self):
3636
for item in items:
3737
self.stack.push(item)
3838
reversed_stack = reversed(self.stack)
39-
self.assertEqual(reversed_stack.items, [7, 6, 5])
39+
self.assertEqual(list(reversed_stack), [7, 6, 5])
4040

4141

4242
if __name__ == "__main__":

python-unittest/test_weekday.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import datetime
2+
import unittest
3+
from unittest.mock import patch
4+
5+
import weekday
6+
7+
8+
class TestWeekday(unittest.TestCase):
9+
@patch("weekday.datetime")
10+
def test_is_weekday(self, mock_datetime):
11+
mock_datetime.date.today.return_value = datetime.date(2024, 4, 4)
12+
self.assertTrue(weekday.is_weekday())
13+
14+
@patch("weekday.datetime")
15+
def test_is_weekend(self, mock_datetime):
16+
mock_datetime.date.today.return_value = datetime.date(2024, 4, 6)
17+
self.assertFalse(weekday.is_weekday())
18+
19+
20+
if __name__ == "__main__":
21+
unittest.main(verbosity=2)

0 commit comments

Comments
 (0)