Skip to content

Commit ecf5444

Browse files
garydgregorygarydgregory
committed
Sort members
1 parent 87408a0 commit ecf5444

File tree

3 files changed

+105
-105
lines changed

3 files changed

+105
-105
lines changed

‎src/test/java/org/apache/commons/collections4/SetUtilsTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,6 @@ void testpredicatedSet() {
211211
assertThrows(NullPointerException.class, () -> SetUtils.predicatedSet(null, predicate), "Expecting NullPointerException for null set.");
212212
}
213213

214-
@Test
215-
void testUnion() {
216-
final SetView<Integer> set = SetUtils.union(setA, setB);
217-
assertEquals(7, set.size());
218-
assertTrue(set.containsAll(setA));
219-
assertTrue(set.containsAll(setB));
220-
final Set<Integer> set2 = SetUtils.union(setA, SetUtils.<Integer>emptySet());
221-
assertEquals(setA, set2);
222-
assertThrows(NullPointerException.class, () -> SetUtils.union(setA, null));
223-
assertThrows(NullPointerException.class, () -> SetUtils.union(null, setA));
224-
}
225-
226214
@ParameterizedTest
227215
@ValueSource(booleans = {true, false})
228216
void testReverseNestedUnionPerfomWell(final boolean mergeLeft) {
@@ -248,6 +236,18 @@ void testReverseNestedUnionPerfomWell(final boolean mergeLeft) {
248236
});
249237
}
250238

