Skip to content

Commit 713ec86

Browse files
author
Emmanuel Delaborde
committed
fix congig.json and binary-search-tree tests
2 parents 63c61b1 + 73ac5d1 commit 713ec86

File tree

2 files changed

+91
-77
lines changed

2 files changed

+91
-77
lines changed

‎config.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@
831831
]
832832
},
833833
{
834+
<<<<<<< HEAD
834835
"slug": "simple-linked-list",
835836
"uuid": "56a794de-40ee-4ff2-a1dd-f9b83f62d4b0",
836837
"core": false,
@@ -847,6 +848,12 @@
847848
"uuid": "a8f7f17e-567b-43ec-9ee5-6288367f0ae4",
848849
"core": false,
849850
"unlocked_by": "strain",
851+
=======
852+
"slug": "binary-search-tree",
853+
"uuid": "a8f7f17e-567b-43ec-9ee5-6288367f0ae4",
854+
"core": false,
855+
"unlocked_by": null,
856+
>>>>>>> 73ac5d1407a84e06c0c22ff31748d06aa74d3c99
850857
"difficulty": 3,
851858
"topics": [
852859
"recursion",

‎exercises/binary-search-tree/test/binary_search_tree_tests.erl‎

Lines changed: 84 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,108 @@
11
-module(binary_search_tree_tests).
22

33
-include_lib("erl_exercism/include/exercism.hrl").
4-
54
-include_lib("eunit/include/eunit.hrl").
65

76
'1_data_is_retained_test'() ->
8-
T =
9-
binary_search_tree:insert(binary_search_tree:empty(),
10-
4),
11-
?assertMatch(4, (binary_search_tree:value(T))).
7+
T = binary_search_tree:insert(binary_search_tree:empty(), 4),
8+
?assertMatch(4, binary_search_tree:value(T)).
129

1310
'2_smaller_number_at_left_node_test'() ->
14-
T =
15-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
16-
4),
17-
2),
18-
?assertMatch(4, (binary_search_tree:value(T))),
19-
?assertMatch(2,
20-
(binary_search_tree:value(binary_search_tree:left(T)))).
11+
T = binary_search_tree:insert(
12+
binary_search_tree:insert(
13+
binary_search_tree:empty(), 4),
14+
2),
15+
?assertMatch(4, binary_search_tree:value(T)),
16+
?assertMatch(2, binary_search_tree:value(binary_search_tree:left(T))).
2117

2218
'3_same number_at_left_node_test'() ->
23-
T =
24-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
25-
4),
26-
4),
27-
?assertMatch(4, (binary_search_tree:value(T))),
28-
?assertMatch(4,
29-
(binary_search_tree:value(binary_search_tree:left(T)))).
19+
T = binary_search_tree:insert(
20+
binary_search_tree:insert(
21+
binary_search_tree:empty(), 4),
22+
4),
23+
?assertMatch(4, binary_search_tree:value(T)),
24+
?assertMatch(4, binary_search_tree:value(binary_search_tree:left(T))).
3025

3126
'4_greater_number_at_right_node_test'() ->
32-
T =
33-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
34-
4),
35-
5),
36-
?assertMatch(4, (binary_search_tree:value(T))),
37-
?assertMatch(5,
38-
(binary_search_tree:value(binary_search_tree:right(T)))).
27+
T = binary_search_tree:insert(
28+
binary_search_tree:insert(
29+
binary_search_tree:empty(), 4),
30+
5),
31+
?assertMatch(4, binary_search_tree:value(T)),
32+
?assertMatch(5, binary_search_tree:value(binary_search_tree:right(T))).
3933

