SystemDispatcher : Add test case for data conversion between C++ and Java

Author: benlau

examples/quickandroidexample/automator.cpp

@@ -0,0 +1,26 @@
+#include "qasystemdispatcher.h"
+#include "automator.h"
+
+Automator::Automator(QObject *parent) : QObject(parent)
+{
+
+}
+
+Automator::~Automator()
+{
+
+}
+
+void Automator::start()
+{
+    connect(QASystemDispatcher::instance(),SIGNAL(dispatched(QString,QVariantMap)),
+            this,SLOT(onDispatched(QString,QVariantMap)));
+}
+
+void Automator::onDispatched(QString name, QVariantMap message)
+{
+    if (name == "Automater::echo") {
+        QASystemDispatcher::instance()->dispatch("Automater::response",message);
+    }
+}
+

examples/quickandroidexample/automator.h

@@ -0,0 +1,27 @@
+#ifndef AUTOMATOR_H
+#define AUTOMATOR_H
+
+#include <QObject>
+#include <QVariantMap>
+
+/// For unit test purpose. Not needed for regular project.
+
+class Automator : public QObject
+{
+    Q_OBJECT
+public:
+    explicit Automator(QObject *parent = 0);
+    ~Automator();
+
+    void start();
+
+signals:
+
+public slots:
+
+private slots:
+    void onDispatched(QString name,QVariantMap message);
+
+};
+
+#endif // AUTOMATOR_H

examples/quickandroidexample/main.cpp

@@ -5,6 +5,7 @@
 #include "quickandroid.h"
 #include "qadrawableprovider.h"
 #include "qasystemdispatcher.h"
+#include "automator.h"
 
 #ifdef Q_OS_ANDROID
 #include <QtAndroidExtras/QAndroidJniObject>
@@ -39,6 +40,11 @@ int main(int argc, char *argv[])
     view.setSource(QUrl(QStringLiteral("qrc:///main.qml")));
     view.show();
 
+
+    /* Testing Code. Not needed for regular project */
+    Automator* automator = new Automator();
+    automator->start();
+
     QVariantMap message;
     message["field1"] = "value1";
     message["field2"] = 10;

examples/quickandroidexample/quickandroidexample.pro

@@ -2,7 +2,8 @@ TEMPLATE = app
 
 QT += qml quick
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+    automator.cpp
 
 RESOURCES += qml.qrc
 
@@ -22,3 +23,6 @@ include(deployment.pri)
 DISTFILES += \
     android-sources/src/quickandroid/example/ExampleActivity.java \
     android-sources/AndroidManifest.xml
+
+HEADERS += \
+    automator.h

tests/quickandroidactivitytests/tests/src/quickandroid/example/ExampleActivityTest.java

@@ -12,6 +12,7 @@
 import java.util.LinkedList;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
 
 /**
  * This is a simple framework for a test of an Application.  See
@@ -49,9 +50,8 @@ private void startActivity() {
 
     private int counter = 0;
 
-    public void testSendMessage() {
+    public void testDispatch() {
         startActivity();
-        Log.v(TAG,"testSendMessage");
 
         SystemDispatcher.Listener listener = new SystemDispatcher.Listener() {
 
@@ -80,11 +80,10 @@ public void onDispatched(String name , Map data) {
 
     private List<String> messages ;
 
-    public void testReentrant() {
+    public void testDispatchReentrant() {
         startActivity();
         messages = new ArrayList();
 
-        Log.v(TAG,"testReentrant");
         final String messageName = "testReentrant";
 
         SystemDispatcher.Listener listener = new SystemDispatcher.Listener() {
@@ -120,6 +119,58 @@ public void onDispatched(String name , Map data) {
         SystemDispatcher.removeListener(listener);
     }
 
+    private static class Payload {
+        public String name;
+        public Map message;
+    }
+
+
+    private static Payload lastPayload;
+
+    /** Verify the data convension function between C++ and Java */
+    public void testDispatchTypes() {
+
+        SystemDispatcher.Listener listener = new SystemDispatcher.Listener() {
+
+            public void onDispatched(String name , Map message) {
+                Payload payload = new Payload();
+                payload.name = name;
+                payload.message = message;
+
+                lastPayload = payload;
+            }
+        };
+
+        SystemDispatcher.addListener(listener);
+
+        Map message = new HashMap();
+        message.put("field1","value1");
+        message.put("field2",10);
+        message.put("field3",true);
+        message.put("field4",false);
+
+        SystemDispatcher.dispatch("Automater::echo",message);
+
+        assertTrue(lastPayload != null);
+        assertTrue(lastPayload.message.containsKey("field1"));
+        assertTrue(lastPayload.message.containsKey("field2"));
+        assertTrue(lastPayload.message.containsKey("field3"));
+
+        String field1 = (String)  lastPayload.message.get("field1");
+        assertTrue(field1.equals("value1"));
+
+        int field2 = (int) (Integer) lastPayload.message.get("field2");
+        assertEquals(field2,10);
+
+        boolean field3 = (boolean)(Boolean) lastPayload.message.get("field3");
+        assertEquals(field3,true);
+
+        boolean field4 = (boolean)(Boolean) lastPayload.message.get("field4");
+        assertEquals(field4,false);
+
+        SystemDispatcher.removeListener(listener);
+    }
+
 
 
 }