239+
@Test
240+
void testUnion() {
241+
final SetView<Integer> set = SetUtils.union(setA, setB);
242+
assertEquals(7, set.size());
243+
assertTrue(set.containsAll(setA));
244+
assertTrue(set.containsAll(setB));
245+
final Set<Integer> set2 = SetUtils.union(setA, SetUtils.<Integer>emptySet());
246+
assertEquals(setA, set2);
247+
assertThrows(NullPointerException.class, () -> SetUtils.union(setA, null));
248+
assertThrows(NullPointerException.class, () -> SetUtils.union(null, setA));
249+
}
250+
251251
@Test
252252
void testUnmodifiableSet() {
253253
final Set<?> set1 = SetUtils.unmodifiableSet();

‎src/test/java/org/apache/commons/collections4/iterators/IteratorChainTest.java‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,54 @@ public void setUp() {
9191
list3.add("Six");
9292
}
9393

94+
@Test
95+
public void testChaining() {
96+
IteratorChain<String> chain = new IteratorChain<>();
97+
chain.addIterator(list1.iterator());
98+
chain = new IteratorChain<>(chain);
99+
chain.addIterator(list2.iterator());
100+
chain = new IteratorChain<>(chain);
101+
chain.addIterator(list3.iterator());
102+
103+
for (final String testValue : testArray) {
104+
assertTrue(chain.hasNext(), "chain contains values");
105+
assertTrue(chain.hasNext(), "hasNext doesn't change on 2nd invocation");
106+
final String iterValue = chain.next();
107+
assertEquals(testValue, iterValue, "Iteration value is correct");
108+
if (!iterValue.equals("Four")) {
109+
chain.remove();
110+
}
111+
}
112+
assertFalse(chain.hasNext(), "all values got iterated");
113+
assertTrue(list1.isEmpty(), "List is empty");
114+
assertEquals(1, list2.size(), "List is empty");
115+
assertTrue(list3.isEmpty(), "List is empty");
116+
}
117+
118+
@Test
119+
public void testChainingPerformsWell() {
120+
Iterator<String> iter = makeObject();
121+
for (int i = 0; i < 150; i++) {
122+
final IteratorChain<String> chain = new IteratorChain<>();
123+
chain.addIterator(iter);
124+
iter = chain;
125+
}
126+
final Iterator<String> iterFinal = iter;
127+
assertTimeoutPreemptively(Duration.ofSeconds(1), () -> {
128+
for (final String testValue : testArray) {
129+
final String iterValue = iterFinal.next();
130+
assertEquals(testValue, iterValue, "Iteration value is correct");
131+
if (!iterValue.equals("Four")) {
132+
iterFinal.remove();
133+
}
134+
}
135+
assertFalse(iterFinal.hasNext(), "all values got iterated");
136+
assertTrue(list1.isEmpty(), "List is empty");
137+
assertEquals(1, list2.size(), "List is empty");
138+
assertTrue(list3.isEmpty(), "List is empty");
139+
});
140+
}
141+
94142
@Test
95143
void testConstructList() {
96144
final List<Iterator<String>> list = new ArrayList<>();
@@ -135,6 +183,22 @@ void testFirstIteratorIsEmptyBug() {
135183
assertFalse(chain.hasNext(), "should not change");
136184
}
137185

186+
@Test
187+
public void testHasNextIsInvokedOnEdgeBeforeRemove() {
188+
final Iterator<String> iter = makeObject();
189+
assertEquals(iter.next(), "One");
190+
assertEquals(iter.next(), "Two");
191+
assertEquals(iter.next(), "Three");
192+
assertTrue(iter.hasNext(), "next elements exists");
193+
iter.remove(); // though hasNext() on next iterator has been invoked, removing an element on old iterator must still work
194+
assertTrue(iter.hasNext(), "next elements exists");
195+
assertEquals(iter.next(), "Four");
196+
197+
assertEquals(list1, Arrays.asList("One", "Two")); // Three must be gone
198+
assertEquals(list2, Arrays.asList("Four")); // Four still be there
199+
assertEquals(list3, Arrays.asList("Five", "Six")); // Five+Six anyway
200+
}
201+
138202
@Test
139203
void testIterator() {
140204
final Iterator<String> iter = makeObject();
@@ -174,70 +238,6 @@ public void testRemoveDoubleCallShouldFail() {
174238
assertThrows(IllegalStateException.class, () -> iter.remove());
175239
}
176240

177-
@Test
178-
public void testHasNextIsInvokedOnEdgeBeforeRemove() {
179-
final Iterator<String> iter = makeObject();
180-
assertEquals(iter.next(), "One");
181-
assertEquals(iter.next(), "Two");
182-
assertEquals(iter.next(), "Three");
183-
assertTrue(iter.hasNext(), "next elements exists");
184-
iter.remove(); // though hasNext() on next iterator has been invoked, removing an element on old iterator must still work
185-
assertTrue(iter.hasNext(), "next elements exists");
186-
assertEquals(iter.next(), "Four");
187-
188-
assertEquals(list1, Arrays.asList("One", "Two")); // Three must be gone
189-
assertEquals(list2, Arrays.asList("Four")); // Four still be there
190-
assertEquals(list3, Arrays.asList("Five", "Six")); // Five+Six anyway
191-
}
192-
193-
@Test
194-
public void testChainingPerformsWell() {
195-
Iterator<String> iter = makeObject();
196-
for (int i = 0; i < 150; i++) {
197-
final IteratorChain<String> chain = new IteratorChain<>();
198-
chain.addIterator(iter);
199-
iter = chain;
200-
}
201-
final Iterator<String> iterFinal = iter;
202-
assertTimeoutPreemptively(Duration.ofSeconds(1), () -> {
203-
for (final String testValue : testArray) {
204-
final String iterValue = iterFinal.next();
205-
assertEquals(testValue, iterValue, "Iteration value is correct");
206-
if (!iterValue.equals("Four")) {
207-
iterFinal.remove();
208-
}
209-
}
210-
assertFalse(iterFinal.hasNext(), "all values got iterated");
211-
assertTrue(list1.isEmpty(), "List is empty");
212-
assertEquals(1, list2.size(), "List is empty");
213-
assertTrue(list3.isEmpty(), "List is empty");
214-
});
215-
}
216-
217-
@Test
218-
public void testChaining() {
219-
IteratorChain<String> chain = new IteratorChain<>();
220-
chain.addIterator(list1.iterator());
221-
chain = new IteratorChain<>(chain);
222-
chain.addIterator(list2.iterator());
223-
chain = new IteratorChain<>(chain);
224-
chain.addIterator(list3.iterator());
225-
226-
for (final String testValue : testArray) {
227-
assertTrue(chain.hasNext(), "chain contains values");
228-
assertTrue(chain.hasNext(), "hasNext doesn't change on 2nd invocation");
229-
final String iterValue = chain.next();
230-
assertEquals(testValue, iterValue, "Iteration value is correct");
231-
if (!iterValue.equals("Four")) {
232-
chain.remove();
233-
}
234-
}
235-
assertFalse(chain.hasNext(), "all values got iterated");
236-
assertTrue(list1.isEmpty(), "List is empty");
237-
assertEquals(1, list2.size(), "List is empty");
238-
assertTrue(list3.isEmpty(), "List is empty");
239-
}
240-
241241
@Test
242242
void testRemoveFromFilteredIterator() {
243243

‎src/test/java/org/apache/commons/collections4/multimap/AbstractMultiValuedMapTest.java‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,12 @@ public void resetFull() {
247247

248248
}
249249

250-
public class MultiValuedMapKeysTest extends AbstractMultiSetTest<K> {
250+
public class MultiValuedMapKeySetTest extends AbstractSetTest<K> {
251251

252+
@SuppressWarnings("unchecked")
252253
@Override
253254
public K[] getFullElements() {
254-
return getSampleKeys();
255+
return (K[]) AbstractMultiValuedMapTest.this.makeFullMap().keySet().toArray();
255256
}
256257

257258
@Override
@@ -271,7 +272,7 @@ public boolean isNullSupported() {
271272

272273
@Override
273274
public boolean isRemoveSupported() {
274-
return false;
275+
return AbstractMultiValuedMapTest.this.isRemoveSupported();
275276
}
276277

277278
@Override
@@ -280,36 +281,21 @@ public boolean isTestSerialization() {
280281
}
281282

282283
@Override
283-
public MultiSet<K> makeFullCollection() {
284-
return AbstractMultiValuedMapTest.this.makeFullMap().keys();
285-
}
286-
287-
@Override
288-
public MultiSet<K> makeObject() {
289-
return AbstractMultiValuedMapTest.this.makeObject().keys();
290-
}
291-
292-
@Override
293-
public void resetEmpty() {
294-
AbstractMultiValuedMapTest.this.resetEmpty();
295-
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
296-
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
284+
public Set<K> makeFullCollection() {
285+
return AbstractMultiValuedMapTest.this.makeFullMap().keySet();
297286
}
298287

299288
@Override
300-
public void resetFull() {
301-
AbstractMultiValuedMapTest.this.resetFull();
302-
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
303-
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
289+
public Set<K> makeObject() {
290+
return AbstractMultiValuedMapTest.this.makeObject().keySet();
304291
}
305292
}
306293

307-
public class MultiValuedMapKeySetTest extends AbstractSetTest<K> {
294+
public class MultiValuedMapKeysTest extends AbstractMultiSetTest<K> {
308295

309-
@SuppressWarnings("unchecked")
310296
@Override
311297
public K[] getFullElements() {
312-
return (K[]) AbstractMultiValuedMapTest.this.makeFullMap().keySet().toArray();
298+
return getSampleKeys();
313299
}
314300

315301
@Override
@@ -329,7 +315,7 @@ public boolean isNullSupported() {
329315

330316
@Override
331317
public boolean isRemoveSupported() {
332-
return AbstractMultiValuedMapTest.this.isRemoveSupported();
318+
return false;
333319
}
334320

335321
@Override
@@ -338,13 +324,27 @@ public boolean isTestSerialization() {
338324
}
339325

340326
@Override
341-
public Set<K> makeFullCollection() {
342-
return AbstractMultiValuedMapTest.this.makeFullMap().keySet();
327+
public MultiSet<K> makeFullCollection() {
328+
return AbstractMultiValuedMapTest.this.makeFullMap().keys();
343329
}
344330

345331
@Override
346-
public Set<K> makeObject() {
347-
return AbstractMultiValuedMapTest.this.makeObject().keySet();
332+
public MultiSet<K> makeObject() {
333+
return AbstractMultiValuedMapTest.this.makeObject().keys();
334+
}
335+
336+
@Override
337+
public void resetEmpty() {
338+
AbstractMultiValuedMapTest.this.resetEmpty();
339+
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
340+
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
341+
}
342+
343+
@Override
344+
public void resetFull() {
345+
AbstractMultiValuedMapTest.this.resetFull();
346+
setCollection(AbstractMultiValuedMapTest.this.getMap().keys());
347+
MultiValuedMapKeysTest.this.setConfirmed(AbstractMultiValuedMapTest.this.getConfirmed().keys());
348348
}
349349
}
350350

0 commit comments

Comments
 (0)