Sfoglia il codice sorgente

Renamed classes and added @Before method to test class

changed variable name and made it private
Eddie Legg 9 anni fa
parent
commit
56cb04394e

exercises/binary-search-tree/.meta/src/reference/java/BST.java → exercises/binary-search-tree/.meta/src/reference/java/BinarySearchTree.java Vedi File

5
 import java.util.List;
5
 import java.util.List;
6
 import java.util.Queue;
6
 import java.util.Queue;
7
 
7
 
8
-public class BST<T extends Comparable<T>> {
8
+public class BinarySearchTree<T extends Comparable<T>> {
9
 
9
 
10
     public static class Node<T> {
10
     public static class Node<T> {
11
 
11
 

exercises/binary-search-tree/src/test/java/BSTTest.java → exercises/binary-search-tree/src/test/java/BinarySearchTreeTest.java Vedi File

6
 import static org.junit.Assert.assertNotNull;
6
 import static org.junit.Assert.assertNotNull;
7
 import org.junit.Ignore;
7
 import org.junit.Ignore;
8
 import org.junit.Test;
8
 import org.junit.Test;
9
+import org.junit.Before;
9
 
10
 
10
-public class BSTTest {
11
+public class BinarySearchTreeTest {
12
+    private BinarySearchTree<Integer> binarySearchTree;
13
+
14
+    @Before
15
+    public void setUp() {
16
+        binarySearchTree = new BinarySearchTree<>();
17
+    }
11
 
18
 
12
     @Test
19
     @Test
13
     public void dataIsRetained() {
20
     public void dataIsRetained() {
14
-        BST<Integer> bst = new BST<>();
15
         final int actual = 4;
21
         final int actual = 4;
16
-        bst.insert(actual);
17
-        final BST.Node<Integer> root = bst.getRoot();
22
+        binarySearchTree.insert(actual);
23
+        final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
18
         assertNotNull(root);
24
         assertNotNull(root);
19
         final int expected = root.getData();
25
         final int expected = root.getData();
20
         assertEquals(expected, actual);
26
         assertEquals(expected, actual);
23
     @Ignore("Remove to run test")
29
     @Ignore("Remove to run test")
24
     @Test
30
     @Test
25
     public void insertsLess() {
31
     public void insertsLess() {
26
-        BST<Integer> bst = new BST<>();
27
         final int expectedRoot = 4;
32
         final int expectedRoot = 4;
28
         final int expectedLeft = 2;
33
         final int expectedLeft = 2;
29
 
34
 
30
-        bst.insert(expectedRoot);
31
-        bst.insert(expectedLeft);
35
+        binarySearchTree.insert(expectedRoot);
36
+        binarySearchTree.insert(expectedLeft);
32
 
37
 
33
-        final BST.Node<Integer> root = bst.getRoot();
38
+        final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
34
         assertNotNull(root);
39
         assertNotNull(root);
35
-        final BST.Node<Integer> left = root.getLeft();
40
+        final BinarySearchTree.Node<Integer> left = root.getLeft();
36
         assertNotNull(left);
41
         assertNotNull(left);
37
 
42
 
38
         final int actualRoot = root.getData();
43
         final int actualRoot = root.getData();
44
     @Ignore("Remove to run test")
49
     @Ignore("Remove to run test")
45
     @Test
50
     @Test
46
     public void insertsSame() {
51
     public void insertsSame() {
47
-        BST<Integer> bst = new BST<>();
48
         final int expectedRoot = 4;
52
         final int expectedRoot = 4;
49
         final int expectedLeft = 4;
53
         final int expectedLeft = 4;
50
 
54
 
51
-        bst.insert(expectedRoot);
52
-        bst.insert(expectedLeft);
55
+        binarySearchTree.insert(expectedRoot);
56
+        binarySearchTree.insert(expectedLeft);
53
 
57
 
54
-        final BST.Node<Integer> root = bst.getRoot();
58
+        final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
55
         assertNotNull(root);
59
         assertNotNull(root);
56
-        final BST.Node<Integer> left = root.getLeft();
60
+        final BinarySearchTree.Node<Integer> left = root.getLeft();
57
         assertNotNull(left);
61
         assertNotNull(left);
58
 
62
 
59
         final int actualRoot = root.getData();
63
         final int actualRoot = root.getData();
65
     @Ignore("Remove to run test")
69
     @Ignore("Remove to run test")
66
     @Test
70
     @Test
67
     public void insertsRight() {
71
     public void insertsRight() {
68
-        BST<Integer> bst = new BST<>();
69
         final int expectedRoot = 4;
72
         final int expectedRoot = 4;
70
         final int expectedRight = 5;
73
         final int expectedRight = 5;
71
 
74
 
72
-        bst.insert(expectedRoot);
73
-        bst.insert(expectedRight);
75
+        binarySearchTree.insert(expectedRoot);
76
+        binarySearchTree.insert(expectedRight);
74
 
77
 
75
-        final BST.Node<Integer> root = bst.getRoot();
78
+        final BinarySearchTree.Node<Integer> root = binarySearchTree.getRoot();
76
         assertNotNull(root);
79
         assertNotNull(root);
77
-        final BST.Node<Integer> right = root.getRight();
80
+        final BinarySearchTree.Node<Integer> right = root.getRight();
78
         assertNotNull(right);
81
         assertNotNull(right);
79
 
82
 
80
         final int actualRoot = root.getData();
83
         final int actualRoot = root.getData();
86
     @Ignore("Remove to run test")
89
     @Ignore("Remove to run test")
87
     @Test
90
     @Test
88
     public void createsComplexTree() {
91
     public void createsComplexTree() {
89
-        BST<Integer> bst = new BST<>();
90
         List<Integer> expected = Collections.unmodifiableList(
92
         List<Integer> expected = Collections.unmodifiableList(
91
                 Arrays.asList(4, 2, 6, 1, 3, 5, 7)
93
                 Arrays.asList(4, 2, 6, 1, 3, 5, 7)
92
         );
94
         );
94
         List<Integer> treeData = Collections.unmodifiableList(
96
         List<Integer> treeData = Collections.unmodifiableList(
95
                 Arrays.asList(4, 2, 6, 1, 3, 7, 5)
97
                 Arrays.asList(4, 2, 6, 1, 3, 7, 5)
96
         );
98
         );
97
-        treeData.forEach(bst::insert);
99
+        treeData.forEach(binarySearchTree::insert);
98
 
100
 
99
-        List<Integer> actual = bst.getAsLevelOrderList();
101
+        List<Integer> actual = binarySearchTree.getAsLevelOrderList();
100
         assertEquals(expected, actual);
102
         assertEquals(expected, actual);
101
     }
103
     }
102
 
104
 
103
     @Ignore("Remove to run test")
105
     @Ignore("Remove to run test")
104
     @Test
106
     @Test
105
     public void sortsSingleElement() {
107
     public void sortsSingleElement() {
106
-        BST<Integer> bst = new BST<>();
107
         List<Integer> expected = Collections.unmodifiableList(
108
         List<Integer> expected = Collections.unmodifiableList(
108
                 Collections.singletonList(4)
109
                 Collections.singletonList(4)
109
         );
110
         );
110
 
111
 
111
-        bst.insert(4);
112
+        binarySearchTree.insert(4);
112
 
113
 
113
-        List<Integer> actual = bst.getAsSortedList();
114
+        List<Integer> actual = binarySearchTree.getAsSortedList();
114
         assertEquals(expected, actual);
115
         assertEquals(expected, actual);
115
     }
116
     }
116
 
117
 
117
     @Ignore("Remove to run test")
118
     @Ignore("Remove to run test")
118
     @Test
119
     @Test
119
     public void sortsCollectionOfTwoIfSecondInsertedIsSmallerThanFirst() {
120
     public void sortsCollectionOfTwoIfSecondInsertedIsSmallerThanFirst() {
120
-        BST<Integer> bst = new BST<>();
121
         List<Integer> expected = Collections.unmodifiableList(
121
         List<Integer> expected = Collections.unmodifiableList(
122
                 Arrays.asList(2, 4)
122
                 Arrays.asList(2, 4)
123
         );
123
         );
124
 
124
 
125
-        bst.insert(4);
126
-        bst.insert(2);
125
+        binarySearchTree.insert(4);
126
+        binarySearchTree.insert(2);
127
 
127
 
128
-        List<Integer> actual = bst.getAsSortedList();
128
+        List<Integer> actual = binarySearchTree.getAsSortedList();
129
         assertEquals(expected, actual);
129
         assertEquals(expected, actual);
130
     }
130
     }
131
 
131
 
132
     @Ignore("Remove to run test")
132
     @Ignore("Remove to run test")
133
     @Test
133
     @Test
134
     public void sortsCollectionOfTwoIfSecondInsertedIsBiggerThanFirst() {
134
     public void sortsCollectionOfTwoIfSecondInsertedIsBiggerThanFirst() {
135
-        BST<Integer> bst = new BST<>();
136
         List<Integer> expected = Collections.unmodifiableList(
135
         List<Integer> expected = Collections.unmodifiableList(
137
                 Arrays.asList(4, 5)
136
                 Arrays.asList(4, 5)
138
         );
137
         );
139
 
138
 
140
-        bst.insert(4);
141
-        bst.insert(5);
139
+        binarySearchTree.insert(4);
140
+        binarySearchTree.insert(5);
142
 
141
 
143
-        List<Integer> actual = bst.getAsSortedList();
142
+        List<Integer> actual = binarySearchTree.getAsSortedList();
144
         assertEquals(expected, actual);
143
         assertEquals(expected, actual);
145
     }
144
     }
146
 
145
 
147
     @Ignore("Remove to run test")
146
     @Ignore("Remove to run test")
148
     @Test
147
     @Test
149
     public void iteratesOverComplexTree() {
148
     public void iteratesOverComplexTree() {
150
-        BST<Integer> bst = new BST<>();
151
         List<Integer> expected = Collections.unmodifiableList(
149
         List<Integer> expected = Collections.unmodifiableList(
152
                 Arrays.asList(1, 2, 3, 4, 5, 6, 7)
150
                 Arrays.asList(1, 2, 3, 4, 5, 6, 7)
153
         );
151
         );
155
         List<Integer> treeData = Collections.unmodifiableList(
153
         List<Integer> treeData = Collections.unmodifiableList(
156
                 Arrays.asList(4, 2, 1, 3, 6, 7, 5)
154
                 Arrays.asList(4, 2, 1, 3, 6, 7, 5)
157
         );
155
         );
158
-        treeData.forEach(bst::insert);
156
+        treeData.forEach(binarySearchTree::insert);
159
 
157
 
160
-        List<Integer> actual = bst.getAsSortedList();
158
+        List<Integer> actual = binarySearchTree.getAsSortedList();
161
         assertEquals(expected, actual);
159
         assertEquals(expected, actual);
162
     }
160
     }
163
 }
161
 }