|
@@ -13,13 +13,13 @@ public class BinarySearchTreeTest {
|
13
|
13
|
public void dataIsRetained() {
|
14
|
14
|
BinarySearchTree<Integer> binarySearchTree = new BinarySearchTree<>();
|
15
|
15
|
|
16
|
|
- final int expected = 4;
|
|
16
|
+ int expected = 4;
|
17
|
17
|
binarySearchTree.insert(expected);
|
18
|
18
|
|
19
|
|
- final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
|
|
19
|
+ BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
|
20
|
20
|
assertNotNull(root);
|
21
|
21
|
|
22
|
|
- final int actual = root.getData();
|
|
22
|
+ int actual = root.getData();
|
23
|
23
|
assertEquals(expected, actual);
|
24
|
24
|
}
|
25
|
25
|
|
|
@@ -27,19 +27,19 @@ public class BinarySearchTreeTest {
|
27
|
27
|
@Test
|
28
|
28
|
public void insertsLess() {
|
29
|
29
|
BinarySearchTree<Character> binarySearchTree = new BinarySearchTree<>();
|
30
|
|
- final char expectedRoot = '4';
|
31
|
|
- final char expectedLeft = '2';
|
|
30
|
+ char expectedRoot = '4';
|
|
31
|
+ char expectedLeft = '2';
|
32
|
32
|
|
33
|
33
|
binarySearchTree.insert(expectedRoot);
|
34
|
34
|
binarySearchTree.insert(expectedLeft);
|
35
|
35
|
|
36
|
|
- final BinarySearchTree.Node<Character> root = binarySearchTree.getRoot();
|
|
36
|
+ BinarySearchTree.Node<Character> root = binarySearchTree.getRoot();
|
37
|
37
|
assertNotNull(root);
|
38
|
|
- final BinarySearchTree.Node<Character> left = root.getLeft();
|
|
38
|
+ BinarySearchTree.Node<Character> left = root.getLeft();
|
39
|
39
|
assertNotNull(left);
|
40
|
40
|
|
41
|
|
- final char actualRoot = root.getData();
|
42
|
|
- final char actualLeft = left.getData();
|
|
41
|
+ char actualRoot = root.getData();
|
|
42
|
+ char actualLeft = left.getData();
|
43
|
43
|
assertEquals(expectedLeft, actualLeft);
|
44
|
44
|
assertEquals(expectedRoot, actualRoot);
|
45
|
45
|
}
|
|
@@ -48,19 +48,19 @@ public class BinarySearchTreeTest {
|
48
|
48
|
@Test
|
49
|
49
|
public void insertsSame() {
|
50
|
50
|
BinarySearchTree<String> binarySearchTree = new BinarySearchTree<>();
|
51
|
|
- final String expectedRoot = "4";
|
52
|
|
- final String expectedLeft = "4";
|
|
51
|
+ String expectedRoot = "4";
|
|
52
|
+ String expectedLeft = "4";
|
53
|
53
|
|
54
|
54
|
binarySearchTree.insert(expectedRoot);
|
55
|
55
|
binarySearchTree.insert(expectedLeft);
|
56
|
56
|
|
57
|
|
- final BinarySearchTree.Node<String> root = binarySearchTree.getRoot();
|
|
57
|
+ BinarySearchTree.Node<String> root = binarySearchTree.getRoot();
|
58
|
58
|
assertNotNull(root);
|
59
|
|
- final BinarySearchTree.Node<String> left = root.getLeft();
|
|
59
|
+ BinarySearchTree.Node<String> left = root.getLeft();
|
60
|
60
|
assertNotNull(left);
|
61
|
61
|
|
62
|
|
- final String actualRoot = root.getData();
|
63
|
|
- final String actualLeft = left.getData();
|
|
62
|
+ String actualRoot = root.getData();
|
|
63
|
+ String actualLeft = left.getData();
|
64
|
64
|
assertEquals(expectedLeft, actualLeft);
|
65
|
65
|
assertEquals(expectedRoot, actualRoot);
|
66
|
66
|
}
|
|
@@ -69,19 +69,19 @@ public class BinarySearchTreeTest {
|
69
|
69
|
@Test
|
70
|
70
|
public void insertsRight() {
|
71
|
71
|
BinarySearchTree<Integer> binarySearchTree = new BinarySearchTree<>();
|
72
|
|
- final int expectedRoot = 4;
|
73
|
|
- final int expectedRight = 5;
|
|
72
|
+ int expectedRoot = 4;
|
|
73
|
+ int expectedRight = 5;
|
74
|
74
|
|
75
|
75
|
binarySearchTree.insert(expectedRoot);
|
76
|
76
|
binarySearchTree.insert(expectedRight);
|
77
|
77
|
|
78
|
|
- final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
|
|
78
|
+ BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
|
79
|
79
|
assertNotNull(root);
|
80
|
|
- final BinarySearchTree.Node<Integer> right = root.getRight();
|
|
80
|
+ BinarySearchTree.Node<Integer> right = root.getRight();
|
81
|
81
|
assertNotNull(right);
|
82
|
82
|
|
83
|
|
- final int actualRoot = root.getData();
|
84
|
|
- final int actualRight = right.getData();
|
|
83
|
+ int actualRoot = root.getData();
|
|
84
|
+ int actualRight = right.getData();
|
85
|
85
|
assertEquals(expectedRight, actualRight);
|
86
|
86
|
assertEquals(expectedRoot, actualRoot);
|
87
|
87
|
}
|
|
@@ -131,7 +131,7 @@ public class BinarySearchTreeTest {
|
131
|
131
|
List<Integer> actual = binarySearchTree.getAsSortedList();
|
132
|
132
|
assertEquals(expected, actual);
|
133
|
133
|
}
|
134
|
|
-
|
|
134
|
+
|
135
|
135
|
@Ignore("Remove to run test")
|
136
|
136
|
@Test
|
137
|
137
|
public void sortsCollectionOfTwoIfSecondNumberisSameAsFirst() {
|