diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java index afa7995e34..cb82711de9 100644 --- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java +++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ItemCollectionListValueModelAdapterTests.java @@ -94,15 +94,15 @@ public class ItemCollectionListValueModelAdapterTests extends TestCase { assertEquals(6, synchList.size()); this.compare(listValueModel, synchList); - listHolder.addItem(6, this.tom); - listHolder.addItem(7, this.dick); - listHolder.addItem(8, this.harry); + listHolder.add(6, this.tom); + listHolder.add(7, this.dick); + listHolder.add(8, this.harry); assertEquals(9, synchList.size()); this.compare(listValueModel, synchList); - listHolder.removeItem(8); - listHolder.removeItem(0); - listHolder.removeItem(4); + listHolder.remove(8); + listHolder.remove(0); + listHolder.remove(4); assertEquals(6, synchList.size()); this.compare(listValueModel, synchList); } @@ -110,31 +110,31 @@ public class ItemCollectionListValueModelAdapterTests extends TestCase { private void compare(ListValueModel listValueModel, List list) { assertEquals(listValueModel.size(), list.size()); for (int i = 0; i < listValueModel.size(); i++) { - assertEquals(listValueModel.getItem(i), list.get(i)); + assertEquals(listValueModel.get(i), list.get(i)); } } public void testHasListeners() throws Exception { SimpleListValueModel listHolder = this.buildListHolder(); - assertFalse(listHolder.hasAnyListChangeListeners(ValueModel.VALUE)); + assertFalse(listHolder.hasAnyListChangeListeners(ListValueModel.LIST_VALUES)); assertFalse(this.foo.hasAnyListChangeListeners(Junk.STUFF_COLLECTION)); assertFalse(this.jaz.hasAnyListChangeListeners(Junk.STUFF_COLLECTION)); ListValueModel listValueModel = new ItemCollectionListValueModelAdapter(listHolder, Junk.STUFF_COLLECTION); - assertFalse(listHolder.hasAnyListChangeListeners(ValueModel.VALUE)); + assertFalse(listHolder.hasAnyListChangeListeners(ListValueModel.LIST_VALUES)); assertFalse(this.foo.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); assertFalse(this.jaz.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); this.verifyHasNoListeners(listValueModel); SynchronizedList synchList = new SynchronizedList(listValueModel); - assertTrue(listHolder.hasAnyListChangeListeners(ValueModel.VALUE)); + assertTrue(listHolder.hasAnyListChangeListeners(ListValueModel.LIST_VALUES)); assertTrue(this.foo.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); assertTrue(this.jaz.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); this.verifyHasListeners(listValueModel); - listValueModel.removeListChangeListener(ValueModel.VALUE, synchList); - assertFalse(listHolder.hasAnyListChangeListeners(ValueModel.VALUE)); + listValueModel.removeListChangeListener(ListValueModel.LIST_VALUES, synchList); + assertFalse(listHolder.hasAnyListChangeListeners(ListValueModel.LIST_VALUES)); assertFalse(this.foo.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); assertFalse(this.jaz.hasAnyCollectionChangeListeners(Junk.STUFF_COLLECTION)); this.verifyHasNoListeners(listValueModel); @@ -149,27 +149,27 @@ public class ItemCollectionListValueModelAdapterTests extends TestCase { assertEquals(6, synchList.size()); } - public void testGetElementAt() throws Exception { + public void testGet() throws Exception { SimpleListValueModel listHolder = this.buildListHolder(); ListValueModel listValueModel = new SortedListValueModelAdapter(new ItemCollectionListValueModelAdapter(listHolder, Junk.STUFF_COLLECTION)); SynchronizedList synchList = new SynchronizedList(listValueModel); this.verifyHasListeners(listValueModel); - assertEquals(this.bar, listValueModel.getItem(0)); + assertEquals(this.bar, listValueModel.get(0)); assertEquals(this.bar, synchList.get(0)); this.bar.removeStuff("bar"); this.bar.addStuff("zzz"); this.bar.addStuff("bar"); - assertEquals(this.bar, listValueModel.getItem(5)); + assertEquals(this.bar, listValueModel.get(5)); assertEquals(this.bar, synchList.get(5)); this.bar.removeStuff("zzz"); } private void verifyHasNoListeners(ListValueModel listValueModel) throws Exception { - assertTrue(((AbstractModel) listValueModel).hasNoListChangeListeners(ValueModel.VALUE)); + assertTrue(((AbstractModel) listValueModel).hasNoListChangeListeners(ListValueModel.LIST_VALUES)); } private void verifyHasListeners(ListValueModel listValueModel) throws Exception { - assertTrue(((AbstractModel) listValueModel).hasAnyListChangeListeners(ValueModel.VALUE)); + assertTrue(((AbstractModel) listValueModel).hasAnyListChangeListeners(ListValueModel.LIST_VALUES)); } private CollectionValueModel buildCollectionHolder() { |