Skip to content

Commit 0ad7cbe

Browse files
committed
Merge branch 'the-kid89-add_test_to_unittests'
'Updated tests/test_searching.py'
2 parents 84a0dba + 9f22c34 commit 0ad7cbe

File tree

3 files changed

+48
-29
lines changed

3 files changed

+48
-29
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ docs/_build/
5555

5656
# PyBuilder
5757
target/
58+
.idea/

tests/searching_tests.py renamed to tests/test_searching.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import unittest
22

3-
from pygorithm.searching import (linear_search,
4-
binary_search,
5-
breadth_first_search,
6-
depth_first_search)
3+
from pygorithm.searching import (
4+
linear_search,
5+
binary_search,
6+
breadth_first_search,
7+
depth_first_search)
78

8-
class SearchingAlgorithmTest(unittest.TestCase):
9+
10+
class TestSearchingAlgorithm(unittest.TestCase):
911
def setUp(self):
1012
# to test numeric numbers
1113
self.array = list(range(15))
@@ -14,7 +16,8 @@ def setUp(self):
1416
string = 'pythonisawesome'
1517
self.alphaArray = list(string)
1618

17-
class LinearSearch(SearchingAlgorithmTest):
19+
20+
class TestLinearSearch(TestSearchingAlgorithm):
1821
def test_linear_search(self):
1922
result = linear_search.search(self.array, 7)
2023
self.assertIs(result, 7)
@@ -25,7 +28,8 @@ def test_linear_search(self):
2528
alpha_result = linear_search.search(self.array, 'n')
2629
self.assertIs(alpha_result, -1)
2730

28-
class BinarySearch(SearchingAlgorithmTest):
31+
32+
class TestBinarySearch(TestSearchingAlgorithm):
2933
def test_binary_search(self):
3034
result = binary_search.search(self.array, 7)
3135
self.assertIs(result, 7)
@@ -36,7 +40,8 @@ def test_binary_search(self):
3640
alpha_result = binary_search.search(self.array, 'n')
3741
self.assertIs(alpha_result, -1)
3842

39-
class BFSSearch(unittest.TestCase):
43+
44+
class TestBFSSearch(unittest.TestCase):
4045
def test_bfs(self):
4146
self.graph = {
4247
'A': {'B', 'C', 'E'},
@@ -52,7 +57,8 @@ def test_bfs(self):
5257
result = breadth_first_search.search(self.graph, 'G')
5358
self.assertEqual(result, {'G', 'C', 'A', 'B', 'D', 'F', 'E'})
5459

55-
class DFSSearch(unittest.TestCase):
60+
61+
class TestDFSSearch(unittest.TestCase):
5662
def test_dfs(self):
5763
self.graph = {
5864
'A': ['B', 'C', 'E'],
@@ -68,5 +74,6 @@ def test_dfs(self):
6874
result = depth_first_search.search(self.graph, 'G')
6975
self.assertEqual(result, ['G', 'C', 'A', 'B', 'D', 'F', 'E'])
7076

77+
7178
if __name__ == '__main__':
7279
unittest.main()

tests/sorting_tests.py renamed to tests/test_sorting.py

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import unittest
22
import random
33

4-
from pygorithm.sorting import (bubble_sort,
5-
insertion_sort,
6-
selection_sort,
7-
merge_sort,
8-
quick_sort,
9-
counting_sort,
10-
bucket_sort,
11-
shell_sort,
12-
heap_sort)
13-
14-
class SortingAlgorithmTests(unittest.TestCase):
4+
from pygorithm.sorting import (
5+
bubble_sort,
6+
insertion_sort,
7+
selection_sort,
8+
merge_sort,
9+
quick_sort,
10+
counting_sort,
11+
bucket_sort,
12+
shell_sort,
13+
heap_sort)
14+
15+
16+
class TestSortingAlgorithm(unittest.TestCase):
1517
def setUp(self):
1618
# to test numeric numbers
1719
self.array = list(range(15))
@@ -24,69 +26,78 @@ def setUp(self):
2426
random.shuffle(self.alphaArray)
2527
self.sorted_alpha_array = sorted(string)
2628

27-
class BubbleSortTest(SortingAlgorithmTests):
29+
30+
class TestBubbleSortTest(TestSortingAlgorithm):
2831
def test_bubble_sort(self):
2932
self.result = bubble_sort.sort(self.array)
3033
self.assertEqual(self.result, self.sorted_array)
3134

3235
self.alphaResult = bubble_sort.sort(self.alphaArray)
3336
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
3437

35-
class InsertionSortTest(SortingAlgorithmTests):
38+
39+
class TestInsertionSortTest(TestSortingAlgorithm):
3640
def test_insertion_sort(self):
3741
self.result = insertion_sort.sort(self.array)
3842
self.assertEqual(self.result, self.sorted_array)
3943

4044
self.alphaResult = insertion_sort.sort(self.alphaArray)
4145
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
4246

43-
class SelectionSortTest(SortingAlgorithmTests):
47+
48+
class TestSelectionSortTest(TestSortingAlgorithm):
4449
def test_selection_sort(self):
4550
self.result = selection_sort.sort(self.array)
4651
self.assertEqual(self.result, self.sorted_array)
4752

4853
self.alphaResult = selection_sort.sort(self.alphaArray)
4954
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
5055

51-
class MergeSortTest(SortingAlgorithmTests):
56+
57+
class TestMergeSortTest(TestSortingAlgorithm):
5258
def test_merge_sort(self):
5359
self.result = merge_sort.sort(self.array)
5460
self.assertEqual(self.result, self.sorted_array)
5561

5662
self.alphaResult = merge_sort.sort(self.alphaArray)
5763
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
5864

59-
class QuickSortTest(SortingAlgorithmTests):
65+
66+
class TestQuickSortTest(TestSortingAlgorithm):
6067
def test_quick_sort(self):
6168
self.result = quick_sort.sort(self.array)
6269
self.assertEqual(self.result, self.sorted_array)
6370

6471
self.alphaResult = quick_sort.sort(self.alphaArray)
6572
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
6673

67-
class CountingSortTest(SortingAlgorithmTests):
74+
75+
class TestCountingSortTest(TestSortingAlgorithm):
6876
def test_counting_sort(self):
6977
# counting sort is an integer based sort
7078
self.result = counting_sort.sort(self.array)
7179
self.assertEqual(self.result, self.sorted_array)
7280

73-
class BucketSortTest(SortingAlgorithmTests):
81+
82+
class TestBucketSortTest(TestSortingAlgorithm):
7483
def test_bucket_sort(self):
7584
self.result = bucket_sort.sort(self.array)
7685
self.assertEqual(self.result, self.sorted_array)
7786

7887
self.alphaResult = bucket_sort.sort(self.alphaArray)
7988
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
8089

81-
class ShellSortTest(SortingAlgorithmTests):
90+
91+
class TestShellSortTest(TestSortingAlgorithm):
8292
def test_shell_sort(self):
8393
self.result = shell_sort.sort(self.array)
8494
self.assertEqual(self.result, self.sorted_array)
8595

8696
self.alphaResult = shell_sort.sort(self.alphaArray)
8797
self.assertEqual(self.alphaResult, self.sorted_alpha_array)
8898

89-
class HeapSortTest(SortingAlgorithmTests):
99+
100+
class TestHeapSortTest(TestSortingAlgorithm):
90101
def test_heap_sort(self):
91102
self.result = heap_sort.sort(self.array)
92103
self.assertEqual(self.result, self.sorted_array)

0 commit comments

Comments
 (0)