From 63d330713951a169607622052f571dc44668620d Mon Sep 17 00:00:00 2001
From: Divya <divya.naidoo5@gmail.com>
Date: Thu, 11 May 2023 13:59:15 -0700
Subject: [PATCH] added merge lists function and tests

---
 functions/merge_sorted_lists.py  |  4 +++-
 tests/merge_sorted_lists_test.py | 35 ++++++++++++++++++++++++++++++++
 2 files changed, 38 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..d25f3f1 100644
--- a/tests/merge_sorted_lists_test.py
+++ b/tests/merge_sorted_lists_test.py
@@ -1,2 +1,37 @@
 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