diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java')
| -rw-r--r-- | jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java | 88 |
1 files changed, 43 insertions, 45 deletions
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java index 8d574a033c..536ba7a45a 100644 --- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java +++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java @@ -13,17 +13,17 @@ import org.eclipse.jpt.utility.internal.model.AbstractModel; import org.eclipse.jpt.utility.internal.model.event.PropertyChangeEvent; import org.eclipse.jpt.utility.internal.model.listener.PropertyChangeListener; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; -import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; +import org.eclipse.jpt.utility.internal.model.value.WritablePropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel; -import org.eclipse.jpt.utility.internal.model.value.ValueModel; +import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.tests.internal.TestTools; import junit.framework.TestCase; public class PropertyAspectAdapterTests extends TestCase { private TestSubject subject1; - private PropertyValueModel subjectHolder1; - private PropertyAspectAdapter aa1; + private WritablePropertyValueModel<TestSubject> subjectHolder1; + private PropertyAspectAdapter<TestSubject, String> aa1; private PropertyChangeEvent event1; private PropertyChangeListener listener1; @@ -42,34 +42,34 @@ public class PropertyAspectAdapterTests extends TestCase { protected void setUp() throws Exception { super.setUp(); this.subject1 = new TestSubject("foo", "test subject 1"); - this.subjectHolder1 = new SimplePropertyValueModel(this.subject1); + this.subjectHolder1 = new SimplePropertyValueModel<TestSubject> (this.subject1); this.aa1 = this.buildAspectAdapter(this.subjectHolder1); this.listener1 = this.buildValueChangeListener1(); - this.aa1.addPropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.addPropertyChangeListener(PropertyValueModel.VALUE, this.listener1); this.event1 = null; this.subject2 = new TestSubject("bar", "test subject 2"); } - private PropertyAspectAdapter buildAspectAdapter(ValueModel subjectHolder) { - return new PropertyAspectAdapter(subjectHolder, TestSubject.NAME_PROPERTY) { + private PropertyAspectAdapter<TestSubject, String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { + return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { // this is not a aspect adapter - the value is determined by the aspect name @Override - protected Object buildValue_() { + protected String buildValue_() { if (this.propertyNames[0] == TestSubject.NAME_PROPERTY) { - return ((TestSubject) this.subject).getName(); + return this.subject.getName(); } else if (this.propertyNames[0] == TestSubject.DESCRIPTION_PROPERTY) { - return ((TestSubject) this.subject).getDescription(); + return this.subject.getDescription(); } else { throw new IllegalStateException("invalid aspect name: " + this.propertyNames[0]); } } @Override - protected void setValue_(Object value) { + protected void setValue_(String value) { if (this.propertyNames[0] == TestSubject.NAME_PROPERTY) { - ((TestSubject) this.subject).setName((String) value); + this.subject.setName(value); } else if (this.propertyNames[0] == TestSubject.DESCRIPTION_PROPERTY) { - ((TestSubject) this.subject).setDescription((String) value); + this.subject.setDescription(value); } else { throw new IllegalStateException("invalid aspect name: " + this.propertyNames[0]); } @@ -102,7 +102,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subjectHolder1.setValue(this.subject2); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals("foo", this.event1.oldValue()); assertEquals("bar", this.event1.newValue()); assertEquals("bar", this.aa1.value()); @@ -111,7 +111,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subjectHolder1.setValue(null); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals("bar", this.event1.oldValue()); assertNull(this.event1.newValue()); assertNull(this.aa1.value()); @@ -120,7 +120,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subjectHolder1.setValue(this.subject1); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals(null, this.event1.oldValue()); assertEquals("foo", this.event1.newValue()); assertEquals("foo", this.aa1.value()); @@ -133,7 +133,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subject1.setName("baz"); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals("foo", this.event1.oldValue()); assertEquals("baz", this.event1.newValue()); assertEquals("baz", this.aa1.value()); @@ -142,7 +142,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subject1.setName(null); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals("baz", this.event1.oldValue()); assertEquals(null, this.event1.newValue()); assertEquals(null, this.aa1.value()); @@ -151,7 +151,7 @@ public class PropertyAspectAdapterTests extends TestCase { this.subject1.setName("foo"); assertNotNull(this.event1); assertEquals(this.aa1, this.event1.getSource()); - assertEquals(ValueModel.VALUE, this.event1.propertyName()); + assertEquals(PropertyValueModel.VALUE, this.event1.propertyName()); assertEquals(null, this.event1.oldValue()); assertEquals("foo", this.event1.newValue()); assertEquals("foo", this.aa1.value()); @@ -166,17 +166,17 @@ public class PropertyAspectAdapterTests extends TestCase { assertEquals("foo", this.subject1.getName()); assertEquals("foo", this.aa1.value()); - this.aa1.removePropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener1); assertEquals(null, this.aa1.value()); - this.aa1.addPropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.addPropertyChangeListener(PropertyValueModel.VALUE, this.listener1); assertEquals("foo", this.aa1.value()); - this.aa1.removePropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener1); this.subjectHolder1.setValue(this.subject2); assertEquals(null, this.aa1.value()); - this.aa1.addPropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.addPropertyChangeListener(PropertyValueModel.VALUE, this.listener1); assertEquals("bar", this.aa1.value()); } @@ -187,27 +187,27 @@ public class PropertyAspectAdapterTests extends TestCase { } public void testHasListeners() { - assertTrue(this.aa1.hasAnyPropertyChangeListeners(ValueModel.VALUE)); + assertTrue(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY)); - this.aa1.removePropertyChangeListener(ValueModel.VALUE, this.listener1); + this.aa1.removePropertyChangeListener(PropertyValueModel.VALUE, this.listener1); assertFalse(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY)); - assertFalse(this.aa1.hasAnyPropertyChangeListeners(ValueModel.VALUE)); + assertFalse(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); PropertyChangeListener listener2 = this.buildValueChangeListener1(); this.aa1.addPropertyChangeListener(listener2); - assertTrue(this.aa1.hasAnyPropertyChangeListeners(ValueModel.VALUE)); + assertTrue(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY)); this.aa1.removePropertyChangeListener(listener2); assertFalse(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY)); - assertFalse(this.aa1.hasAnyPropertyChangeListeners(ValueModel.VALUE)); + assertFalse(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); } public void testMultipleAspectAdapter() { TestSubject testSubject = new TestSubject("fred", "husband"); - PropertyValueModel testSubjectHolder = new SimplePropertyValueModel(testSubject); - PropertyValueModel testAA = this.buildMultipleAspectAdapter(testSubjectHolder); + WritablePropertyValueModel<TestSubject> testSubjectHolder = new SimplePropertyValueModel<TestSubject>(testSubject); + WritablePropertyValueModel<String> testAA = this.buildMultipleAspectAdapter(testSubjectHolder); PropertyChangeListener testListener = this.buildMultipleValueChangeListener(); - testAA.addPropertyChangeListener(ValueModel.VALUE, testListener); + testAA.addPropertyChangeListener(PropertyValueModel.VALUE, testListener); assertEquals("fred:husband", testAA.value()); this.multipleValueEvent = null; @@ -223,12 +223,11 @@ public class PropertyAspectAdapterTests extends TestCase { assertEquals("wilma:wife", this.multipleValueEvent.newValue()); } - private PropertyValueModel buildMultipleAspectAdapter(ValueModel subjectHolder) { - return new PropertyAspectAdapter(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) { + private WritablePropertyValueModel<String> buildMultipleAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { + return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) { @Override - protected Object buildValue_() { - TestSubject ts = (TestSubject) this.subject; - return ts.getName() + ":" + ts.getDescription(); + protected String buildValue_() { + return this.subject.getName() + ":" + this.subject.getDescription(); } }; } @@ -253,10 +252,10 @@ public class PropertyAspectAdapterTests extends TestCase { */ public void testCustomBuildValueWithNullSubject() { TestSubject customSubject = new TestSubject("fred", "laborer"); - PropertyValueModel customSubjectHolder = new SimplePropertyValueModel(customSubject); - PropertyValueModel customAA = this.buildCustomAspectAdapter(customSubjectHolder); + WritablePropertyValueModel<TestSubject> customSubjectHolder = new SimplePropertyValueModel<TestSubject>(customSubject); + WritablePropertyValueModel<String> customAA = this.buildCustomAspectAdapter(customSubjectHolder); PropertyChangeListener customListener = this.buildCustomValueChangeListener(); - customAA.addPropertyChangeListener(ValueModel.VALUE, customListener); + customAA.addPropertyChangeListener(PropertyValueModel.VALUE, customListener); assertEquals("fred", customAA.value()); this.customValueEvent = null; @@ -273,12 +272,11 @@ public class PropertyAspectAdapterTests extends TestCase { assertEquals("<unnamed>", this.customValueEvent.newValue()); } - private PropertyValueModel buildCustomAspectAdapter(ValueModel subjectHolder) { - return new PropertyAspectAdapter(subjectHolder, TestSubject.NAME_PROPERTY) { + private WritablePropertyValueModel<String> buildCustomAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { + return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { @Override - protected Object buildValue() { - TestSubject ts = (TestSubject) this.subject; - return (ts == null) ? "<unnamed>" : ts.getName(); + protected String buildValue() { + return (this.subject == null) ? "<unnamed>" : this.subject.getName(); } }; } |