diff --git a/functions/merge_sorted_lists.py b/functions/merge_sorted_lists.py index bdfb2ba..36f37ab 100644 --- a/functions/merge_sorted_lists.py +++ b/functions/merge_sorted_lists.py @@ -1,2 +1,4 @@ def merge_sorted_lists(l1, l2): - pass + merged = l1 + l2 + + return sorted(merged) diff --git a/functions/two_sum.py b/functions/two_sum.py index 0a8adcb..8b263a9 100644 --- a/functions/two_sum.py +++ b/functions/two_sum.py @@ -1,2 +1,5 @@ -def twoSum(n, t): - pass +def two_sum(number, t): + for i in range(len(number)): + for j in range(i + 1, len(number)): + if number[j] == t - number[i]: + return [i, j] diff --git a/tests/merge_sorted_lists_test.py b/tests/merge_sorted_lists_test.py index c0ad62f..cf10428 100644 --- a/tests/merge_sorted_lists_test.py +++ b/tests/merge_sorted_lists_test.py @@ -1,2 +1,38 @@ import pytest from functions.merge_sorted_lists import merge_sorted_lists + + +def test_for_1_and_2(): + # Arrange + l1 = [1] + l2 = [2] + + # Act + answer = merge_sorted_lists(l1, l2) + + # Assert + assert answer == [1, 2] + + +def test_for_2_and_1(): + # Arrange + l1 = [2] + l2 = [1] + + # Act + answer = merge_sorted_lists(l1, l2) + + # Assert + assert answer == [1, 2] + + +def test_for_1_2_3_and_4_5_6(): + # Arrange + l1 = [1, 2, 3] + l2 = [4, 5, 6] + + # Act + answer = merge_sorted_lists(l1, l2) + + # Assert + assert answer == [1, 2, 3, 4, 5, 6] \ No newline at end of file diff --git a/tests/two_sum_test.py b/tests/two_sum_test.py index a2724cf..bde067f 100644 --- a/tests/two_sum_test.py +++ b/tests/two_sum_test.py @@ -1,2 +1,37 @@ import pytest -from functions.two_sum import twoSum +from functions.two_sum import two_sum + +def test_returns_0_1_for_2_7_11_15_with_target_9(): + # Arrange + numbers = [2, 7, 11, 15] + t = 9 + + # Act + answer = two_sum(numbers, t) + + # Assert + assert answer == [0, 1] + + +def test_returns_1_2_for_3_2_4_with_target_6(): + # Arrange + numbers = [3, 2, 4] + t = 6 + + # Act + answer = two_sum(numbers, t) + + # Assert + assert answer == [1, 2] + + +def test_returns_0_1_for_3_3_with_target_6(): + # Arrange + numbers = [3, 3] + t = 6 + + # Act + answer = two_sum(numbers, t) + + # Assert + assert answer == [0, 1] \ No newline at end of file