From 19220de3886da487d6e5b1065deb4b18f108eeab Mon Sep 17 00:00:00 2001 From: Josh Jackson Date: Tue, 7 Mar 2017 20:22:38 -0600 Subject: [PATCH] testMultipartPopAndEncodeAsJs under newer test system This closes #358 --- .../cordova/test/MultipartMessageTest.java | 31 ------------------- .../unittests/NativeToJsMessageQueueTest.java | 19 ++++++++++++ 2 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 test/androidTest/src/org/apache/cordova/test/MultipartMessageTest.java diff --git a/test/androidTest/src/org/apache/cordova/test/MultipartMessageTest.java b/test/androidTest/src/org/apache/cordova/test/MultipartMessageTest.java deleted file mode 100644 index c96b74a3..00000000 --- a/test/androidTest/src/org/apache/cordova/test/MultipartMessageTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.apache.cordova.test; - -import android.util.Log; -import org.apache.cordova.NativeToJsMessageQueue; -import org.apache.cordova.PluginResult; -import java.util.ArrayList; - -public class MultipartMessageTest extends BaseCordovaIntegrationTest { - - @Override - public void setUp() throws Exception { - super.setUp(); - setUpWithStartUrl(null); - } - - public void testMultipartMessages() throws Throwable { - ArrayList multiparts = new ArrayList(); - for (int i=0; i<5; i++) { - multiparts.add(new PluginResult(PluginResult.Status.OK, i)); - } - PluginResult multipartresult = new PluginResult(PluginResult.Status.OK, multiparts); - NativeToJsMessageQueue q = new NativeToJsMessageQueue(); - q.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode()); - q.setBridgeMode(0); - q.addPluginResult(multipartresult, "37"); - String result = q.popAndEncodeAsJs(); - assertEquals(result, "cordova.callbackFromNative('37',true,1,[0,1,2,3,4],false);"); - Log.v("MultiPartMessageTest", result); - } - -} diff --git a/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java b/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java index fb39096f..0ed77954 100644 --- a/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java +++ b/test/app/src/test/java/org/apache/cordova/unittests/NativeToJsMessageQueueTest.java @@ -20,6 +20,7 @@ import org.json.JSONObject; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; import java.util.concurrent.ExecutorService; import static org.junit.Assert.*; @@ -123,4 +124,22 @@ public class NativeToJsMessageQueueTest { assertTrue(resultString.startsWith("cordova.callbackFromNative")); } + //This test is for the evalBridge, which directly calls cordova.callbackFromNative, skipping + //platform specific NativeToJs code + @Test + public void testMultipartPopAndEncodeAsJs() + { + ArrayList multiparts = new ArrayList(); + for (int i=0; i<5; i++) { + multiparts.add(new PluginResult(PluginResult.Status.OK, i)); + } + PluginResult multipartresult = new PluginResult(PluginResult.Status.OK, multiparts); + NativeToJsMessageQueue queue = new NativeToJsMessageQueue(); + queue.addBridgeMode(new NativeToJsMessageQueue.NoOpBridgeMode()); + queue.setBridgeMode(0); + queue.addPluginResult(multipartresult, "37"); + String result = queue.popAndEncodeAsJs(); + assertEquals(result, "cordova.callbackFromNative('37',true,1,[0,1,2,3,4],false);"); + } + }