Improved tasks 19-25

Author: javadev

src/main/python/g0001_0100/s0019_remove_nth_node_from_end_of_list/Solution0019_test.py

@@ -1,15 +1,5 @@
 import unittest
-import importlib
-
-mod = importlib.import_module('Solution0019')
-
-class ListNode:
-    def __init__(self, val=0, next=None):
-        self.val = val
-        self.next = next
-
-    def __str__(self):
-        return ""
+from Solution0019 import Solution, ListNode
 
 def construct_linked_list(values):
     dummy = ListNode(0)
@@ -19,7 +9,6 @@ def construct_linked_list(values):
         curr = curr.next
     return dummy.next
 
-
 def to_string(head):
     parts = []
     curr = head
@@ -30,13 +19,11 @@ def to_string(head):
 
 class SolutionTest(unittest.TestCase):
     def test_removeNthFromEnd(self):
-        mod.ListNode = ListNode
         node1 = construct_linked_list([1, 2, 3, 4, 5])
-        result = mod.Solution().removeNthFromEnd(node1, 2)
+        result = Solution().removeNthFromEnd(node1, 2)
         self.assertEqual(to_string(result), "1, 2, 3, 5")
 
     def test_removeNthFromEnd2(self):
-        mod.ListNode = ListNode
         node1 = ListNode(1)
-        result = mod.Solution().removeNthFromEnd(node1, 1)
+        result = Solution().removeNthFromEnd(node1, 1)
         self.assertIsNone(result)

src/main/python/g0001_0100/s0021_merge_two_sorted_lists/Solution0021_test.py

@@ -1,13 +1,5 @@
 import unittest
-import importlib
-
-mod = importlib.import_module('Solution0021')
-
-class ListNode:
-    def __init__(self, val=0, next=None):
-        self.val = val
-        self.next = next
-
+from Solution0021 import Solution, ListNode
 
 def from_list(values):
     dummy = ListNode(0)
@@ -17,7 +9,6 @@ def from_list(values):
         curr = curr.next
     return dummy.next
 
-
 def to_string(head):
     parts = []
     curr = head
@@ -26,15 +17,11 @@ def to_string(head):
         curr = curr.next
     return ", ".join(parts)
 
-
 class SolutionTest(unittest.TestCase):
     def test_mergeTwoLists(self):
-        mod.ListNode = ListNode
         l1 = from_list([1, 2, 4])
         l2 = from_list([1, 3, 4])
-        self.assertEqual(to_string(mod.Solution().mergeTwoLists(l1, l2)), "1, 1, 2, 3, 4, 4")
-
+        self.assertEqual(to_string(Solution().mergeTwoLists(l1, l2)), "1, 1, 2, 3, 4, 4")
 
     def test_mergeTwoLists2(self):
-        mod.ListNode = ListNode
-        self.assertEqual(to_string(mod.Solution().mergeTwoLists(ListNode(0), ListNode(0))), "0, 0") 
+        self.assertEqual(to_string(Solution().mergeTwoLists(ListNode(0), ListNode(0))), "0, 0") 

src/main/python/g0001_0100/s0023_merge_k_sorted_lists/Solution0023_test.py

@@ -1,13 +1,5 @@
 import unittest
-import importlib
-
-mod = importlib.import_module('Solution0023')
-
-class ListNode:
-    def __init__(self, val=0, next=None):
-        self.val = val
-        self.next = next
-
+from Solution0023 import Solution, ListNode
 
 def from_list(values):
     dummy = ListNode(0)
@@ -17,7 +9,6 @@ def from_list(values):
         curr = curr.next
     return dummy.next
 
-
 def to_string(head):
     parts = []
     curr = head
@@ -26,20 +17,17 @@ def to_string(head):
         curr = curr.next
     return ", ".join(parts)
 
-
 class SolutionTest(unittest.TestCase):
     def test_mergeKLists(self):
-        mod.ListNode = ListNode
         head1 = from_list([1, 4, 5])
         head2 = from_list([1, 3, 4])
         head3 = from_list([2, 6])
-        result = mod.Solution().mergeKLists([head1, head2, head3])
+        result = Solution().mergeKLists([head1, head2, head3])
         self.assertEqual(to_string(result), "1, 1, 2, 3, 4, 4, 5, 6")
 
     def test_mergeKLists2(self):
-        mod.ListNode = ListNode
         head1 = from_list([1, 3, 5, 7, 11])
         head2 = from_list([2, 8, 12])
         head3 = from_list([4, 6, 9, 10])
-        result = mod.Solution().mergeKLists([head1, head2, head3])
+        result = Solution().mergeKLists([head1, head2, head3])
         self.assertEqual(to_string(result), "1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12")

src/main/python/g0001_0100/s0024_swap_nodes_in_pairs/Solution0024_test.py

@@ -1,13 +1,5 @@
 import unittest
-import importlib
-
-mod = importlib.import_module('Solution0024')
-
-class ListNode:
-    def __init__(self, val=0, next=None):
-        self.val = val
-        self.next = next
-
+from Solution0024 import Solution, ListNode
 
 def from_list(values):
     dummy = ListNode(0)
@@ -17,7 +9,6 @@ def from_list(values):
         curr = curr.next
     return dummy.next
 
-
 def to_string(head):
     parts = []
     curr = head
@@ -26,15 +17,12 @@ def to_string(head):
         curr = curr.next
     return ", ".join(parts)
 
-
 class SolutionTest(unittest.TestCase):
     def test_swapPairs(self):
-        mod.ListNode = ListNode
         head = from_list([1, 2, 3, 4])
-        result = mod.Solution().swapPairs(head)
+        result = Solution().swapPairs(head)
         self.assertEqual(to_string(result), "2, 1, 4, 3")
 
     def test_swapPairs2(self):
-        mod.ListNode = ListNode
-        result = mod.Solution().swapPairs(ListNode(1))
+        result = Solution().swapPairs(ListNode(1))
         self.assertEqual(to_string(result), "1")

src/main/python/g0001_0100/s0025_reverse_nodes_in_k_group/Solution0025_test.py

@@ -1,13 +1,5 @@
 import unittest
-import importlib
-
-mod = importlib.import_module('Solution0025')
-
-class ListNode:
-    def __init__(self, val=0, next=None):
-        self.val = val
-        self.next = next
-
+from Solution0025 import Solution, ListNode
 
 def from_list(values):
     dummy = ListNode(0)
@@ -17,7 +9,6 @@ def from_list(values):
         curr = curr.next
     return dummy.next
 
-
 def to_string(head):
     parts = []
     curr = head
@@ -26,16 +17,13 @@ def to_string(head):
         curr = curr.next
     return ", ".join(parts)
 
-
 class SolutionTest(unittest.TestCase):
     def test_reverseKGroup(self):
-        mod.ListNode = ListNode
         head = from_list([1, 2, 3, 4, 5])
-        result = mod.Solution().reverseKGroup(head, 2)
+        result = Solution().reverseKGroup(head, 2)
         self.assertEqual(to_string(result), "2, 1, 4, 3, 5")
 
     def test_reverseKGroup2(self):
-        mod.ListNode = ListNode
         head = from_list([1, 2, 3, 4, 5])
-        result = mod.Solution().reverseKGroup(head, 3)
+        result = Solution().reverseKGroup(head, 3)
         self.assertEqual(to_string(result), "3, 2, 1, 4, 5")