ADAP-159: updated tests

wenjunche · wenjunche · commit 520b4ccb80e2 · 2019-06-03T22:27:36.000-04:00
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
@@ -1,3 +1,7 @@
+# Version 7.1.3
+## New Features
+* Add support for the new notification service
+
 # Version 7.1.2
 ## Bug Fixes
 
diff --git a/src/main/java/com/openfin/desktop/demo/ChannelExample.java b/src/main/java/com/openfin/desktop/demo/ChannelExample.java
@@ -24,9 +24,15 @@ public class ChannelExample implements DesktopStateListener {
 
     private DesktopConnection desktopConnection;
 
+    private static String channelType;  // client or provider, if not set, both
+
     public ChannelExample() {
         try {
-            desktopConnection = new DesktopConnection("ChannelExample");
+            StringBuilder sb = new StringBuilder("ChannelExample");
+            if (channelType != null) {
+                sb.append(channelType);
+            }
+            desktopConnection = new DesktopConnection(sb.toString());
             String desktopVersion = java.lang.System.getProperty("com.openfin.demo.runtime.version", "stable");
             RuntimeConfiguration configuration = new RuntimeConfiguration();
             configuration.setRuntimeVersion(desktopVersion);
@@ -148,8 +154,12 @@ public void onError(Ack ack) {
 
     @Override
     public void onReady() {
-        createChannelProvider();
-        createChannelClient();
+        if ("provider".equals(channelType) || channelType == null) {
+            createChannelProvider();
+        }
+        if ("client".equals(channelType) || channelType == null) {
+            createChannelClient();
+        }
     }
 
     @Override
@@ -173,7 +183,9 @@ public void onOutgoingMessage(String message) {
     }
 
     public static void main(String[] args) {
-
+        if (args.length > 0) {
+            channelType = args[0];
+        }
         try {
             new ChannelExample();
             latch.await();
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -520,12 +520,12 @@ public void onError(String reason) {
 
             @Override
             public void onMessage(String message) {
-                updateMessagePanel("-->FROM DESKTOP-" + message);
+//                updateMessagePanel("-->FROM DESKTOP-" + message);
             }
 
             @Override
             public void onOutgoingMessage(String message) {
-                updateMessagePanel("<--TO DESKTOP-" + message);
+//                updateMessagePanel("<--TO DESKTOP-" + message);
             }
         };
 
diff --git a/src/test/java/com/openfin/desktop/WindowTest.java b/src/test/java/com/openfin/desktop/WindowTest.java
@@ -489,7 +489,7 @@ public void navigateBack() throws Exception {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
-                	window.navigate("https://www.google.com", new AckListener() {
+                	window.navigate(guest_url, new AckListener() {
                         @Override
                         public void onSuccess(Ack ack) {
                             if (ack.isSuccessful()) {

Original file line number	Diff line number	Diff line change
`@@ -520,12 +520,12 @@ public void onError(String reason) {`
`520`	`520`
`521`	`521`	`@Override`
`522`	`522`	`public void onMessage(String message) {`
`523`		`- updateMessagePanel("-->FROM DESKTOP-" + message);`
	`523`	`+// updateMessagePanel("-->FROM DESKTOP-" + message);`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`@Override`
`527`	`527`	`public void onOutgoingMessage(String message) {`
`528`		`- updateMessagePanel("<--TO DESKTOP-" + message);`
	`528`	`+// updateMessagePanel("<--TO DESKTOP-" + message);`
`529`	`529`	`}`
`530`	`530`	`};`
`531`	`531`