From fcd604b2d2f98680ce9ea8869c69bd186816012b Mon Sep 17 00:00:00 2001 From: Anthony Ho Date: Wed, 8 Apr 2020 15:34:38 +0800 Subject: [PATCH 1/3] ADAP-187 added unit test case for AcceleratorOptions in WindowOptions. --- .../java/com/openfin/desktop/WindowTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/test/java/com/openfin/desktop/WindowTest.java b/src/test/java/com/openfin/desktop/WindowTest.java index c7b2d09..29384a9 100644 --- a/src/test/java/com/openfin/desktop/WindowTest.java +++ b/src/test/java/com/openfin/desktop/WindowTest.java @@ -783,4 +783,28 @@ public void onError(Ack ack) { latch.await(10, TimeUnit.SECONDS); assertEquals("reload test timeout", 0, latch.getCount()); } + + @Test + public void acceleratorSetting() throws Exception { + ApplicationOptions options = TestUtils.getAppOptions(null); + AcceleratorOptions acceleratorOptions = new AcceleratorOptions(); + acceleratorOptions.setDevTools(false); + acceleratorOptions.setReload(true); + acceleratorOptions.setReloadIgnoringCache(false); + acceleratorOptions.setZoom(true); + options.getMainWindowOptions().setAccelerator(acceleratorOptions); + + Application application = TestUtils.runApplication(options, desktopConnection); + Window window = application.getWindow(); + CountDownLatch latch = new CountDownLatch(1); + + window.getOptions(winOpts -> { + AcceleratorOptions opt = winOpts.getAccelerator(); + if (opt.isReload() && opt.isZoom()) { + latch.countDown(); + } + }, null); + latch.await(10, TimeUnit.SECONDS); + assertEquals("acceleratorSetting test timeout", 0, latch.getCount()); + } } From 45e65ef96b3ebb0a9fa8d359bca2ae29b046776e Mon Sep 17 00:00:00 2001 From: Anthony Ho Date: Wed, 8 Apr 2020 15:54:21 +0800 Subject: [PATCH 2/3] ADAP-187 fixed unit test. --- src/test/java/com/openfin/desktop/WindowTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/openfin/desktop/WindowTest.java b/src/test/java/com/openfin/desktop/WindowTest.java index 29384a9..b10b662 100644 --- a/src/test/java/com/openfin/desktop/WindowTest.java +++ b/src/test/java/com/openfin/desktop/WindowTest.java @@ -788,10 +788,10 @@ public void onError(Ack ack) { public void acceleratorSetting() throws Exception { ApplicationOptions options = TestUtils.getAppOptions(null); AcceleratorOptions acceleratorOptions = new AcceleratorOptions(); - acceleratorOptions.setDevTools(false); - acceleratorOptions.setReload(true); - acceleratorOptions.setReloadIgnoringCache(false); - acceleratorOptions.setZoom(true); + acceleratorOptions.setDevtools(true); + acceleratorOptions.setReload(false); + acceleratorOptions.setReloadIgnoringCache(true); + acceleratorOptions.setZoom(false); options.getMainWindowOptions().setAccelerator(acceleratorOptions); Application application = TestUtils.runApplication(options, desktopConnection); @@ -800,7 +800,7 @@ public void acceleratorSetting() throws Exception { window.getOptions(winOpts -> { AcceleratorOptions opt = winOpts.getAccelerator(); - if (opt.isReload() && opt.isZoom()) { + if (opt.isDevtools() && !opt.isReload() && opt.isReloadIgnoringCache() && !opt.isZoom()) { latch.countDown(); } }, null); From c2502566184030fd2e3fa8ed05e1e483c3f68980 Mon Sep 17 00:00:00 2001 From: Anthony Ho Date: Mon, 13 Apr 2020 09:26:49 +0800 Subject: [PATCH 3/3] ADAP-187 added null check. --- src/test/java/com/openfin/desktop/WindowTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/openfin/desktop/WindowTest.java b/src/test/java/com/openfin/desktop/WindowTest.java index b10b662..24a7725 100644 --- a/src/test/java/com/openfin/desktop/WindowTest.java +++ b/src/test/java/com/openfin/desktop/WindowTest.java @@ -800,7 +800,7 @@ public void acceleratorSetting() throws Exception { window.getOptions(winOpts -> { AcceleratorOptions opt = winOpts.getAccelerator(); - if (opt.isDevtools() && !opt.isReload() && opt.isReloadIgnoringCache() && !opt.isZoom()) { + if (opt != null && opt.isDevtools() && !opt.isReload() && opt.isReloadIgnoringCache() && !opt.isZoom()) { latch.countDown(); } }, null);