Hardening for handling project import, fixes #2168

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
eclipse · May 4, 2022 · 32580d5 · 32580d5
1 parent 778066a
commit 32580d5
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/...pse/src/org/eclipse/reddeer/eclipse/ui/wizards/datatransfer/WizardProjectsImportPage.java b/...pse/src/org/eclipse/reddeer/eclipse/ui/wizards/datatransfer/WizardProjectsImportPage.java
@@ -18,6 +18,7 @@
 import org.eclipse.reddeer.common.logging.Logger;
 import org.eclipse.reddeer.common.wait.TimePeriod;
 import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
 import org.eclipse.reddeer.core.reference.ReferencedComposite;
 import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
 import org.eclipse.reddeer.jface.wizard.WizardPage;
@@ -113,6 +114,8 @@ public List<ImportProject> getProjects(){
 		for (TreeItem item : projectsTree.getItems()){
 			ImportProject project = new ImportProject();
 			project.isChecked = item.isChecked();
+			// workaround to force wait for treeItem to get visible
+			item.expand();
 			project.name = getProjectLabel(item.getText());
 			projects.add(project);
 		}
@@ -177,7 +180,12 @@ private boolean isFileSystem() {
 	}
 
 	private Tree getProjectsTree() {
-		return new DefaultTree(this);
+		DefaultTree tree = new DefaultTree(this);
+		if (tree.isEnabled() && tree.isFocusControl() && tree.isVisible()) {
+			return tree;
+		} else {
+			return new DefaultTree(this);
+		}
 	}
 
 	private TreeItem getProjectTreeItem(Tree projectsTree, String projectName) {
@@ -190,7 +198,17 @@ private TreeItem getProjectTreeItem(Tree projectsTree, String projectName) {
 	}
 
 	private String getProjectLabel(String project){
-		return project.substring(0, project.indexOf('(')).trim();
+		// we expect this form of the project string: my.project (/path/to/my.project)
+		if (project.isBlank()) {
+			throw new CoreLayerException("Project " + project + " is not available in the imported projects");
+		}
+		if (project.indexOf('(') == -1) {
+			// if there is missing '(' we and project is non empty, return trimmed project string
+			return project.trim();
+		} else {
+			// return trimmed project without its path in brackets
+			return project.substring(0, project.indexOf('(')).trim();
+		}
 	}
 
 	private class ProjectIsLoaded extends AbstractWaitCondition {