Skip to content

Commit 31eee6e

Browse files
wraithkingFitaUser
authored andcommitted
Update calculator.py
2 parents 0619f4f + 5f9b5c9 commit 31eee6e

File tree

6 files changed

+173
-46
lines changed

6 files changed

+173
-46
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: SSL testing for client connection
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
unit-tests:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: ["3.8", "3.9"]
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Set up Python ${{ matrix.python-version }}
15+
uses: actions/setup-python@v3
16+
with:
17+
python-version: ${{ matrix.python-version }}
18+
- name: Run unit test
19+
run: |
20+
python unit_test_1.py
21+
pylint:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v3
25+
- name: Set up Python ${{ matrix.python-version }}
26+
uses: actions/setup-python@v3
27+
- name: Install dependencies
28+
run: |
29+
python -m pip install --upgrade pip
30+
pip install pylint
31+
- name: Analysing the code with pylint
32+
run: |
33+
pylint $(git ls-files 'Calculator.py')

.github/workflows/pylint.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Unit test and Pylint
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
unit-tests:
8+
runs-on: ubuntu-latest
9+
strategy:
10+
matrix:
11+
python-version: ["3.8", "3.9"]
12+
steps:
13+
- uses: actions/checkout@v3
14+
- name: Set up Python ${{ matrix.python-version }}
15+
uses: actions/setup-python@v3
16+
with:
17+
python-version: ${{ matrix.python-version }}
18+
- name: Run unit test
19+
run: |
20+
python unit_test_1.py
21+
pylint:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v3
25+
- name: Set up Python ${{ matrix.python-version }}
26+
uses: actions/setup-python@v3
27+
- name: Install dependencies
28+
run: |
29+
python -m pip install --upgrade pip
30+
pip install pylint
31+
- name: Analysing the code with pylint
32+
run: |
33+
pylint $(git ls-files 'Calculator.py')

Calculator.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This function adds two numbers.
2+
def add(x, y):
3+
"""
4+
Sum function
5+
"""
6+
return x + y
7+
8+
9+
# This function subtracts two numbers
10+
def subtract(x, y):
11+
"""
12+
Sum function
13+
"""
14+
return x - y
15+
16+
# This function multiplies two numbers
17+
18+
def multiply(x, y):
19+
"""
20+
Sum function
21+
"""
22+
return x * y
23+
24+
# This function divides two numbers
25+
def divide(x, y):
26+
"""
27+
Sum function
28+
"""
29+
return x / y
30+
VARIABLE_1 = 10
31+
32+
VARIABLE_2 = 100000000
33+
34+
print(VARIABLE_1, "+", VARIABLE_2, "=", add(VARIABLE_1, VARIABLE_2))
35+
print(VARIABLE_1, "-", VARIABLE_2, "=", subtract(VARIABLE_1, VARIABLE_2))
36+
print(VARIABLE_1, "*", VARIABLE_2, "=", multiply(VARIABLE_1, VARIABLE_2))
37+
print(VARIABLE_1, "/", VARIABLE_2, "=", divide(VARIABLE_1, VARIABLE_2))

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
# calculator best one
22
Šis repozitorjis satur sevi labako kalkulatoru ever
3+
4+
5+
# unit testi
6+
7+
1) test 1
8+
2) test 2

calculator.py

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
1-
def add(number1, number2):
2-
return number1 + number2
3-
4-
def multiplication(number1, number2):
5-
return number1 * number2
6-
7-
def division(number1, number2):
8-
return number1 / number2
9-
10-
def subtract(number1, number2):
11-
return number1 - number2
12-
13-
14-
print("Select operation.")
15-
print("1. Add")
16-
print("2. Multiply")
17-
print("3. Divide")
18-
print("4. Subtract")
19-
20-
while True:
21-
# take input from the user
22-
choice = input("Enter choice(1/2/3/4): ")
23-
24-
if choice in ('1', '2', '3', '4'):
25-
num1 = float(input("Enter first number: "))
26-
num2 = float(input("Enter second number: "))
27-
28-
if choice == '1':
29-
print(num1, "+", num2, "=", add(num1, num2))
30-
31-
elif choice == '2':
32-
print(num1, "*", num2, "=", multiplication(num1, num2))
33-
34-
elif choice == '3':
35-
print(num1, "/", num2, "=", division(num1, num2))
36-
37-
elif choice == '4':
38-
print(num1, "-", num2, "=", subtract(num1, num2))
39-
40-
41-
next_calculation = input("Do you want to do another calculation? (yes/no): ")
42-
if next_calculation == "no":
43-
break
44-
45-
else:
46-
print("Invalid Input")
1+
# This function adds two numbers.
2+
def add(x, y):
3+
"""
4+
Sum function
5+
"""
6+
return x + y
7+
8+
9+
# This function subtracts two numbers
10+
def subtract(x, y):
11+
"""
12+
Sum function
13+
"""
14+
return x - y
15+
16+
# This function multiplies two numbers
17+
18+
def multiply(x, y):
19+
"""
20+
Sum function
21+
"""
22+
return x * y
23+
24+
# This function divides two numbers
25+
def divide(x, y):
26+
"""
27+
Sum function
28+
"""
29+
return x / y
30+
VARIABLE_1 = 10
31+
32+
VARIABLE_2 = 100000000
33+
34+
print(VARIABLE_1, "+", VARIABLE_2, "=", add(VARIABLE_1, VARIABLE_2))
35+
print(VARIABLE_1, "-", VARIABLE_2, "=", subtract(VARIABLE_1, VARIABLE_2))
36+
print(VARIABLE_1, "*", VARIABLE_2, "=", multiply(VARIABLE_1, VARIABLE_2))
37+
print(VARIABLE_1, "/", VARIABLE_2, "=", divide(VARIABLE_1, VARIABLE_2))

unit_test_1.py

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import unittest
2+
from Calculator import add, subtract, multiply, divide
3+
4+
class TestCalculator(unittest.TestCase):
5+
6+
def test_add(self):
7+
self.assertEqual(subtract(2, 3), -1)
8+
self.assertEqual(subtract(-2, 3), -5)
9+
self.assertEqual(subtract(-2, -3), 1)
10+
11+
def test_subtraction(self):
12+
self.assertEqual(subtract(2, 3), -1)
13+
self.assertEqual(subtract(-2, 3), -5)
14+
self.assertEqual(subtract(-2, -3), 1)
15+
16+
def test_multiplication(self):
17+
self.assertEqual(multiply(2, 3), 6)
18+
self.assertEqual(multiply(-2, 3), -6)
19+
self.assertEqual(multiply(-2, -3), 6)
20+
21+
def test_division(self):
22+
self.assertAlmostEqual(divide(5, 2), 2.5)
23+
self.assertAlmostEqual(divide(0, 2), 0)
24+
self.assertRaises(ZeroDivisionError, divide, 5, 0)
25+
26+
if __name__ == '__main__':
27+
unittest.main()

0 commit comments

Comments
 (0)