From 3fc46571178d3d92c80726fe9062289d80e7b2cc Mon Sep 17 00:00:00 2001
From: Ericka <erickamoreno529@gmail.com>
Date: Thu, 11 May 2023 13:57:03 -0700
Subject: [PATCH 1/3] made function merge_sorted and test_merge_sorted

---
 functions/merge_sorted_lists.py  |  4 +++-
 tests/merge_sorted_lists_test.py | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

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/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

From 7357132bcd01d55e18e9ffbea5c2011ebe7bd16c Mon Sep 17 00:00:00 2001
From: Ericka <erickamoreno529@gmail.com>
Date: Thu, 11 May 2023 14:01:28 -0700
Subject: [PATCH 2/3] add two_sum and test_two_sum function

---
 functions/two_sum.py  |  5 ++++-
 tests/two_sum_test.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/functions/two_sum.py b/functions/two_sum.py
index 0a8adcb..0d5459d 100644
--- a/functions/two_sum.py
+++ b/functions/two_sum.py
@@ -1,2 +1,5 @@
 def twoSum(n, t):
-    pass
+    for i in range(len(n)):
+        for j in range(i + 1, len(n)):
+            if n[j] == t - n[i]:
+                return [i, j]
diff --git a/tests/two_sum_test.py b/tests/two_sum_test.py
index a2724cf..d871126 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
+
+def test_returns_0_1_for_2_7_11_15_with_target_9():
+    # Arrange
+    n = [2, 7, 11, 15]
+    t = 9
+
+    # Act
+    answer = twoSum(n, t)
+
+    # Assert
+    assert answer == [0, 1]
+
+
+def test_returns_1_2_for_3_2_4_with_target_6():
+    # Arrange
+    n = [3, 2, 4]
+    t = 6
+
+    # Act
+    answer = twoSum(n, t)
+
+    # Assert
+    assert answer == [1, 2]
+
+
+def test_returns_0_1_for_3_3_with_target_6():
+    # Arrange
+    n = [3, 3]
+    t = 6
+
+    # Act
+    answer = twoSum(n, t)
+
+    # Assert
+    assert answer == [0, 1]
\ No newline at end of file

From a79a47ba3658e103d0f79bf6c8cb3c2f8c179676 Mon Sep 17 00:00:00 2001
From: Ericka <erickamoreno529@gmail.com>
Date: Thu, 11 May 2023 14:15:35 -0700
Subject: [PATCH 3/3] change variable name

---
 functions/two_sum.py  |  8 ++++----
 tests/two_sum_test.py | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/functions/two_sum.py b/functions/two_sum.py
index 0d5459d..8b263a9 100644
--- a/functions/two_sum.py
+++ b/functions/two_sum.py
@@ -1,5 +1,5 @@
-def twoSum(n, t):
-    for i in range(len(n)):
-        for j in range(i + 1, len(n)):
-            if n[j] == t - n[i]:
+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/two_sum_test.py b/tests/two_sum_test.py
index d871126..bde067f 100644
--- a/tests/two_sum_test.py
+++ b/tests/two_sum_test.py
@@ -1,13 +1,13 @@
 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
-    n = [2, 7, 11, 15]
+    numbers = [2, 7, 11, 15]
     t = 9
 
     # Act
-    answer = twoSum(n, t)
+    answer = two_sum(numbers, t)
 
     # Assert
     assert answer == [0, 1]
@@ -15,11 +15,11 @@ def test_returns_0_1_for_2_7_11_15_with_target_9():
 
 def test_returns_1_2_for_3_2_4_with_target_6():
     # Arrange
-    n = [3, 2, 4]
+    numbers = [3, 2, 4]
     t = 6
 
     # Act
-    answer = twoSum(n, t)
+    answer = two_sum(numbers, t)
 
     # Assert
     assert answer == [1, 2]
@@ -27,11 +27,11 @@ def test_returns_1_2_for_3_2_4_with_target_6():
 
 def test_returns_0_1_for_3_3_with_target_6():
     # Arrange
-    n = [3, 3]
+    numbers = [3, 3]
     t = 6
 
     # Act
-    answer = twoSum(n, t)
+    answer = two_sum(numbers, t)
 
     # Assert
     assert answer == [0, 1]
\ No newline at end of file