Skip to content

DTNT-516: added tests for InterApp API #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenjunche merged 9 commits into from
Oct 25, 2021
Merged

DTNT-516: added tests for InterApp API #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d1117df
DTNT-516 added interop api unit tests.
weiteho Aug 18, 2021
c924767
DTNT-516: fixed data type of context ID
wenjunche Aug 23, 2021
6090f2c
DTNT-516: update version of adapter
wenjunche Aug 23, 2021
fc6a9e8
DTNT-516: added tests for InterOp
wenjunche Sep 3, 2021
a6ee4ed
DTNT-516: update tests
wenjunche Sep 3, 2021
e34f21b
DTNT-516: updated tests for adapter 9.0.1
wenjunche Oct 19, 2021
8091d97
DTNT-516: fixed few tests
wenjunche Oct 20, 2021
ca0407a
DTNT-516: merge master
wenjunche Oct 20, 2021
fa9f68b
DTNT-516: updated few bat files
wenjunche Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>co.openfin</groupId>
<artifactId>openfin-desktop-java-example</artifactId>
<version>7.1.1</version>
<version>9.0.1</version>
<packaging>jar</packaging>

<name>openfin-desktop-java-example</name>
Expand Down Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>co.openfin</groupId>
<artifactId>openfin-desktop-java-adapter</artifactId>
<version>8.0.11-SNAPSHOT</version>
<version>9.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>co.openfin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion release/channel.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ REM usage: channel.bat [ provider | client ]
set mode=%1
IF "%~1" == "" set mode=provider
echo Channel type set to: %mode%
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.11-SNAPSHOT.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.ChannelExample %mode%
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.ChannelExample %mode%

7 changes: 0 additions & 7 deletions release/docking.bat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion release/embed.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set url=%1
IF "%~1" == "" set url=https://openfin.co
echo Embedded url set to: %url%
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=%URL% -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.demo.embed.URL=%URL% -Dcom.openfin.demo.version=stable com.openfin.desktop.demo.WindowEmbedDemo
2 changes: 1 addition & 1 deletion release/junit.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ set RuntimeVersion="stable"
set RuntimeVersion="%1"
)

java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.8.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/log4j-1.2.17.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1-tests.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.test.runtime.version=%RuntimeVersion% org.junit.runner.JUnitCore com.openfin.desktop.AllTests
Binary file added release/lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar
View file
Open in desktop
Binary file not shown.
Binary file removed release/lib/openfin-desktop-java-example-7.1.1-tests.jar
View file
Open in desktop
Binary file not shown.
Binary file added release/lib/openfin-desktop-java-example-9.0.1-tests.jar
View file
Open in desktop
Binary file not shown.
Binary file renamed ...ib/openfin-desktop-java-example-7.1.1.jar → ...ib/openfin-desktop-java-example-9.0.1.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion release/run.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-8.0.11-SNAPSHOT.jar;lib/openfin-desktop-java-example-7.1.1-tests.jar;lib/openfin-desktop-java-example-7.1.1.jar;lib/openfin-snap-dock-1.0.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable -Dcom.openfin.demo.licenseKey=123456 com.openfin.desktop.demo.OpenFinDesktopDemo
java -cp lib/hamcrest-core-1.3.jar;lib/hamcrest-library-1.1.jar;lib/jetty-client-9.4.18.v20190429.jar;lib/jetty-http-9.4.18.v20190429.jar;lib/jetty-io-9.4.18.v20190429.jar;lib/jetty-util-9.4.18.v20190429.jar;lib/jetty-xml-9.4.18.v20190429.jar;lib/jna-4.5.1.jar;lib/jna-platform-4.5.1.jar;lib/json-20160810.jar;lib/junit-4.11.jar;lib/mockito-core-1.9.5.jar;lib/objenesis-1.0.jar;lib/openfin-desktop-java-adapter-9.0.1-SNAPSHOT.jar;lib/openfin-desktop-java-example-9.0.1-tests.jar;lib/openfin-desktop-java-example-9.0.1.jar;lib/slf4j-api-1.7.21.jar;lib/slf4j-jdk14-1.6.1.jar;lib/slf4j-log4j12-1.7.18.jar;lib/TableLayout-20050920.jar;lib/websocket-api-9.4.18.v20190429.jar;lib/websocket-client-9.4.18.v20190429.jar;lib/websocket-common-9.4.18.v20190429.jar -Djava.util.logging.config.file=logging.properties -Dcom.openfin.temp=%LocalAppData%\OpenFin\temp -Dcom.openfin.demo.version=stable -Dcom.openfin.demo.licenseKey=123456 com.openfin.desktop.demo.OpenFinDesktopDemo

