Skip to content

Commit 9e33cc0

Browse files
david-truongbrianchandotcom
david-truong
authored and
brianchandotcom
committed
LPD-75880 fix tests
1 parent 50ee16b commit 9e33cc0

File tree

2 files changed

+41
-44
lines changed

2 files changed

+41
-44
lines changed

‎modules/apps/change-tracking/change-tracking-service/src/test/java/com/liferay/change/tracking/internal/CTEnclosureUtilTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717
import com.liferay.portal.test.rule.LiferayUnitTestRule;
1818

1919
import java.util.AbstractMap;
20-
import java.util.ArrayList;
2120
import java.util.Arrays;
2221
import java.util.Collection;
2322
import java.util.Collections;
2423
import java.util.HashSet;
25-
import java.util.List;
24+
import java.util.LinkedHashSet;
2625
import java.util.Map;
2726
import java.util.Set;
2827

@@ -56,14 +55,14 @@ public void testEnclosureUtil() {
5655
Node node5 = new Node(3, 5);
5756
Node node6 = new Node(4, 6);
5857

59-
List<Node> nodes = new ArrayList<>(
58+
Set<Node> nodes = new LinkedHashSet<>(
6059
Arrays.asList(node1, node2, node3, node4, node5));
6160

6261
CTClosure ctClosure = new CTClosureImpl(
6362
1,
6463
ReflectionTestUtil.invoke(
6564
new CTClosureFactoryImpl(), "_getNodeMap",
66-
new Class<?>[] {List.class, Map.class}, nodes,
65+
new Class<?>[] {Collection.class, Map.class}, nodes,
6766
HashMapBuilder.<Node, Collection<Edge>>put(
6867
node1,
6968
Arrays.asList(

‎modules/apps/change-tracking/change-tracking-service/src/test/java/com/liferay/change/tracking/internal/closure/CTClosureImplTest.java‎

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
import com.liferay.portal.kernel.util.HashMapBuilder;
1414
import com.liferay.portal.test.rule.LiferayUnitTestRule;
1515

16-
import java.util.ArrayList;
1716
import java.util.Arrays;
1817
import java.util.Collection;
1918
import java.util.Collections;
19+
import java.util.LinkedHashSet;
2020
import java.util.List;
2121
import java.util.Map;
22+
import java.util.Set;
2223

2324
import org.junit.Assert;
2425
import org.junit.ClassRule;
@@ -44,20 +45,19 @@ public void testCTClosureImpl() {
4445
Node node4 = new Node(4, 4);
4546
Node node5 = new Node(5, 5);
4647

47-
List<Node> nodes = new ArrayList<>(
48+
Set<Node> nodes = new LinkedHashSet<>(
4849
Arrays.asList(node1, node2, node3, node4, node5));
4950

5051
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
5152
new CTClosureFactoryImpl(), "_getNodeMap",
52-
new Class<?>[] {List.class, Map.class}, nodes,
53+
new Class<?>[] {Collection.class, Map.class}, nodes,
5354
HashMapBuilder.<Node, Collection<Edge>>put(
5455
node1,
55-
Arrays.asList(
56+
Set.of(
5657
new Edge(node1, node2), new Edge(node1, node3),
5758
new Edge(node1, node4))
5859
).put(
59-
node2,
60-
Arrays.asList(new Edge(node2, node3), new Edge(node2, node4))
60+
node2, Set.of(new Edge(node2, node3), new Edge(node2, node4))
6161
).put(
6262
node3, Collections.singleton(new Edge(node3, node4))
6363
).build());
@@ -124,33 +124,32 @@ public void testIntersectingCycles() {
124124
Node node3 = new Node(1, 3);
125125
Node node4 = new Node(1, 4);
126126

127-
List<Node> nodes = new ArrayList<>(
127+
Set<Node> nodes = new LinkedHashSet<>(
128128
Arrays.asList(node1, node2, node3, node4));
129129

130130
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
131131
new CTClosureFactoryImpl(), "_getNodeMap",
132-
new Class<?>[] {List.class, Map.class}, nodes,
132+
new Class<?>[] {Collection.class, Map.class}, nodes,
133133
HashMapBuilder.<Node, Collection<Edge>>put(
134-
node1, Collections.singletonList(new Edge(node1, node2))
134+
node1, Collections.singleton(new Edge(node1, node2))
135135
).put(
136-
node2, Collections.singletonList(new Edge(node2, node3))
136+
node2, Collections.singleton(new Edge(node2, node3))
137137
).put(
138138
node3,
139-
Arrays.asList(
139+
Set.of(
140140
new Edge(node3, node1), new Edge(node3, node2),
141141
new Edge(node3, node4))
142142
).put(
143-
node4, Collections.singletonList(new Edge(node4, node2))
143+
node4, Collections.singleton(new Edge(node4, node2))
144144
).build());
145145

146146
Assert.assertEquals(
147-
Collections.singletonList(node3), nodeMap.remove(new Node(0, 0)));
147+
Collections.singleton(node3), nodeMap.remove(new Node(0, 0)));
148148

149-
Assert.assertEquals(
150-
Arrays.asList(node1, node2, node4), nodeMap.remove(node3));
149+
Assert.assertEquals(Set.of(node1, node2, node4), nodeMap.remove(node3));
151150

152151
Assert.assertEquals(
153-
Collections.singletonList(node2), nodeMap.remove(node4));
152+
Collections.singleton(node2), nodeMap.remove(node4));
154153

155154
Assert.assertTrue(nodeMap.toString(), nodeMap.isEmpty());
156155
}
@@ -160,11 +159,11 @@ public void testRoot() {
160159
Node node1 = new Node(1, 1);
161160
Node node2 = new Node(1, 2);
162161

163-
List<Node> nodes = new ArrayList<>(Arrays.asList(node1, node2));
162+
Set<Node> nodes = new LinkedHashSet<>(Arrays.asList(node1, node2));
164163

165164
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
166165
new CTClosureFactoryImpl(), "_getNodeMap",
167-
new Class<?>[] {List.class, Map.class}, nodes,
166+
new Class<?>[] {Collection.class, Map.class}, nodes,
168167
Collections.emptyMap());
169168

170169
Assert.assertEquals(nodeMap.toString(), 1, nodeMap.size());
@@ -178,13 +177,13 @@ public void testSelfCycle() {
178177

179178
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
180179
new CTClosureFactoryImpl(), "_getNodeMap",
181-
new Class<?>[] {List.class, Map.class},
182-
Collections.singletonList(node1),
180+
new Class<?>[] {Collection.class, Map.class},
181+
Collections.singleton(node1),
183182
Collections.singletonMap(
184-
node1, Collections.singletonList(new Edge(node1, node1))));
183+
node1, Collections.singleton(new Edge(node1, node1))));
185184

186185
Assert.assertEquals(
187-
Collections.singletonList(node1), nodeMap.remove(new Node(0, 0)));
186+
Collections.singleton(node1), nodeMap.remove(new Node(0, 0)));
188187

189188
Assert.assertTrue(nodeMap.toString(), nodeMap.isEmpty());
190189
}
@@ -194,22 +193,22 @@ public void testSimpleCycle() {
194193
Node node1 = new Node(1, 1);
195194
Node node2 = new Node(1, 2);
196195

197-
List<Node> nodes = new ArrayList<>(Arrays.asList(node1, node2));
196+
Set<Node> nodes = new LinkedHashSet<>(Arrays.asList(node1, node2));
198197

199198
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
200199
new CTClosureFactoryImpl(), "_getNodeMap",
201-
new Class<?>[] {List.class, Map.class}, nodes,
200+
new Class<?>[] {Collection.class, Map.class}, nodes,
202201
HashMapBuilder.<Node, Collection<Edge>>put(
203-
node1, Collections.singletonList(new Edge(node1, node2))
202+
node1, Collections.singleton(new Edge(node1, node2))
204203
).put(
205-
node2, Collections.singletonList(new Edge(node2, node1))
204+
node2, Collections.singleton(new Edge(node2, node1))
206205
).build());
207206

208207
Assert.assertEquals(
209-
Collections.singletonList(node2), nodeMap.remove(new Node(0, 0)));
208+
Collections.singleton(node2), nodeMap.remove(new Node(0, 0)));
210209

211210
Assert.assertEquals(
212-
Collections.singletonList(node1), nodeMap.remove(node2));
211+
Collections.singleton(node1), nodeMap.remove(node2));
213212

214213
Assert.assertTrue(nodeMap.toString(), nodeMap.isEmpty());
215214
}
@@ -222,32 +221,31 @@ public void testTreeConverges() {
222221
Node node4 = new Node(1, 4);
223222
Node node5 = new Node(1, 5);
224223

225-
List<Node> nodes = new ArrayList<>(
224+
Set<Node> nodes = new LinkedHashSet<>(
226225
Arrays.asList(node1, node2, node3, node4, node5));
227226

228227
Map<Node, Collection<Node>> nodeMap = ReflectionTestUtil.invoke(
229228
new CTClosureFactoryImpl(), "_getNodeMap",
230-
new Class<?>[] {List.class, Map.class}, nodes,
229+
new Class<?>[] {Collection.class, Map.class}, nodes,
231230
HashMapBuilder.<Node, Collection<Edge>>put(
232-
node1, Collections.singletonList(new Edge(node1, node2))
231+
node1, Collections.singleton(new Edge(node1, node2))
233232
).put(
234-
node2,
235-
Arrays.asList(new Edge(node2, node3), new Edge(node2, node4))
233+
node2, Set.of(new Edge(node2, node3), new Edge(node2, node4))
236234
).put(
237-
node3, Collections.singletonList(new Edge(node3, node4))
235+
node3, Collections.singleton(new Edge(node3, node4))
238236
).put(
239-
node4, Collections.singletonList(new Edge(node4, node5))
237+
node4, Collections.singleton(new Edge(node4, node5))
240238
).build());
241239

242240
Assert.assertEquals(
243-
Collections.singletonList(node1), nodeMap.remove(new Node(0, 0)));
241+
Collections.singleton(node1), nodeMap.remove(new Node(0, 0)));
244242
Assert.assertEquals(
245-
Collections.singletonList(node2), nodeMap.remove(node1));
246-
Assert.assertEquals(Arrays.asList(node3, node4), nodeMap.remove(node2));
243+
Collections.singleton(node2), nodeMap.remove(node1));
244+
Assert.assertEquals(Set.of(node3, node4), nodeMap.remove(node2));
247245
Assert.assertEquals(
248-
Collections.singletonList(node4), nodeMap.remove(node3));
246+
Collections.singleton(node4), nodeMap.remove(node3));
249247
Assert.assertEquals(
250-
Collections.singletonList(node5), nodeMap.remove(node4));
248+
Collections.singleton(node5), nodeMap.remove(node4));
251249
Assert.assertTrue(nodeMap.toString(), nodeMap.isEmpty());
252250
}
253251

0 commit comments

Comments
 (0)