Updated excercise 03

Author: razorblade23

exercises/foundations/03_math_and_comparisons/math_and_comparisons.py

@@ -1,36 +1 @@
-a = 5
-b = 10
-# Write your code under this comment.
-# Do not change the variables a and b as the tests will fail.
-
-# Replace `None` with the correct mathematical operation
-## Add a and b
-addition = None
-## Substract a from b
-substraction = None
-## Multiply a and b
-multiplication = None
-## Divide a and b
-division = None
-
-
-# Add these two strings together to variable `concated_name`
-f_name = "Jane"
-l_name = "Doe"
-
-concat_name = None
-
-
-# Get some letters from the following string
-shop_name = "My Awesome Shop"
-## Get the first letter
-first_letter = None
-## Get the second last letter
-second_last_letter = None
-
-
-# Convert case on the following string
-hello = "HeLLo AND WelcomE"
-lowercased = None
-uppercased = None
-titlecased = None
+# Write your code here

exercises/foundations/03_math_and_comparisons/solution/math_and_comparisons_solution.py

@@ -1,42 +1,18 @@
-a = 5
-b = 10
-# Write your code under this comment.
-# Do not change the variables a and b as the tests will fail.
+player_class = "Wizard"
+player_attack = 35
+player_defense = 13
+enemy_attack = 28
+enemy_defense = 16
 
-# Replace `None` with the correct mathematical operation
-## Add a and b
-addition = a + b
-## Substract a from b
-substraction = a - b
-## Multiply a and b
-multiplication = a * b
-## Divide a and b
-division = a / b
+player_attack_power = player_attack * player_defense
+enemy_attack_power = enemy_attack * enemy_defense
 
-# Use f-string to print out the data crunched
-# Needs to be in this format:
-# A: <a> B: <b> -> +: <addition>, -: <substraction>, *: <multiplication>, /: <division>
-formatted_string = f"A: {a} B: {b} -> +: {addition}, -: {substraction}, *: {multiplication}, /: {division}"
-print(formatted_string)
+damage_dealt = player_attack_power - enemy_attack_power
 
+combat_log = f"{player_class.upper()} has suffered {damage_dealt} damage."
 
-# Add these two strings together to variable `concated_name`
-f_name = "Jane"
-l_name = "Doe"
+is_player_stronger = player_attack_power > enemy_attack_power
+is_balanced = player_defense == enemy_defense
 
-concat_name = f_name + l_name
-
-
-# Get some letters from the following string
-shop_name = "My Awesome Shop"
-## Get the first letter
-first_letter = shop_name[0]
-## Get the second last letter
-second_last_letter = shop_name[-2]
-
-
-# Convert case on the following string
-hello = "HeLLo AND WelcomE"
-lowercased = hello.lower()
-uppercased = hello.upper()
-titlecased = hello.title()
+class_initial = player_class[0]
+class_code = player_class[0:3].lower()

exercises/foundations/03_math_and_comparisons/solution/test_math_and_comparisons_solution.py

@@ -1,31 +1,46 @@
-def test_basic_math(run_script, expect_variables):
+def test_task1(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons_solution.py")
     expect_variables(
         namespace,
-        {"addition": 15, "substraction": -5, "multiplication": 50, "division": 0.5},
+        {
+            "player_class": "Wizard",
+            "player_attack": 35,
+            "player_defense": 13,
+            "enemy_attack": 28,
+            "enemy_defense": 16,
+        },
     )
 
-def test_fstring()
+
+def test_task2(run_script, expect_variables):
+    _, namespace = run_script("math_and_comparisons_solution.py")
+    expect_variables(namespace, {"player_attack_power": 455, "enemy_attack_power": 448})
 
 
-def test_string_concat(run_script, expect_variables):
+def test_task3(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons_solution.py")
-    expect_variables(namespace, {"concat_name": "JaneDoe"})
+    expect_variables(namespace, {"damage_dealt": 7})
 
 
-def test_string_indexing(run_script, expect_variables):
+def test_task4(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons_solution.py")
-    expect_variables(namespace, {"first_letter": "M", "second_last_letter": "o"})
+    expect_variables(
+        namespace,
+        {"combat_log": "WIZARD has suffered 7 damage."},
+    )
 
 
-def test_convert_case(run_script, expect_variables):
-    TEST_STRING = "HeLLo AND WelcomE"
+def test_task5(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons_solution.py")
     expect_variables(
         namespace,
-        {
-            "lowercased": TEST_STRING.lower(),
-            "uppercased": TEST_STRING.upper(),
-            "titlecased": TEST_STRING.title(),
-        },
+        {"is_player_stronger": True, "is_balanced": False},
+    )
+
+
+def test_task6(run_script, expect_variables):
+    _, namespace = run_script("math_and_comparisons_solution.py")
+    expect_variables(
+        namespace,
+        {"class_initial": "W", "class_code": "wiz"},
     )

exercises/foundations/03_math_and_comparisons/test_math_and_comparisons.py

@@ -1,35 +1,54 @@
 import pytest
 
 
-def test_basic_math(run_script, expect_variables):
+def test_task1(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons.py")
     expect_variables(
         namespace,
-        {"addition": 15, "substraction": -5, "multiplication": 50, "division": 0.5},
+        {
+            "player_class": "Wizard",
+            "player_attack": 35,
+            "player_defense": 13,
+            "enemy_attack": 28,
+            "enemy_defense": 16,
+        },
     )
 
 
-@pytest.mark.skip(reason="Finish earlier task first")
-def test_string_concat(run_script, expect_variables):
+@pytest.mark.skip(reason="Finish task 1 first")
+def test_task2(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons.py")
-    expect_variables(namespace, {"concat_name": "JaneDoe"})
+    expect_variables(namespace, {"player_attack_power": 455, "enemy_attack_power": 448})
 
 
-@pytest.mark.skip(reason="Finish earlier task first")
-def test_string_indexing(run_script, expect_variables):
+@pytest.mark.skip(reason="Finish task 2 first")
+def test_task3(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons.py")
-    expect_variables(namespace, {"first_letter": "M", "second_last_letter": "o"})
+    expect_variables(namespace, {"damage_dealt": 7})
 
 
-@pytest.mark.skip(reason="Finish earlier task first")
-def test_convert_case(run_script, expect_variables):
-    TEST_STRING = "HeLLo AND WelcomE"
+@pytest.mark.skip(reason="Finish task 3 first")
+def test_task4(run_script, expect_variables):
     _, namespace = run_script("math_and_comparisons.py")
     expect_variables(
         namespace,
-        {
-            "lowercased": TEST_STRING.lower(),
-            "uppercased": TEST_STRING.upper(),
-            "titlecased": TEST_STRING.title(),
-        },
+        {"combat_log": "WIZARD has suffered 7 damage."},
+    )
+
+
+@pytest.mark.skip(reason="Finish task 4 first")
+def test_task5(run_script, expect_variables):
+    _, namespace = run_script("math_and_comparisons.py")
+    expect_variables(
+        namespace,
+        {"is_player_stronger": True, "is_balanced": False},
+    )
+
+
+@pytest.mark.skip(reason="Finish task 5 first")
+def test_task6(run_script, expect_variables):
+    _, namespace = run_script("math_and_comparisons.py")
+    expect_variables(
+        namespace,
+        {"class_initial": "W", "class_code": "wiz"},
     )