4034
'5_can_create_complex_tree_test'() ->
41-
T =
42-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
43-
4),
44-
2),
45-
6),
46-
1),
47-
3),
48-
5),
49-
7),
50-
?assertMatch(4, (binary_search_tree:value(T))),
51-
?assertMatch(2,
52-
(binary_search_tree:value(binary_search_tree:left(T)))),
53-
?assertMatch(1,
54-
(binary_search_tree:value(binary_search_tree:left(binary_search_tree:left(T))))),
55-
?assertMatch(3,
56-
(binary_search_tree:value(binary_search_tree:right(binary_search_tree:left(T))))),
57-
?assertMatch(6,
58-
(binary_search_tree:value(binary_search_tree:right(T)))),
59-
?assertMatch(5,
60-
(binary_search_tree:value(binary_search_tree:left(binary_search_tree:right(T))))),
61-
?assertMatch(7,
62-
(binary_search_tree:value(binary_search_tree:right(binary_search_tree:right(T))))).
35+
T = binary_search_tree:insert(
36+
binary_search_tree:insert(
37+
binary_search_tree:insert(
38+
binary_search_tree:insert(
39+
binary_search_tree:insert(
40+
binary_search_tree:insert(
41+
binary_search_tree:insert(
42+
binary_search_tree:empty(),
43+
4),
44+
2),
45+
6),
46+
1),
47+
3),
48+
5),
49+
7),
50+
?assertMatch(4, binary_search_tree:value(T)),
51+
?assertMatch(2, binary_search_tree:value(binary_search_tree:left(T))),
52+
?assertMatch(1, binary_search_tree:value(
53+
binary_search_tree:left(
54+
binary_search_tree:left(T)))),
55+
?assertMatch(3, binary_search_tree:value(
56+
binary_search_tree:right(
57+
binary_search_tree:left(T)))),
58+
?assertMatch(6, binary_search_tree:value(binary_search_tree:right(T))),
59+
?assertMatch(5, binary_search_tree:value(
60+
binary_search_tree:left(
61+
binary_search_tree:right(T)))),
62+
?assertMatch(7, binary_search_tree:value(
63+
binary_search_tree:right(
64+
binary_search_tree:right(T)))).
6365

6466
'6_can_sort_single_number_test'() ->
65-
T =
66-
binary_search_tree:insert(binary_search_tree:empty(),
67-
2),
68-
?assertMatch([2], (binary_search_tree:to_list(T))).
67+
T = binary_search_tree:insert(binary_search_tree:empty(), 2),
68+
?assertMatch([2], binary_search_tree:to_list(T)).
6969

7070
'7_can_sort_if_second_number_is_smaller_than_first_test'() ->
71-
T =
72-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
73-
2),
74-
1),
75-
?assertMatch([1, 2], (binary_search_tree:to_list(T))).
71+
T = binary_search_tree:insert(
72+
binary_search_tree:insert(
73+
binary_search_tree:empty(),
74+
2),
75+
1),
76+
?assertMatch([1, 2], binary_search_tree:to_list(T)).
7677

7778
'8_can_sort_if_second_number_is_same_as_first_test'() ->
78-
T =
79-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
80-
2),
81-
2),
82-
?assertMatch([2, 2], (binary_search_tree:to_list(T))).
79+
T = binary_search_tree:insert(
80+
binary_search_tree:insert(
81+
binary_search_tree:empty(),
82+
2),
83+
2),
84+
?assertMatch([2, 2], binary_search_tree:to_list(T)).
8385

8486
'9_can_sort_if_second_number_is_greater_than_first_test'() ->
85-
T =
86-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
87-
2),
88-
3),
89-
?assertMatch([2, 3], (binary_search_tree:to_list(T))).
87+
T = binary_search_tree:insert(
88+
binary_search_tree:insert(
89+
binary_search_tree:empty(),
90+
2),
91+
3),
92+
?assertMatch([2, 3], binary_search_tree:to_list(T)).
9093

9194
'10_can_sort_complex_tree_test'() ->
92-
T =
93-
binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:insert(binary_search_tree:empty(),
94-
2),
95-
1),
96-
3),
97-
6),
98-
7),
99-
5),
100-
?assertMatch([1, 2, 3, 5, 6, 7],
101-
(binary_search_tree:to_list(T))).
95+
T = binary_search_tree:insert(
96+
binary_search_tree:insert(
97+
binary_search_tree:insert(
98+
binary_search_tree:insert(
99+
binary_search_tree:insert(
100+
binary_search_tree:insert(
101+
binary_search_tree:empty(),
102+
2),
103+
1),
104+
3),
105+
6),
106+
7),
107+
5),
108+
?assertMatch([1, 2, 3, 5, 6, 7], binary_search_tree:to_list(T)).

0 commit comments

Comments
 (0)