Use public API for unit tests
diff --git a/tests/org.eclipse.rap.addons.autosuggest.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.addons.autosuggest.test/META-INF/MANIFEST.MF
index e329e46..6ac46ea 100644
--- a/tests/org.eclipse.rap.addons.autosuggest.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.addons.autosuggest.test/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@
Require-Bundle: org.junit;bundle-version="4.11.0",
org.mockito.mockito-all;bundle-version="1.9.5",
org.eclipse.rap.jstestrunner;bundle-version="0.2.0"
-Import-Package: org.eclipse.rap.rwt.testfixture.internal;version="3.0.0"
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.0.0,4.0.0)"
diff --git a/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/AutoSuggest_Test.java b/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/AutoSuggest_Test.java
index c4b9d9c..ea06b97 100644
--- a/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/AutoSuggest_Test.java
+++ b/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/AutoSuggest_Test.java
@@ -31,26 +31,25 @@
import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.rap.rwt.RWT;
-import org.eclipse.rap.rwt.internal.lifecycle.PhaseId;
import org.eclipse.rap.rwt.internal.lifecycle.WidgetDataUtil;
import org.eclipse.rap.rwt.remote.Connection;
import org.eclipse.rap.rwt.remote.OperationHandler;
import org.eclipse.rap.rwt.remote.RemoteObject;
import org.eclipse.rap.rwt.scripting.ClientListener;
-import org.eclipse.rap.rwt.testfixture.internal.Fixture;
+import org.eclipse.rap.rwt.testfixture.TestContext;
import org.eclipse.rap.rwt.widgets.DropDown;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-@SuppressWarnings({ "restriction", "deprecation" })
+@SuppressWarnings({ "restriction" })
public class AutoSuggest_Test {
private static final String REMOTE_SELECTION_EVENT = "suggestionSelected";
@@ -61,21 +60,17 @@
private RemoteObject remoteObject;
private Connection connection;
+ @Rule
+ public TestContext context = new TestContext();
+
@Before
public void setUp() {
- Fixture.setUp();
- Fixture.fakePhase( PhaseId.PROCESS_ACTION );
Display display = new Display();
Shell shell = new Shell( display );
text = new Text( shell, SWT.NONE );
mockRemoteObject();
}
- @After
- public void tearDown() {
- Fixture.tearDown();
- }
-
@Test( expected = NullPointerException.class )
public void testConstructor_failsWithNull() {
new AutoSuggest( null );
@@ -507,7 +502,7 @@
when( remoteObject.getId() ).thenReturn( "foo" );
connection = spy( RWT.getUISession().getConnection() );
when( connection.createRemoteObject( REMOTE_TYPE ) ).thenReturn( remoteObject );
- Fixture.fakeConnection( connection );
+ context.replaceConnection( connection );
}
}
diff --git a/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/DataSource_Test.java b/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/DataSource_Test.java
index 1fd512c..45c992d 100644
--- a/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/DataSource_Test.java
+++ b/tests/org.eclipse.rap.addons.autosuggest.test/src/org/eclipse/rap/addons/autosuggest/DataSource_Test.java
@@ -26,13 +26,12 @@
import org.eclipse.rap.json.JsonArray;
import org.eclipse.rap.rwt.remote.Connection;
import org.eclipse.rap.rwt.remote.RemoteObject;
-import org.eclipse.rap.rwt.testfixture.internal.Fixture;
-import org.junit.After;
+import org.eclipse.rap.rwt.testfixture.TestContext;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
-@SuppressWarnings( "restriction" )
public class DataSource_Test {
private static final String REMOTE_TYPE = "rwt.remote.Model";
@@ -40,22 +39,19 @@
private RemoteObject remoteObject;
private DataSource dataSource;
+ @Rule
+ public TestContext context = new TestContext();
+
@Before
public void setUp() {
- Fixture.setUp();
connection = mock( Connection.class );
remoteObject = mock( RemoteObject.class );
when( connection.createRemoteObject( anyString() ) ).thenReturn( remoteObject );
when( remoteObject.getId() ).thenReturn( "idFoo" );
- Fixture.fakeConnection( connection );
+ context.replaceConnection( connection );
dataSource = new DataSource();
}
- @After
- public void tearDown() {
- Fixture.tearDown();
- }
-
@Test
public void testConstructor_createsRemoteObject() {
verify( connection ).createRemoteObject( eq( REMOTE_TYPE ) );
@@ -165,4 +161,5 @@
verify( remoteObject, times( 1 ) ).destroy();
}
+
}
