Content assist computing proposals check, fixes #2094

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
eclipse · Nov 3, 2020 · d4269bd · d4269bd
1 parent 1669a3b
commit d4269bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...ipse.reddeer.jface/src/org/eclipse/reddeer/jface/text/contentassist/ContentAssistant.java b/...ipse.reddeer.jface/src/org/eclipse/reddeer/jface/text/contentassist/ContentAssistant.java
@@ -16,12 +16,12 @@
 
 import org.eclipse.reddeer.common.logging.Logger;
 import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.handler.TableItemHandler;
+import org.eclipse.reddeer.core.lookup.ShellLookup;
 import org.eclipse.reddeer.swt.api.Table;
 import org.eclipse.reddeer.swt.api.TableItem;
 import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
 import org.eclipse.reddeer.swt.impl.shell.AbstractShell;
-import org.eclipse.reddeer.core.handler.TableItemHandler;
-import org.eclipse.reddeer.core.lookup.ShellLookup;
 
 /**
  * This class represents content assistant

diff --git a/....workbench/src/org/eclipse/reddeer/workbench/condition/ContentAssistantShellIsOpened.java b/....workbench/src/org/eclipse/reddeer/workbench/condition/ContentAssistantShellIsOpened.java
@@ -15,17 +15,17 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
 import org.eclipse.reddeer.core.exception.CoreLayerException;
 import org.eclipse.reddeer.core.handler.ShellHandler;
 import org.eclipse.reddeer.core.lookup.ShellLookup;
 import org.eclipse.reddeer.swt.api.Table;
 import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.swt.widgets.Shell;
 
 /**
- * Checks if content assistant shell is open.
- * @author rawagner
+ * Checks if content assistant shell is open and computing of proposals is done.
+ * @author rawagner, odockal
  *
  */
 public class ContentAssistantShellIsOpened extends AbstractWaitCondition {
@@ -57,6 +57,11 @@ public final boolean test() {
                 ShellHandler.getInstance().setFocus(s);
                 try {
                     table = new DefaultTable();
+                    // Eclipse 2020-09(12) added informative string when loading proposals
+                    // https://github.com/eclipse/reddeer/issues/2094
+                    if (table.getItem(0).getText().contains("Computing proposals")) {
+                    	return false;
+                    }
                     this.resultShell = s;
                     return true;
                 } catch (CoreLayerException ex) {

diff --git a/...er.workbench.test/src/org/eclipse/reddeer/workbench/test/view/impl/WorkbenchViewTest.java b/...er.workbench.test/src/org/eclipse/reddeer/workbench/test/view/impl/WorkbenchViewTest.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.eclipse.reddeer.workbench.test.view.impl;
 
-import static org.junit.Assert.*;
-
 import org.eclipse.reddeer.junit.runner.RedDeerSuite;
 import org.eclipse.reddeer.workbench.api.View;
 import org.eclipse.reddeer.workbench.exception.WorkbenchLayerException;