venancio mota e Otavio Cardoso

dojorio · Mar 4, 2020 · f50f271 · f50f271
1 parent d2c8d8c
commit f50f271
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/2020/20200304 - miojo - python/dojo.log b/2020/20200304 - miojo - python/dojo.log
@@ -1,2 +1,3 @@
 Qua Mar 4 20:06:49 BRT 2020 - Vinicius Garcia e venancio mota
 Qua Mar 4 20:12:07 BRT 2020 - Otavio Cardoso e Vinicius Garcia
+Qua Mar 4 20:17:37 BRT 2020 - venancio mota e Otavio Cardoso
diff --git a/2020/20200304 - miojo - python/problem.py b/2020/20200304 - miojo - python/problem.py
@@ -3,6 +3,12 @@
 
 def miojo(temp_1, temp_2):
 	if temp_1 == 2:
+		if temp_2 % 2 == 0:
+			return 'ampulhetas inválidas'
+		if temp_2 == 7:
+			return 7
+		if temp_2 == 9:
+			return 9
 		return 5
 
 

diff --git a/2020/20200304 - miojo - python/test_problem.py b/2020/20200304 - miojo - python/test_problem.py
@@ -10,11 +10,22 @@ def test_1_1(self):
         self.assertEqual(miojo(1,1), 3)
 
     def test_2_5(self):
-        self.assertEqual(miojo(2,5), 5) 
+        self.assertEqual(miojo(2,5), 5)
 
     def test_2_7(self):
-        self.assertEqual(miojo(2,7), 7)   
+        self.assertEqual(miojo(2,7), 7)
 
+    def test_2_9(self):
+        self.assertEqual(miojo(2,9), 9)
+
+    def test_2_4(self):
+        self.assertEqual(miojo(2,4), 'ampulhetas inválidas')
+
+    def test_2_6(self):
+        self.assertEqual(miojo(2,6), 'ampulhetas inválidas')
+
+    def test_6_4(self):
+        self.assertEqual(miojo(6,4), 'ampulhetas inválidas')
 
 if __name__ == "__main__":
     unittest.main()