modified return type of TreasureChestItemIterator's constructor to be Iterator
This commit is contained in:
parent
1c2ddfad54
commit
e6f84f2f41
@ -18,6 +18,7 @@
|
|||||||
*/
|
*/
|
||||||
package com.iluwatar.iterator.list;
|
package com.iluwatar.iterator.list;
|
||||||
|
|
||||||
|
import com.iluwatar.iterator.Iterator;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -47,7 +48,7 @@ public class TreasureChest {
|
|||||||
items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
|
items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public TreasureChestItemIterator iterator(ItemType itemType) {
|
public Iterator iterator(ItemType itemType) {
|
||||||
return new TreasureChestItemIterator(this, itemType);
|
return new TreasureChestItemIterator(this, itemType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
|||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
import static org.junit.jupiter.api.Assertions.fail;
|
import static org.junit.jupiter.api.Assertions.fail;
|
||||||
|
|
||||||
|
import com.iluwatar.iterator.Iterator;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.junit.jupiter.params.ParameterizedTest;
|
import org.junit.jupiter.params.ParameterizedTest;
|
||||||
@ -62,11 +63,11 @@ public class TreasureChestTest {
|
|||||||
@MethodSource("dataProvider")
|
@MethodSource("dataProvider")
|
||||||
public void testIterator(Item expectedItem) {
|
public void testIterator(Item expectedItem) {
|
||||||
final TreasureChest chest = new TreasureChest();
|
final TreasureChest chest = new TreasureChest();
|
||||||
final TreasureChestItemIterator iterator = chest.iterator(expectedItem.getType());
|
final Iterator iterator = chest.iterator(expectedItem.getType());
|
||||||
assertNotNull(iterator);
|
assertNotNull(iterator);
|
||||||
|
|
||||||
while (iterator.hasNext()) {
|
while (iterator.hasNext()) {
|
||||||
final Item item = iterator.next();
|
final Item item = (Item) iterator.next();
|
||||||
assertNotNull(item);
|
assertNotNull(item);
|
||||||
assertEquals(expectedItem.getType(), item.getType());
|
assertEquals(expectedItem.getType(), item.getType());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user