Skip to content

Commit 04da52c

Browse files
author
Wenjun Che
committed
ADAP-50: added setRdmUrl and setRuntimeAssetesUrl in DesktopConnect
1 parent 76163c3 commit 04da52c

8 files changed

Lines changed: 41 additions & 9 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>co.openfin</groupId>
88
<artifactId>openfin-desktop-java-example</artifactId>
9-
<version>5.44.2.3</version>
9+
<version>5.44.2.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>openfin-desktop-java-example</name>

‎release/docking.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-5.44.2.3.jar;openfin-desktop-java-adapter-5.44.2.3.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp com.openfin.desktop.demo.OpenFinDockingDemo
1+
java -cp openfin-desktop-java-example-5.44.2.4.jar;openfin-desktop-java-adapter-5.44.2.4.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp com.openfin.desktop.demo.OpenFinDockingDemo

‎release/junit.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-5.44.2.3-tests.jar;openfin-desktop-java-adapter-5.44.2.3.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=5.44.10.26 org.junit.runner.JUnitCore com.openfin.desktop.AllTests
1+
java -cp openfin-desktop-java-example-5.44.2.4-tests.jar;openfin-desktop-java-adapter-5.44.2.4.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=5.44.10.26 org.junit.runner.JUnitCore com.openfin.desktop.AllTests

‎release/junit2.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-5.44.2.3.jar;openfin-desktop-java-adapter-5.44.2.3.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=5.44.10.26 org.junit.runner.JUnitCore com.openfin.desktop.demo.OpenFinWindowTest
1+
java -cp openfin-desktop-java-example-5.44.2.4.jar;openfin-desktop-java-adapter-5.44.2.4.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar;junit-4.11.jar;hamcrest-core-1.3.jar;hamcrest-core-1.3.jar;hamcrest-library-1.1.jar;mockito-core-1.9.5.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.runtime.version=5.44.10.26 org.junit.runner.JUnitCore com.openfin.desktop.demo.OpenFinWindowTest

‎release/openfin-desktop-java-adapter-5.44.2.4.jar‎

2 Bytes
Binary file not shown.

‎release/run.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
java -cp openfin-desktop-java-example-5.44.2.3.jar;openfin-desktop-java-adapter-5.44.2.4.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp com.openfin.desktop.demo.OpenFinDesktopDemo
1+
java -cp openfin-desktop-java-example-5.44.2.4.jar;openfin-desktop-java-adapter-5.44.2.4.jar;TableLayout-20050920.jar;jna-4.1.0.jar;jna-platform-4.1.0.jar;json-20140107.jar;slf4j-api-1.7.5.jar;slf4j-jdk14-1.6.1.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp com.openfin.desktop.demo.OpenFinDesktopDemo

‎src/test/java/com/openfin/desktop/SystemTest.java‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class SystemTest {
3030

3131
private static final String DESKTOP_UUID = SystemTest.class.getName();
3232
private static DesktopConnection desktopConnection;
33-
private static System runtime;
33+
private static OpenFinRuntime runtime;
3434

3535
@BeforeClass
3636
public static void setup() throws Exception {
@@ -286,7 +286,6 @@ public void onSuccess(Ack ack) {
286286
JSONObject position = (JSONObject) ack.getData();
287287
if (position.has("left") && position.has("top")) {
288288
latch.countDown();
289-
290289
}
291290
}
292291
}
@@ -493,7 +492,6 @@ public void onSuccess(Ack ack) {
493492
latch.countDown();
494493
}
495494
}
496-
497495
@Override
498496
public void onError(Ack ack) {
499497
}
@@ -508,9 +506,38 @@ public void restartRuntime() throws Exception {
508506
String version1 = getRuntimeVersion();
509507
TestUtils.teardownDesktopConnection(desktopConnection);
510508
desktopConnection = TestUtils.setupConnection(DESKTOP_UUID);
511-
runtime = new System(desktopConnection);
509+
runtime = new OpenFinRuntime(desktopConnection);
512510
String version2 = getRuntimeVersion();
513511
assertEquals(version1, version2);
514512
}
515513

514+
@Test
515+
public void customRdmAssetUrls() throws Exception {
516+
TestUtils.teardownDesktopConnection(desktopConnection);
517+
String rdmUrl = "https://rdm.openfin.co/services";
518+
String assetsUrl = "https://cdn.openfin.co/release";
519+
desktopConnection = TestUtils.setupConnection(DESKTOP_UUID, rdmUrl, assetsUrl);
520+
runtime = new OpenFinRuntime(desktopConnection);
521+
CountDownLatch latch = new CountDownLatch(1);
522+
runtime.getConfig(null, new AckListener() {
523+
@Override
524+
public void onSuccess(Ack ack) {
525+
if (ack.isSuccessful()) {
526+
JSONObject data = (JSONObject) ack.getData();
527+
if (rdmUrl.equals(data.getString("rdmUrl")) && assetsUrl.equals(data.getString("assetsUrl"))) {
528+
latch.countDown();
529+
}
530+
}
531+
}
532+
@Override
533+
public void onError(Ack ack) {
534+
logger.error(ack.getReason());
535+
}
536+
});
537+
latch.await(5, TimeUnit.SECONDS);
538+
assertEquals("getConfig timeout", latch.getCount(), 0);
539+
540+
}
541+
542+
516543
}

‎src/test/java/com/openfin/desktop/TestUtils.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ public class TestUtils {
2929
public static final String openfin_app_url = "https://cdn.openfin.co/examples/junit/SimpleOpenFinApp.html"; // source is in release/SimpleOpenFinApp.html
3030

3131
public static DesktopConnection setupConnection(String connectionUuid) throws Exception {
32+
return setupConnection(connectionUuid, null, null);
33+
}
34+
public static DesktopConnection setupConnection(String connectionUuid, String rdmUrl, String assetsUrl) throws Exception {
3235
logger.debug("starting");
3336
CountDownLatch connectedLatch = new CountDownLatch(1);
3437
disconnectedLatch = new CountDownLatch(1);
@@ -45,6 +48,8 @@ public static DesktopConnection setupConnection(String connectionUuid) throws Ex
4548
if (runtimeVersion == null) {
4649
runtimeVersion = "alpha";
4750
}
51+
desktopConnection.setRdmUrl(rdmUrl);
52+
desktopConnection.setRuntimeAssetsUrl(assetsUrl);
4853
desktopConnection.connectToVersion(runtimeVersion, new DesktopStateListener() {
4954
@Override
5055
public void onReady() {

0 commit comments

Comments
 (0)