Cleanup in DelayedObservableValueTestI20191229-2200I20191229-1800I20191228-1800

Change-Id: Ic41bfd114c24b6eac29dd2f6cfcaf4236e775758
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>

3 files changed, 20 insertions, 23 deletions

diff --git a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
index bf3dc7d6699..e23354a718c 100644
--- a/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jface.tests.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jface.tests.databinding
-Bundle-Version: 1.9.200.qualifier
+Bundle-Version: 1.9.300.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
diff --git a/tests/org.eclipse.jface.tests.databinding/pom.xml b/tests/org.eclipse.jface.tests.databinding/pom.xml
index d9411ed7800..22992d1e0a7 100644
--- a/tests/org.eclipse.jface.tests.databinding/pom.xml
+++ b/tests/org.eclipse.jface.tests.databinding/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.jface</groupId>
   <artifactId>org.eclipse.jface.tests.databinding</artifactId>
-  <version>1.9.200-SNAPSHOT</version>
+  <version>1.9.300-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/DelayedObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/DelayedObservableValueTest.java
index f0451f82ef1..275c14f4cf1 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/DelayedObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/DelayedObservableValueTest.java
@@ -44,14 +44,14 @@ import junit.framework.TestSuite;
 public class DelayedObservableValueTest extends AbstractDefaultRealmTestCase {
 	private Object oldValue;
 	private Object newValue;
-	private ObservableValueStub target;
-	private IObservableValue delayed;
+	private ObservableValueStub<Object> target;
+	private IObservableValue<Object> delayed;
 
 	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		target = new ObservableValueStub(Realm.getDefault());
+		target = new ObservableValueStub<>(Realm.getDefault());
 		oldValue = new Object();
 		newValue = new Object();
 		target.setValue(oldValue);
@@ -127,10 +127,8 @@ public class DelayedObservableValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testSetValue_FiresValueChangeEvent() {
-		ValueChangeEventTracker targetTracker = ValueChangeEventTracker
-				.observe(target);
-		ValueChangeEventTracker delayedTracker = ValueChangeEventTracker
-				.observe(delayed);
+		ValueChangeEventTracker<?> targetTracker = ValueChangeEventTracker.observe(target);
+		ValueChangeEventTracker<?> delayedTracker = ValueChangeEventTracker.observe(delayed);
 
 		delayed.setValue(newValue);
 
@@ -177,8 +175,7 @@ public class DelayedObservableValueTest extends AbstractDefaultRealmTestCase {
 	}
 
 	private void assertFiresPendingValueChange(Runnable runnable) {
-		ValueChangeEventTracker tracker = ValueChangeEventTracker
-				.observe(delayed);
+		ValueChangeEventTracker<?> tracker = ValueChangeEventTracker.observe(delayed);
 
 		target.setValue(newValue);
 		assertTrue(delayed.isStale());
@@ -192,24 +189,24 @@ public class DelayedObservableValueTest extends AbstractDefaultRealmTestCase {
 		assertEquals(newValue, tracker.event.diff.getNewValue());
 	}
 
-	static class ObservableValueStub extends AbstractObservableValue {
-		private Object value;
+	static class ObservableValueStub<T> extends AbstractObservableValue<T> {
+		private T value;
 		private boolean stale;
 
-		Object overrideValue;
+		T overrideValue;
 
 		public ObservableValueStub(Realm realm) {
 			super(realm);
 		}
 
 		@Override
-		protected Object doGetValue() {
+		protected T doGetValue() {
 			return value;
 		}
 
 		@Override
-		protected void doSetValue(Object value) {
-			Object oldValue = this.value;
+		protected void doSetValue(T value) {
+			T oldValue = this.value;
 			if (overrideValue != null)
 				value = overrideValue;
 			this.value = value;
@@ -240,24 +237,24 @@ public class DelayedObservableValueTest extends AbstractDefaultRealmTestCase {
 
 	static class Delegate extends AbstractObservableValueContractDelegate {
 		@Override
-		public IObservableValue createObservableValue(Realm realm) {
-			return Observables.observeDelayedValue(0, new ObservableValueStub(
-					realm));
+		public IObservableValue<?> createObservableValue(Realm realm) {
+			return Observables.observeDelayedValue(0, new ObservableValueStub<>(realm));
 		}
 
 		@Override
-		public Object getValueType(IObservableValue observable) {
+		public Object getValueType(IObservableValue<?> observable) {
 			return Object.class;
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			IObservableValue observableValue = (IObservableValue) observable;
+			@SuppressWarnings("unchecked")
+			IObservableValue<Object> observableValue = (IObservableValue<Object>) observable;
 			observableValue.setValue(createValue(observableValue));
 		}
 
 		@Override
-		public Object createValue(IObservableValue observable) {
+		public Object createValue(IObservableValue<?> observable) {
 			return new Object();
 		}
 	}