ADAP-130: adapter updates

wenjunche · wenjunche · commit 8f2bce08d798 · 2018-04-12T14:41:50.000-04:00
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
@@ -4,6 +4,8 @@
 ## New Features
 * Improved thread safety with concurrent collection classes.
 * Added error message to DesktopStateListener.onClose (breaking change)
+* Added OpenFinRuntime.getRuntimeInfo
+* Added OpenFinRuntime.getRvmInfo
 
 ## Bug Fixes
 * Fixed an issue with passing arguments in System.launchExternalProcess
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -527,7 +527,7 @@ public void onOutgoingMessage(String message) {
 
         try {
             if (this.desktopPort > 0) {
-                this.runtimeConfiguration.setRuntimePort(9696);
+                this.runtimeConfiguration.setRuntimePort(this.desktopPort);
                 updateMessagePanel("Connecting to Runtime already running at port " + this.desktopPort);
                 this.runtimeConfiguration.setMaxMessageSize(1024*1024);
                 desktopConnection.connect(this.runtimeConfiguration, listener, 10);
diff --git a/src/test/java/com/openfin/desktop/SystemTest.java b/src/test/java/com/openfin/desktop/SystemTest.java
@@ -541,5 +541,51 @@ public void onError(Ack ack) {
 
     }
 
+    @Test
+    public void getRuntimeInfo() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+        runtime.getRuntimeInfo(new AckListener() {
+            @Override
+            public void onSuccess(Ack ack) {
+                if (ack.isSuccessful()) {
+                    // { "manifestUrl":"http://localhost:5090/getManifest","port":9696,"version":"8.56.30.37","architecture":"x64"}
+                    JSONObject data = (JSONObject) ack.getData();
+                    if (data.has("manifestUrl") && data.has("port") && data.has("version")) {
+                        latch.countDown();
+                    }
+                }
+            }
+
+            @Override
+            public void onError(Ack ack) {
+            }
+        });
+        latch.await(5, TimeUnit.SECONDS);
+        assertEquals("getRuntimeInfo timeout", latch.getCount(), 0);
+    }
+
+    @Test
+    public void getRvmInfo() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+        runtime.getRvmInfo(new AckListener() {
+            @Override
+            public void onSuccess(Ack ack) {
+                if (ack.isSuccessful()) {
+                    // { "action":"get-rvm-info","path":"C:\\Users\\abc\\AppData\\Local\\OpenFin\\OpenFinRVM.exe","start-time":"2018-04-12 14:01:41","version":"4.0.1.1","working-dir":"C:\\Users\\abc\\AppData\\Local\\OpenFin"}
+                    JSONObject data = (JSONObject) ack.getData();
+                    if (data.has("action") && data.has("path") && data.has("start-time")) {
+                        latch.countDown();
+                    }
+                }
+            }
+
+            @Override
+            public void onError(Ack ack) {
+            }
+        });
+        latch.await(5, TimeUnit.SECONDS);
+        assertEquals("getRvmInfo timeout", latch.getCount(), 0);
+    }
+
 
 }
