ADAP-207: cleanup

wenjunche · wenjunche · commit 2ad5cf941105 · 2022-01-20T21:57:03.000-05:00
diff --git a/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java b/src/test/java/com/openfin/desktop/OpenFinRuntimeTest.java
@@ -48,7 +48,7 @@ public static void teardown() throws Exception {
     public void getDeviceId() throws Exception {
         logger.debug("start getDeviceId");
         CountDownLatch latch = new CountDownLatch(1);
-        runtime.getDeviceId(new AckListener() {
+        runtime.getMachineId(new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
diff --git a/src/test/java/com/openfin/desktop/SnapshotTest.java b/src/test/java/com/openfin/desktop/SnapshotTest.java
@@ -1,9 +1,6 @@
 package com.openfin.desktop;
 
-import com.openfin.desktop.snapshot.SnapshotSource;
 import com.openfin.desktop.snapshot.SnapshotSourceProvider;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.LocatorEx;
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -16,7 +13,6 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 public class SnapshotTest implements SnapshotSourceProvider {
 
diff --git a/src/test/java/com/openfin/desktop/SystemTest.java b/src/test/java/com/openfin/desktop/SystemTest.java
@@ -50,7 +50,7 @@ public static void teardown() throws Exception {
     @Test
     public void getDeviceId() throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
-        runtime.getDeviceId(new AckListener() {
+        runtime.getMachineId(new AckListener() {
             @Override
             public void onSuccess(Ack ack) {
                 if (ack.isSuccessful()) {
diff --git a/src/test/java/com/openfin/desktop/TestUtils.java b/src/test/java/com/openfin/desktop/TestUtils.java
@@ -298,15 +298,7 @@ public void eventReceived(ActionEvent actionEvent) {
         };
         addEventListener(application, "closed", listener);
 
-        application.close(new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-            }
-            @Override
-            public void onError(Ack ack) {
-                logger.error(ack.getReason());
-            }
-        });
+        application.close();
         stoppedLatch.await(5, TimeUnit.SECONDS);
         assertEquals("Close application timeout " + application.getUuid(), stoppedLatch.getCount(), 0);
     }