10 changes: 5 additions & 5 deletions src/main/java/com/openfin/desktop/demo/ChannelExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void onSuccess(ChannelProvider provider) {

provider.register("getValue", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
JSONObject obj = new JSONObject();
obj.put("value", x.get());
Expand All @@ -74,7 +74,7 @@ public JSONObject invoke(String action, JSONObject payload, JSONObject senderIde
});
provider.register("increment", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
JSONObject obj = new JSONObject();
obj.put("value", x.incrementAndGet());
Expand All @@ -84,9 +84,9 @@ public JSONObject invoke(String action, JSONObject payload, JSONObject senderIde
});
provider.register("incrementBy", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
int delta = payload.getInt("delta");
int delta = ((JSONObject)payload).getInt("delta");
JSONObject obj = new JSONObject();
obj.put("value", x.addAndGet(delta));
return obj;
Expand All @@ -106,7 +106,7 @@ public void onSuccess(ChannelClient client) {
// register a channel event
client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
logger.info("channel event {}", action);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public void onSuccess(ChannelClient client) {

client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
System.out.printf("channel event " + action);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/openfin/desktop/demo/LayoutFrame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void actionPerformed(ActionEvent e) {

client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
public JSONObject invoke(String action, Object payload, JSONObject senderIdentity) {
System.out.printf("channel event " + action);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/openfin/desktop/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
*/

@RunWith(Suite.class)
@Suite.SuiteClasses({ ApplicationTest.class, OpenFinRuntimeTest.class, WindowTest.class, SystemTest.class, InterApplicationBusTest.class, ChannelTest.class, RuntimeConfigTest.class, SnapshotTest.class})
@Suite.SuiteClasses({ ApplicationTest.class, OpenFinRuntimeTest.class, WindowTest.class, SystemTest.class, InterApplicationBusTest.class, ChannelTest.class, RuntimeConfigTest.class, InteropTest.class, SnapshotTest.class})
public class AllTests {
}
104 changes: 0 additions & 104 deletions src/test/java/com/openfin/desktop/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,110 +155,6 @@ public void createChildWindow() throws Exception {
TestUtils.closeApplication(application);
}

@Test
public void crossAppDockAndUndock() throws Exception {
Application application1 = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);
Application application2 = TestUtils.runApplication(TestUtils.getAppOptions(null), desktopConnection);

WindowBounds beforeMoveBounds = TestUtils.getBounds(application2.getWindow());
CountDownLatch joinLatch = new CountDownLatch(1);
application2.getWindow().joinGroup(application1.getWindow(), new AckListener() {
@Override
public void onSuccess(Ack ack) {
if (ack.isSuccessful()) {
joinLatch.countDown();
}
}
@Override
public void onError(Ack ack) {
logger.error(String.format("onError %s", ack.getReason()));
}
});
joinLatch.await(3, TimeUnit.SECONDS);
assertEquals(joinLatch.getCount(), 0);

// get group info for a window
CountDownLatch groupInfoLatch = new CountDownLatch(2);
application1.getWindow().getGroup(result -> {
for (Window window : result) {
if (window.getUuid().equals(application1.getWindow().getUuid()) && window.getName().equals(application1.getWindow().getName())) {
groupInfoLatch.countDown();
} else if (window.getUuid().equals(application2.getWindow().getUuid()) && window.getName().equals(application2.getWindow().getName())) {
groupInfoLatch.countDown();
}
}
}, new AckListener() {
@Override
public void onSuccess(Ack ack) {
}
@Override
public void onError(Ack ack) {
logger.error(String.format("onError %s", ack.getReason()));
}
});
groupInfoLatch.await(3, TimeUnit.SECONDS);
assertEquals(groupInfoLatch.getCount(), 0);

// get group info for an application
CountDownLatch appGroupInfoLatch = new CountDownLatch(2);
application1.getGroups(result -> {
for (List<Window> list: result) {
for (Window window : list) {
if (window.getUuid().equals(application1.getWindow().getUuid()) && window.getName().equals(application1.getWindow().getName())) {
appGroupInfoLatch.countDown();
} else if (window.getUuid().equals(application2.getWindow().getUuid()) && window.getName().equals(application2.getWindow().getName())) {
appGroupInfoLatch.countDown();
}
}
}
}, new AckListener() {
@Override
public void onSuccess(Ack ack) {
}
@Override
public void onError(Ack ack) {
logger.error(String.format("onError %s", ack.getReason()));
}
}
);
appGroupInfoLatch.await(3, TimeUnit.SECONDS);
assertEquals(appGroupInfoLatch.getCount(), 0);

int leftBy = 20, topBy = 30;
TestUtils.moveWindowBy(application1.getWindow(), leftBy, topBy);
// child window sohuld move with main window since they are docked
WindowBounds afterMoveBounds = TestUtils.getBounds(application2.getWindow());
int topAfterDockMove = afterMoveBounds.getTop(), leftAfterDockMove = afterMoveBounds.getLeft();
assertEquals(afterMoveBounds.getTop() - beforeMoveBounds.getTop(), topBy);
assertEquals(afterMoveBounds.getLeft() - beforeMoveBounds.getLeft(), leftBy);

// undock by leaving the group
CountDownLatch undockLatch = new CountDownLatch(1);
application2.getWindow().leaveGroup(new AckListener() {
@Override
public void onSuccess(Ack ack) {
if (ack.isSuccessful()) {
undockLatch.countDown();
}
}

@Override
public void onError(Ack ack) {
logger.error(String.format("onError %s", ack.getReason()));
}
});
undockLatch.await(5, TimeUnit.SECONDS);
assertEquals(undockLatch.getCount(), 0);
TestUtils.moveWindowBy(application1.getWindow(), leftBy, topBy);
// child window should not move afer leaving group
afterMoveBounds = TestUtils.getBounds(application2.getWindow());
assertEquals(afterMoveBounds.getLeft().intValue(), leftAfterDockMove);
assertEquals(afterMoveBounds.getTop().intValue(), topAfterDockMove);

TestUtils.closeApplication(application1);
TestUtils.closeApplication(application2);
}

@Test
public void addEventListener() throws Exception {
ApplicationOptions options = TestUtils.getAppOptions(null);
Expand Down
Loading