summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuriy <YChernyshov@luxoft.com>2014-06-24 14:39:10 +0300
committerYuriy <YChernyshov@luxoft.com>2014-06-24 14:39:10 +0300
commit16a20e81ee4aa4a7e2bb6cb0c13c1f88076d3545 (patch)
tree8e9435b76440491c04f92434412c00172b215e1c
parent2e7f7274388d5d3f8fd3436c6d18128192e775a2 (diff)
downloadsdl_core-16a20e81ee4aa4a7e2bb6cb0c13c1f88076d3545.tar.gz
Not a subject for review
Reason: Trivial changes
-rw-r--r--mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/proxy/SyncProxyBase_OnSystemRequestTest.java23
1 files changed, 14 insertions, 9 deletions
diff --git a/mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/proxy/SyncProxyBase_OnSystemRequestTest.java b/mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/proxy/SyncProxyBase_OnSystemRequestTest.java
index 14fbe7b5bf..f416333b7a 100644
--- a/mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/proxy/SyncProxyBase_OnSystemRequestTest.java
+++ b/mobile/android/SyncProxyAndroid/androidTest/java/com/ford/syncV4/proxy/SyncProxyBase_OnSystemRequestTest.java
@@ -22,7 +22,6 @@ import com.ford.syncV4.proxy.systemrequest.ISystemRequestProxy;
import com.ford.syncV4.session.SessionTest;
import com.ford.syncV4.syncConnection.SyncConnection;
import com.ford.syncV4.test.TestConfig;
-import com.ford.syncV4.transport.BTTransportConfig;
import com.ford.syncV4.transport.usb.USBTransportConfig;
import org.json.JSONException;
@@ -91,15 +90,13 @@ public class SyncProxyBase_OnSystemRequestTest extends InstrumentationTestCase {
handlerMock = mock(IOnSystemRequestHandler.class);
- final SystemPutFileRPCRequestConverter converter =
- new SystemPutFileRPCRequestConverter();
+ final SystemPutFileRPCRequestConverter converter = new SystemPutFileRPCRequestConverter();
maxDataSize = 32;
converter.setMaxDataSize(maxDataSize);
- IRPCRequestConverterFactory factoryMock =
- mock(IRPCRequestConverterFactory.class);
- when(factoryMock.getConverterForRequest(
- notNull(RPCRequest.class))).thenReturn(converter);
+ IRPCRequestConverterFactory factoryMock = mock(IRPCRequestConverterFactory.class);
+ when(factoryMock.getConverterForRequest(notNull(RPCRequest.class))).thenReturn(converter);
proxy.setRpcRequestConverterFactory(factoryMock);
+
}
public void testDefaultSystemRequestHandlerShouldBeNull() {
@@ -494,7 +491,11 @@ public class SyncProxyBase_OnSystemRequestTest extends InstrumentationTestCase {
final String filename = "file";
final FileType fileType = FileType.GRAPHIC_JPEG;
- proxy.putSystemFile(SessionTest.APP_ID_DEFAULT, filename, data, fileType);
+ proxy.initializeSession(SessionTest.APP_ID);
+ proxy.getInterfaceBroker().onProtocolSessionStarted(SessionTest.SESSION_ID,
+ ProtocolConstants.PROTOCOL_VERSION_TWO);
+
+ proxy.putSystemFile(SessionTest.APP_ID, filename, data, fileType);
Thread.sleep(WAIT_TIMEOUT);
@@ -519,7 +520,11 @@ public class SyncProxyBase_OnSystemRequestTest extends InstrumentationTestCase {
final String filename = "file";
final FileType fileType = FileType.GRAPHIC_JPEG;
final int offset = 4000;
- proxy.putSystemFile(SessionTest.APP_ID_DEFAULT, filename, data, offset, fileType);
+
+ proxy.initializeSession(SessionTest.APP_ID);
+ proxy.getInterfaceBroker().onProtocolSessionStarted(SessionTest.SESSION_ID,
+ ProtocolConstants.PROTOCOL_VERSION_TWO);
+ proxy.putSystemFile(SessionTest.APP_ID, filename, data, offset, fileType);
Thread.sleep(WAIT_TIMEOUT);