Skip to content

Commit

Permalink
Fix for PlainJavaProjectConfigureClasspathTest (#11109)
Browse files Browse the repository at this point in the history
Signed-off-by: Valeriy Svydenko <vsvydenk@redhat.com>
  • Loading branch information
Valeriy Svydenko authored and tsmaeder committed Oct 16, 2018
1 parent 4445218 commit d629310
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
Expand Up @@ -20,7 +20,6 @@
import org.eclipse.che.ide.api.resources.Project;
import org.eclipse.che.ide.ext.java.client.project.classpath.valueproviders.pages.ClasspathPagePresenter;
import org.eclipse.che.ide.ext.java.client.project.classpath.valueproviders.selectnode.interceptors.ClasspathNodeInterceptor;
import org.eclipse.che.ide.ext.java.client.project.classpath.valueproviders.selectnode.interceptors.JarNodeInterceptor;
import org.eclipse.che.ide.resources.tree.ResourceNode;
import org.eclipse.che.ide.ui.smartTree.data.Node;
import org.eclipse.che.ide.ui.smartTree.data.settings.SettingsProvider;
Expand All @@ -32,8 +31,6 @@
*/
@Singleton
public class SelectNodePresenter implements SelectNodeView.ActionDelegate {
private static final String WORKSPACE_PATH = "/projects";

private final SelectNodeView view;
private final ResourceNode.NodeFactory nodeFactory;
private final SettingsProvider settingsProvider;
Expand Down Expand Up @@ -90,9 +87,6 @@ public void show(
/** {@inheritDoc} */
@Override
public void setSelectedNode(String path) {
if (interceptor instanceof JarNodeInterceptor) {
path = WORKSPACE_PATH + path;
}
classpathPagePresenter.addNode(path, interceptor.getKind());
}
}
Expand Up @@ -175,16 +175,16 @@ public void checkConfigureClasspathPlainJavaProject() {
configureClasspath.openItemInSelectPathForm(LIB_PROJECT);
configureClasspath.selectItemInSelectPathForm("log4j-1.2.17.jar");
configureClasspath.clickOkBtnSelectPathForm();
configureClasspath.waitExpectedTextJarsAndFolderArea("log4j-1.2.17.jar - /projects/lib");
configureClasspath.deleteJarOrFolderFromBuildPath("log4j-1.2.17.jar - /projects/lib");
configureClasspath.waitExpectedTextJarsAndFolderArea("log4j-1.2.17.jar - /lib");
configureClasspath.deleteJarOrFolderFromBuildPath("log4j-1.2.17.jar - /lib");
configureClasspath.waitExpectedTextIsNotPresentInJarsAndFolderArea(
"log4j-1.2.17.jar - /projects/lib");
configureClasspath.addJarOrFolderToBuildPath(ConfigureClasspath.ADD_JAR);
configureClasspath.waitSelectPathFormIsOpen();
configureClasspath.openItemInSelectPathForm(LIB_PROJECT);
configureClasspath.selectItemInSelectPathForm("mockito-core-2.21.0.jar");
configureClasspath.clickOkBtnSelectPathForm();
configureClasspath.waitExpectedTextJarsAndFolderArea("mockito-core-2.21.0.jar - /projects/lib");
configureClasspath.waitExpectedTextJarsAndFolderArea("mockito-core-2.10.0.jar - /lib");
configureClasspath.clickOnDoneBtnConfigureClasspath();
projectExplorer.openItemByPath(PROJECT_NAME + "/src");
projectExplorer.openItemByPath(PROJECT_NAME + "/src/com/company");
Expand Down

0 comments on commit d629310

Please sign in to comment.