Skip to content

Commit d81e423

Browse files
committed
Give proper name to class: EquivalentTrees->EquivalentNodesOfTree
Adjust method names accordingly
1 parent fdfb084 commit d81e423

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

src/main/java/by/andd3dfx/tree/equivalent/EquivalentTrees.java renamed to src/main/java/by/andd3dfx/tree/equivalent/EquivalentNodesOfTree.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
* }
2424
* </pre>
2525
*/
26-
public class EquivalentTrees {
26+
public class EquivalentNodesOfTree {
2727

28-
public List<Node> findEquivalentSubtrees(Node root) {
28+
public List<Node> findEquivalentNodes(Node root) {
2929
if (root == null) {
3030
return null;
3131
}

src/test/java/by/andd3dfx/tree/equivalent/EquivalentTreesTest.java renamed to src/test/java/by/andd3dfx/tree/equivalent/EquivalentNodesOfTreeTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
import static org.hamcrest.CoreMatchers.nullValue;
1212
import static org.hamcrest.MatcherAssert.assertThat;
1313

14-
public class EquivalentTreesTest {
14+
public class EquivalentNodesOfTreeTest {
1515

16-
private EquivalentTrees equivalentTrees;
16+
private EquivalentNodesOfTree equivalentNodesOfTree;
1717

1818
@Before
1919
public void setUp() {
20-
equivalentTrees = new EquivalentTrees();
20+
equivalentNodesOfTree = new EquivalentNodesOfTree();
2121
}
2222

2323
@Test
24-
public void findEquivalentSubtreesForNull() {
25-
assertThat(equivalentTrees.findEquivalentSubtrees(null), is(nullValue()));
24+
public void findEquivalentNodesForNull() {
25+
assertThat(equivalentNodesOfTree.findEquivalentNodes(null), is(nullValue()));
2626
}
2727

2828
/**
@@ -31,9 +31,9 @@ public void findEquivalentSubtreesForNull() {
3131
* </pre>
3232
*/
3333
@Test
34-
public void findEquivalentSubtreesForRootNodeOnly() {
34+
public void findEquivalentNodesForRootNodeOnly() {
3535
Node node = new Node('A');
36-
assertThat(equivalentTrees.findEquivalentSubtrees(node), is(nullValue()));
36+
assertThat(equivalentNodesOfTree.findEquivalentNodes(node), is(nullValue()));
3737
}
3838

3939
/**
@@ -44,10 +44,10 @@ public void findEquivalentSubtreesForRootNodeOnly() {
4444
* </pre>
4545
*/
4646
@Test
47-
public void findEquivalentSubtreesWhenNoCandidates() {
47+
public void findEquivalentNodesWhenNoCandidates() {
4848
Node node = new Node('A');
4949
node.left = new Node('B');
50-
assertThat(equivalentTrees.findEquivalentSubtrees(node), is(nullValue()));
50+
assertThat(equivalentNodesOfTree.findEquivalentNodes(node), is(nullValue()));
5151
}
5252

5353
/**
@@ -58,12 +58,12 @@ public void findEquivalentSubtreesWhenNoCandidates() {
5858
* </pre>
5959
*/
6060
@Test
61-
public void findEquivalentSubtreesWhenOneCandidate() {
61+
public void findEquivalentNodesWhenOneCandidate() {
6262
Node node = new Node('A');
6363
node.left = new Node('B');
6464
node.right = new Node('C');
6565

66-
List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
66+
List<Node> result = equivalentNodesOfTree.findEquivalentNodes(node);
6767

6868
assertThat(result.size(), is(2));
6969
assertThat(result, hasItems(node.left, node.right));
@@ -79,14 +79,14 @@ public void findEquivalentSubtreesWhenOneCandidate() {
7979
* </pre>
8080
*/
8181
@Test
82-
public void findEquivalentSubtreesSymmetricCase() {
82+
public void findEquivalentNodesSymmetricCase() {
8383
Node node = new Node('A');
8484
node.left = new Node('B');
8585
node.left.left = new Node('X');
8686
node.right = new Node('B');
8787
node.right.right = new Node('X');
8888

89-
List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
89+
List<Node> result = equivalentNodesOfTree.findEquivalentNodes(node);
9090

9191
assertThat(result.size(), is(2));
9292
assertThat(result, hasItems(node.left, node.right));
@@ -104,15 +104,15 @@ public void findEquivalentSubtreesSymmetricCase() {
104104
* </pre>
105105
*/
106106
@Test
107-
public void findEquivalentSubtreesAsymmetricCase() {
107+
public void findEquivalentNodesAsymmetricCase() {
108108
Node node = new Node('A');
109109
node.left = new Node('B');
110110
node.left.left = new Node('X');
111111
node.right = new Node('B');
112112
node.right.right = new Node('C');
113113
node.right.right.right = new Node('X');
114114

115-
List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
115+
List<Node> result = equivalentNodesOfTree.findEquivalentNodes(node);
116116

117117
assertThat(result.size(), is(2));
118118
assertThat(result, hasItems(node.left, node.right.right));
@@ -130,15 +130,15 @@ public void findEquivalentSubtreesAsymmetricCase() {
130130
* </pre>
131131
*/
132132
@Test
133-
public void findEquivalentSubtreesAsymmetricCaseShouldChooseNodesWithMaxSubtreeSize() {
133+
public void findEquivalentNodesAsymmetricCaseShouldChooseNodesWithMaxSubtreeSize() {
134134
Node node = new Node('A');
135135
node.left = new Node('B');
136136
node.left.left = new Node('X');
137137
node.right = new Node('B');
138138
node.right.right = new Node('X');
139139
node.right.right.right = new Node('X');
140140

141-
List<Node> result = equivalentTrees.findEquivalentSubtrees(node);
141+
List<Node> result = equivalentNodesOfTree.findEquivalentNodes(node);
142142

143143
assertThat(result.size(), is(2));
144144
assertThat(result, hasItems(node.left, node.right));
@@ -158,7 +158,7 @@ public void findEquivalentSubtreesAsymmetricCaseShouldChooseNodesWithMaxSubtreeS
158158
* </pre>
159159
*/
160160
@Test
161-
public void findEquivalentSubtreesComplexCase() {
161+
public void findEquivalentNodesComplexCase() {
162162
Node root = new Node('A');
163163
root.left = new Node('B');
164164
root.right = new Node('C');
@@ -173,7 +173,7 @@ public void findEquivalentSubtreesComplexCase() {
173173
root.right.right.right.left = new Node('D');
174174
root.right.right.right.right = new Node('E');
175175

176-
List<Node> result = equivalentTrees.findEquivalentSubtrees(root);
176+
List<Node> result = equivalentNodesOfTree.findEquivalentNodes(root);
177177

178178
assertThat("Two nodes expected", result.size(), is(2));
179179
assertThat("Left node is absent", result, hasItem(root.left));

0 commit comments

Comments
 (0)