bug 372610: SWT: Scout model value not updated because of a missing lost focus event

https://bugs.eclipse.org/bugs/show_bug.cgi?id=372610

Return true even if the control is null, this can be the case if a tray
menu was selected

Change-Id: I62db0e7fd8d412339cf0759176ae0fa328282ef5
Signed-off-by: Matthias Nick <Matthias.Nick@bsiag.com>
Reviewed-on: https://git.eclipse.org/r/21792
Reviewed-by: Judith Gull <jgu@bsiag.com>
IP-Clean: Judith Gull <jgu@bsiag.com>
Tested-by: Hudson CI

3 files changed, 46 insertions, 13 deletions

diff --git a/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityTest.java b/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityTest.java
index 408951d720..83255e8bb5 100644
--- a/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityTest.java
+++ b/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityTest.java
@@ -1,7 +1,8 @@
 package org.eclipse.scout.rt.ui.swt.util;
 
+import static org.junit.Assert.assertEquals;
+
 import org.eclipse.scout.rt.client.ui.action.keystroke.KeyStroke;
-import org.junit.Assert;
 import org.junit.Test;
 
 /**
@@ -14,24 +15,23 @@ public class SwtUtilityTest {
   @Test
   public void testKeyStrokeRepresentation() {
     KeyStroke ks = new KeyStroke("f11");
-    Assert.assertEquals("KeyStroke should be f11", "f11", ks.getKeyStroke());
-    Assert.assertEquals("KeyStroke pretty printed should be F11", "F11", SwtUtility.getKeyStrokePrettyPrinted(ks));
+    assertEquals("KeyStroke should be f11", "f11", ks.getKeyStroke());
+    assertEquals("KeyStroke pretty printed should be F11", "F11", SwtUtility.getKeyStrokePrettyPrinted(ks));
 
     ks = new KeyStroke("a");
-    Assert.assertEquals("KeyStroke should be 'a'", "a", ks.getKeyStroke());
-    Assert.assertEquals("KeyStroke pretty printed should be a", "a", SwtUtility.getKeyStrokePrettyPrinted(ks));
+    assertEquals("KeyStroke should be 'a'", "a", ks.getKeyStroke());
+    assertEquals("KeyStroke pretty printed should be a", "a", SwtUtility.getKeyStrokePrettyPrinted(ks));
 
     ks = new KeyStroke("alternate-f1");
-    Assert.assertEquals("KeyStroke should be alternate-f1", "alternate-f1", ks.getKeyStroke());
-    Assert.assertEquals("KeyStroke pretty printed should be Alt+F1", "Alt+F1", SwtUtility.getKeyStrokePrettyPrinted(ks));
+    assertEquals("KeyStroke should be alternate-f1", "alternate-f1", ks.getKeyStroke());
+    assertEquals("KeyStroke pretty printed should be Alt+F1", "Alt+F1", SwtUtility.getKeyStrokePrettyPrinted(ks));
 
     ks = new KeyStroke("control-alternate-1");
-    Assert.assertEquals("KeyStroke should be control-alternate-1", "control-alternate-1", ks.getKeyStroke());
-    Assert.assertEquals("KeyStroke pretty printed should be Ctrl+Alt+1", "Ctrl+Alt+1", SwtUtility.getKeyStrokePrettyPrinted(ks));
+    assertEquals("KeyStroke should be control-alternate-1", "control-alternate-1", ks.getKeyStroke());
+    assertEquals("KeyStroke pretty printed should be Ctrl+Alt+1", "Ctrl+Alt+1", SwtUtility.getKeyStrokePrettyPrinted(ks));
 
     ks = new KeyStroke("");
-    Assert.assertEquals("KeyStroke should be empty", "", ks.getKeyStroke());
-    Assert.assertEquals("KeyStroke pretty printed should be empty", "", SwtUtility.getKeyStrokePrettyPrinted(ks));
+    assertEquals("KeyStroke should be empty", "", ks.getKeyStroke());
+    assertEquals("KeyStroke pretty printed should be empty", "", SwtUtility.getKeyStrokePrettyPrinted(ks));
   }
-
 }
diff --git a/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityUiTest.java b/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityUiTest.java
new file mode 100644
index 0000000000..43b633b309
--- /dev/null
+++ b/org.eclipse.scout.rt.ui.swt.test/src/org/eclipse/scout/rt/ui/swt/util/SwtUtilityUiTest.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2014 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.scout.rt.ui.swt.util;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link SwtUtility}.
+ * Tests in this class require an UI.
+ * 
+ * @since 3.10.0-M6
+ */
+public class SwtUtilityUiTest {
+  /**
+   * Test for {@link SwtUtility#runSwtInputVerifier()}. The verifier should return <code>True</code> if no control has
+   * the focus, this can be the case if a tray menu was selected
+   */
+  @Test
+  public void testRunSwtInputVerifier() {
+    assertTrue(SwtUtility.runSwtInputVerifier());
+    assertTrue(SwtUtility.runSwtInputVerifier(null));
+  }
+}
diff --git a/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/util/SwtUtility.java b/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/util/SwtUtility.java
index 7c4ddb6a27..98d0249a47 100644
--- a/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/util/SwtUtility.java
+++ b/org.eclipse.scout.rt.ui.swt/src/org/eclipse/scout/rt/ui/swt/util/SwtUtility.java
@@ -1102,7 +1102,7 @@ public final class SwtUtility {
    */
   public static boolean runSwtInputVerifier(Control control) {
     if (control == null || control.isDisposed()) {
-      return false;
+      return true; //continue, a tray menu can be selected for example
     }
 
     ISwtScoutComposite compositeOnWidget = SwtScoutComposite.getCompositeOnWidget(control);