kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-10 22:47:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update okhttp3

Browse Source 
Reviewed By: bestander

Differential Revision: D5078004

fbshipit-source-id: 79c66cedeeb682d8bb4e67798b41115899fd1c81
This commit is contained in:
Emil Sjolander
2017-05-18 08:06:52 -07:00
committed by Facebook Github Bot
parent 658f632f59
commit 93a1d592d6
15 changed files with 124 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
View File

@@ -15,7 +15,6 @@ rn_robolectric_test(
react_native_dep("third-party/java/junit:junit"),
react_native_dep("third-party/java/mockito:mockito"),
react_native_dep("third-party/java/okhttp:okhttp3"),
react_native_dep("third-party/java/okhttp:okhttp3-ws"),
react_native_dep("third-party/java/okio:okio"),
react_native_dep("third-party/java/robolectric3/robolectric:robolectric"),
react_native_target("java/com/facebook/react:react"),

17
ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java
View File

@@ -22,8 +22,7 @@ import org.robolectric.RobolectricTestRunner;
import java.util.HashMap;
import okhttp3.ResponseBody;
import okhttp3.ws.WebSocket;
import okio.ByteString;
import static org.mockito.Mockito.*;
@@ -78,7 +77,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_WithInvalidContentType_ShouldNotTriggerCallbacks() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.BINARY, "{\"replyID\":0, \"result\":\"OK\"}"));
client.onMessage(null, ByteString.encodeUtf8("{\"replyID\":0, \"result\":\"OK\"}"));
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestSuccess", anyInt(), anyString());
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
}
@@ -87,7 +86,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_WithoutReplyId_ShouldNotTriggerCallbacks() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"result\":\"OK\"}"));
client.onMessage(null, "{\"result\":\"OK\"}");
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestSuccess", anyInt(), anyString());
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
}
@@ -96,7 +95,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_With_Null_ReplyId_ShouldNotTriggerCallbacks() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"replyID\":null, \"result\":\"OK\"}"));
client.onMessage(null, "{\"replyID\":null, \"result\":\"OK\"}");
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestSuccess", anyInt(), anyString());
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
}
@@ -105,7 +104,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_WithResult_ShouldTriggerRequestSuccess() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"replyID\":0, \"result\":\"OK\"}"));
client.onMessage(null, "{\"replyID\":0, \"result\":\"OK\"}");
PowerMockito.verifyPrivate(client).invoke("triggerRequestSuccess", 0, "OK");
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
}
@@ -114,7 +113,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_With_Null_Result_ShouldTriggerRequestSuccess() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"replyID\":0, \"result\":null}"));
client.onMessage(null, "{\"replyID\":0, \"result\":null}");
PowerMockito.verifyPrivate(client).invoke("triggerRequestSuccess", 0, null);
PowerMockito.verifyPrivate(client, never()).invoke("triggerRequestFailure", anyInt(), any());
}
@@ -123,7 +122,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_WithError_ShouldCallAbort() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"replyID\":0, \"error\":\"BOOM\"}"));
client.onMessage(null, "{\"replyID\":0, \"error\":\"BOOM\"}");
PowerMockito.verifyPrivate(client).invoke("abort", eq("BOOM"), isA(JavascriptException.class));
}
@@ -131,7 +130,7 @@ public class JSDebuggerWebSocketClientTest {
public void test_onMessage_With_Null_Error_ShouldTriggerRequestSuccess() throws Exception {
JSDebuggerWebSocketClient client = PowerMockito.spy(new JSDebuggerWebSocketClient());
client.onMessage(ResponseBody.create(WebSocket.TEXT, "{\"replyID\":0, \"error\":null}"));
client.onMessage(null, "{\"replyID\":0, \"error\":null}");
PowerMockito.verifyPrivate(client).invoke("triggerRequestSuccess", anyInt(), anyString());
}
}

1
ReactAndroid/src/test/java/com/facebook/react/packagerconnection/BUCK
View File

@@ -15,7 +15,6 @@ rn_robolectric_test(
react_native_dep("third-party/java/junit:junit"),
react_native_dep("third-party/java/mockito:mockito"),
react_native_dep("third-party/java/okhttp:okhttp3"),
react_native_dep("third-party/java/okhttp:okhttp3-ws"),
react_native_dep("third-party/java/robolectric3/robolectric:robolectric"),
react_native_target("java/com/facebook/react/packagerconnection:packagerconnection"),
],

43
ReactAndroid/src/test/java/com/facebook/react/packagerconnection/JSPackagerClientTest.java
View File

@@ -17,8 +17,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import okhttp3.ResponseBody;
import okhttp3.ws.WebSocket;
import okio.ByteString;
import static org.mockito.Mockito.*;
import org.robolectric.RobolectricTestRunner;
@@ -47,10 +46,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 2, \"method\": \"methodValue\", \"params\": \"paramsValue\"}"));
client.onMessage("{\"version\": 2, \"method\": \"methodValue\", \"params\": \"paramsValue\"}");
verify(handler).onNotification(eq("paramsValue"));
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -60,10 +56,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 2, \"id\": \"idValue\", \"method\": \"methodValue\", \"params\": \"paramsValue\"}"));
client.onMessage("{\"version\": 2, \"id\": \"idValue\", \"method\": \"methodValue\", \"params\": \"paramsValue\"}");
verify(handler, never()).onNotification(any());
verify(handler).onRequest(eq("paramsValue"), any(Responder.class));
}
@@ -73,10 +66,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 2, \"method\": \"methodValue\"}"));
client.onMessage("{\"version\": 2, \"method\": \"methodValue\"}");
verify(handler).onNotification(eq(null));
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -86,10 +76,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.BINARY,
"{\"version\": 2, \"method\": \"methodValue\"}"));
client.onMessage(ByteString.encodeUtf8("{\"version\": 2, \"method\": \"methodValue\"}"));
verify(handler, never()).onNotification(any());
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -99,10 +86,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 2}"));
client.onMessage("{\"version\": 2}");
verify(handler, never()).onNotification(any());
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -112,10 +96,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 2, \"method\": null}"));
client.onMessage("{\"version\": 2, \"method\": null}");
verify(handler, never()).onNotification(any());
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -125,10 +106,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.BINARY,
"{\"version\": 2, \"method\": \"methodValue2\"}"));
client.onMessage(ByteString.EMPTY);
verify(handler, never()).onNotification(any());
verify(handler, never()).onRequest(any(), any(Responder.class));
}
@@ -138,10 +116,7 @@ public class JSPackagerClientTest {
RequestHandler handler = mock(RequestHandler.class);
final JSPackagerClient client = new JSPackagerClient("test_client", mSettings, createRH("methodValue", handler));
client.onMessage(
ResponseBody.create(
WebSocket.TEXT,
"{\"version\": 1, \"method\": \"methodValue\"}"));
client.onMessage("{\"version\": 1, \"method\": \"methodValue\"}");
verify(handler, never()).onNotification(any());
verify(handler, never()).onRequest(any(), any(Responder.class));
}