From e9a982b6a9c07479a4f9fbd4d2f7d04feca26c6d Mon Sep 17 00:00:00 2001 From: marcinha Date: Sun, 17 Sep 2023 23:05:01 -0300 Subject: [PATCH 1/3] exercicios extra segunda --- .../para-casa/marcinha/exercicio-segunda.py | 133 ++++++++++++++++++ exercicios/para-sala/calc.py | 37 +++++ exercicios/para-sala/teste.py | 18 +++ 3 files changed, 188 insertions(+) create mode 100644 exercicios/para-casa/marcinha/exercicio-segunda.py create mode 100644 exercicios/para-sala/calc.py create mode 100644 exercicios/para-sala/teste.py diff --git a/exercicios/para-casa/marcinha/exercicio-segunda.py b/exercicios/para-casa/marcinha/exercicio-segunda.py new file mode 100644 index 0000000..20eb1f4 --- /dev/null +++ b/exercicios/para-casa/marcinha/exercicio-segunda.py @@ -0,0 +1,133 @@ +def soma(a, b): + return a + b + +def divisao(a, b): + return a / b + +def multiplicacao(a, b): + return a * b + +def subtracao(a, b): + return a - b + +import unittest + + +#Testes de soma + +class teste_soma(unittest.TestCase): + def teste_soma_positivos(self): + self.assertEqual(soma(2,3), 5) + + def teste_soma_negativos(self): + self.assertEqual(soma(-3, -3), -6) + + def teste_soma_zero(self): + self.assertEqual(soma(0,1), 1) + + def teste_soma_diferentes(self): + self.assertEqual(soma(-5,2), -3) + +#Testes subtração + +class teste_subtracao(unittest.TestCase): + + def teste_subtracao_positivos(self): + self.assertEqual(subtracao(2,3), -1) + + def teste_subtracao_negativos(self): + self.assertEqual(subtracao(-5, -3), -2) + + def teste_subtracao_diferentes(self): + self.assertEqual(subtracao(-5, +3), -8) + + def teste_subtracao_zero(self): + self.assertEqual(subtracao(0,1), -1) + + +#Testes divisão + +class teste_divisao(unittest.TestCase): + def teste_divisao_positivos(self): + self.assertEqual(divisao(10,5), 2) + + def teste_divisao_divisaoegativos(self): + self.assertEqual(divisao(-10, -5), 2) + + def teste_divisao_diferentes(self): + self.assertEqual(divisao(-10, +5), -2) + + def teste_divisao_zero(self): + self.assertEqual(divisao(0,1), 0) + +#Testes multiplicação + +class teste_multiplicacao(unittest.TestCase): + def teste_multiplicacao_positivos(self): + self.assertEqual(multiplicacao(2,3), 6) + + def teste_multiplicacao_negativos(self): + self.assertEqual(multiplicacao(-5, -3), 15) + + def teste_multiplicacao_diferentes(self): + self.assertEqual(multiplicacao(-5, +3), -15) + + def teste_multiplicacao_zero(self): + self.assertEqual(multiplicacao(0,1), 0) + +if __name__ == '__main__': + unittest.main() + + +#exercicios feito em grupo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/exercicios/para-sala/calc.py b/exercicios/para-sala/calc.py new file mode 100644 index 0000000..f47edd5 --- /dev/null +++ b/exercicios/para-sala/calc.py @@ -0,0 +1,37 @@ +def soma(a,b): + + return a + b + + + +import unittest + + + + + +class TestSoma(unittest.TestCase): + + def teste_soma_positivos(self): + + self.assertEqual(soma(2,3),5) + + + + + + def test_soma_negatvios(self): + + self.assertEqual(soma(-3,-3),-6) + + + + def test_soma_zero(self): + + self.assertEqual(soma(-3,3),0) + + + +if __name__ == '__main__': + + unittest.main() diff --git a/exercicios/para-sala/teste.py b/exercicios/para-sala/teste.py new file mode 100644 index 0000000..585634e --- /dev/null +++ b/exercicios/para-sala/teste.py @@ -0,0 +1,18 @@ +def soma(a,b): + return a + b + +import unittest + +class TestSoma(unittest.TestCase): + def test_soma_positivos(self): + self.assertEqual(soma(2, 3),5) + + def test_soma_negativos(self): + self.assertEqual(soma(-3,-3), -6) + + + + + +if __name__ == '__main__': + unittest.main() \ No newline at end of file From 047b4c967fa04f7b3ca78e3b33eb57703dfddaf9 Mon Sep 17 00:00:00 2001 From: marcinha Date: Tue, 19 Sep 2023 23:00:40 -0300 Subject: [PATCH 2/3] exercio calcula media --- .../__pycache__/calculo_media.cpython-311.pyc | Bin 0 -> 440 bytes exercicios/para-casa/marcinha/calculo_media.py | 5 +++++ .../para-casa/marcinha/teste_calculoMedia.py | 15 +++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 exercicios/para-casa/marcinha/__pycache__/calculo_media.cpython-311.pyc create mode 100644 exercicios/para-casa/marcinha/calculo_media.py create mode 100644 exercicios/para-casa/marcinha/teste_calculoMedia.py diff --git a/exercicios/para-casa/marcinha/__pycache__/calculo_media.cpython-311.pyc b/exercicios/para-casa/marcinha/__pycache__/calculo_media.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7fa0a5b784c1f3e576231d37d2f4c43478adee9b GIT binary patch literal 440 zcmZXPJxc>Y5Qb;(BF3EY>j#LH@rrXr!8E6}RT{AoL6^OS1n&0Y?j13b!onhgeH64+ z#6P25xK=Fe4$`G^HXkB7Ftao7JTt>Sm&+wUJJ~A=hm1aJ+<5RgM~ zEk5lTq=0Ut4-PQ&paa@6RPu}Iz!O%lKT2ZwiT&+eIsoQI?aKhJmDxItGCLH~CE2V@ zBcWog&8oHG89mZMX&Nz3g-+5S)>Mm#Nmiw?+}`z??W7({Pj6Md1OcI`xDbjrcmv5M zQ_SN`Gn_|F)*0n2 KHgfnMM)TiI1Y`UF literal 0 HcmV?d00001 diff --git a/exercicios/para-casa/marcinha/calculo_media.py b/exercicios/para-casa/marcinha/calculo_media.py new file mode 100644 index 0000000..1f30f54 --- /dev/null +++ b/exercicios/para-casa/marcinha/calculo_media.py @@ -0,0 +1,5 @@ +def calcula_media(numeros): + if not numeros: + return 0 + + return sum(numeros) / len(numeros) \ No newline at end of file diff --git a/exercicios/para-casa/marcinha/teste_calculoMedia.py b/exercicios/para-casa/marcinha/teste_calculoMedia.py new file mode 100644 index 0000000..ea9a3f1 --- /dev/null +++ b/exercicios/para-casa/marcinha/teste_calculoMedia.py @@ -0,0 +1,15 @@ +from contextlib import AbstractContextManager +from typing import Any +import unittest +from calculo_media import calcula_media + +class TestCalculaMedia(unittest.TestCase) : + def test_media_vazia(self): + resultado = calcula_media([]) + self.assertEqual(resultado, 0) + + + + +if __name__ == "__main__" : + unittest.main() \ No newline at end of file From 616a07cfba1643d106ef8aa1f8a6394bb8db55d0 Mon Sep 17 00:00:00 2001 From: marcinha Date: Wed, 20 Sep 2023 21:48:29 -0300 Subject: [PATCH 3/3] exerciosemana7 --- .../para-casa/marcinha/teste_calculoMedia.py | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/exercicios/para-casa/marcinha/teste_calculoMedia.py b/exercicios/para-casa/marcinha/teste_calculoMedia.py index ea9a3f1..912f176 100644 --- a/exercicios/para-casa/marcinha/teste_calculoMedia.py +++ b/exercicios/para-casa/marcinha/teste_calculoMedia.py @@ -12,4 +12,25 @@ def test_media_vazia(self): if __name__ == "__main__" : - unittest.main() \ No newline at end of file + unittest.main() +class testCalculaMedia (unittest.TestCase): + def test_media_lista_vazia(self): + resultado = calculaMedia([]) + self.assertEqual(resultado,[]) + + def test_media_lista_str_float(self): + resultado = calculaMedia(['1.5',2.5, 2.5]) + self.assertAlmostEqual(resultado, 2.166) + + def test_media_lista_int_float(self): + resultado = calculaMedia([2, 2.3, 3.5]) + self.assertEqual(resultado, 2.6) + + def test_media_lista_tupla_lista(self): + resultado = calculaMedia([('10'), 20]) + self.assertEqual(resultado,[('10'), 20]) + +if __name__ == '__main__': + unittest.main() + +#realizado em grupo \ No newline at end of file