mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
Merge remote-tracking branch 'origin/R2_0_maintenance'
Change-Id: If130256bcc7453a655d7bf9a2c58734fffc91f30 Signed-off-by: Greg Watson <g.watson@computer.org>
This commit is contained in:
Greg Watson
commit
5255500d7e
7 changed files with 1065 additions and 800 deletions
|
|
@ -188,7 +188,7 @@ public class RemoteResourceBrowserWidget extends Composite {
|
|||
private String fDialogLabel;
|
||||
|
||||
private boolean fShowHidden;
|
||||
private final List<IFileStore> fResources = new ArrayList<>();
|
||||
private final List<IFileStore> fResources = new ArrayList<IFileStore>();
|
||||
private String fResource;
|
||||
private String fInitialPath;
|
||||
private IPath fRootPath;
|
||||
|
|
@ -404,7 +404,9 @@ public class RemoteResourceBrowserWidget extends Composite {
|
|||
/*
|
||||
* Only add filter if we are a directory browser. File and resource browsers show everything.
|
||||
*/
|
||||
if ((fOptionFlags & DIRECTORY_BROWSER) != 0) {
|
||||
int mask = FILE_BROWSER|DIRECTORY_BROWSER;
|
||||
if ((fOptionFlags & mask) != mask // Avoid filter on resource browsers.
|
||||
&& (fOptionFlags & DIRECTORY_BROWSER) != 0) {
|
||||
fTreeViewer.addFilter(new ViewerFilter() {
|
||||
@Override
|
||||
public boolean select(Viewer viewer, Object parentElement, Object element) {
|
||||
|
|
|
|||
7
tests/org.eclipse.remote.ui.tests/.classpath
Normal file
7
tests/org.eclipse.remote.ui.tests/.classpath
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
28
tests/org.eclipse.remote.ui.tests/.project
Normal file
28
tests/org.eclipse.remote.ui.tests/.project
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>org.eclipse.remote.ui.tests</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.ManifestBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.SchemaBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||
org.eclipse.jdt.core.compiler.compliance=1.8
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.source=1.8
|
||||
13
tests/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF
Normal file
13
tests/org.eclipse.remote.ui.tests/META-INF/MANIFEST.MF
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Remote UI Tests
|
||||
Bundle-SymbolicName: org.eclipse.remote.ui.tests
|
||||
Bundle-Version: 1.0.0.qualifier
|
||||
Fragment-Host: org.eclipse.remote.ui;bundle-version="2.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Require-Bundle: org.junit;bundle-version="4.12.0",
|
||||
org.eclipse.remote.core,
|
||||
org.eclipse.ui.workbench,
|
||||
org.eclipse.swt,
|
||||
org.eclipse.core.filesystem
|
||||
Bundle-Vendor: Eclipse PTP
|
||||
4
tests/org.eclipse.remote.ui.tests/build.properties
Normal file
4
tests/org.eclipse.remote.ui.tests/build.properties
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
source.. = src/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.
|
||||
|
|
@ -0,0 +1,204 @@
|
|||
/*
|
||||
* Copyright (c) 2016 IBM Corporation and others.
|
||||
* 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:
|
||||
* IBM Corporation - initial API and implementation
|
||||
*/
|
||||
package org.eclipse.remote.ui.tests;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.core.filesystem.IFileStore;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.remote.core.IRemoteConnection;
|
||||
import org.eclipse.remote.core.IRemoteConnectionHostService;
|
||||
import org.eclipse.remote.core.IRemoteConnectionType;
|
||||
import org.eclipse.remote.core.IRemoteConnectionWorkingCopy;
|
||||
import org.eclipse.remote.core.IRemoteServicesManager;
|
||||
import org.eclipse.remote.core.exception.RemoteConnectionException;
|
||||
import org.eclipse.remote.internal.ui.RemoteUIPlugin;
|
||||
import org.eclipse.remote.ui.dialogs.RemoteResourceBrowser;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
/*
|
||||
* Provides tests to several scenarios but they should be
|
||||
* executed manually (i.e. browse and click OK)
|
||||
*/
|
||||
@RunWith(JUnit4.class)
|
||||
public class RemoteResourceBrowserTest {
|
||||
private static final String USERNAME = "test"; //$NON-NLS-1$
|
||||
private static final String PASSWORD = ""; //$NON-NLS-1$
|
||||
private static final String HOST = "localhost"; //$NON-NLS-1$
|
||||
private static IRemoteConnectionType fConnectionType;
|
||||
private static IRemoteConnection fRemoteConnection;
|
||||
private static Shell shell = null;
|
||||
private RemoteResourceBrowser browser;
|
||||
private IFileStore expectedResource;
|
||||
|
||||
@BeforeClass
|
||||
public static void setUp() {
|
||||
IRemoteServicesManager manager = RemoteUIPlugin.getService(IRemoteServicesManager.class);
|
||||
fConnectionType = manager.getConnectionType("org.eclipse.remote.JSch"); //$NON-NLS-1$
|
||||
assertNotNull(fConnectionType);
|
||||
IRemoteConnectionWorkingCopy wc = null;
|
||||
try {
|
||||
wc = fConnectionType.newConnection("test_connection");//$NON-NLS-1$
|
||||
} catch (RemoteConnectionException e) {
|
||||
fail(e.getLocalizedMessage());
|
||||
}
|
||||
|
||||
IRemoteConnectionHostService hostService = wc.getService(IRemoteConnectionHostService.class);
|
||||
assertNotNull(hostService);
|
||||
|
||||
String host = System.getenv("TEST_HOST");
|
||||
if (host == null) {
|
||||
host = HOST;
|
||||
}
|
||||
hostService.setHostname(host);
|
||||
|
||||
String username = System.getenv("TEST_USERNAME");
|
||||
if (username == null) {
|
||||
username = USERNAME;
|
||||
}
|
||||
hostService.setUsername(username);
|
||||
|
||||
String password = System.getenv("TEST_PASSWORD");
|
||||
if (password == null) {
|
||||
password = PASSWORD;
|
||||
}
|
||||
hostService.setPassword(password);
|
||||
|
||||
try {
|
||||
fRemoteConnection = wc.save();
|
||||
} catch (RemoteConnectionException e) {
|
||||
fail(e.getLocalizedMessage());
|
||||
}
|
||||
assertNotNull(fRemoteConnection);
|
||||
|
||||
try {
|
||||
fRemoteConnection.open(new NullProgressMonitor());
|
||||
} catch (RemoteConnectionException e) {
|
||||
fail(e.getLocalizedMessage());
|
||||
}
|
||||
assertTrue(fRemoteConnection.isOpen());
|
||||
|
||||
shell = PlatformUI.getWorkbench().getDisplay().getActiveShell();
|
||||
assertNotNull(shell);
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void tearDown() throws RemoteConnectionException {
|
||||
fConnectionType.removeConnection(fRemoteConnection);
|
||||
}
|
||||
/*
|
||||
* Select any file.
|
||||
*/
|
||||
@Test
|
||||
public void browseFileTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setType(RemoteResourceBrowser.FILE_BROWSER);
|
||||
browser.setTitle("Allows to select file only");
|
||||
browser.open();
|
||||
expectedResource = browser.getResource();
|
||||
assertNotNull(expectedResource);
|
||||
assertTrue(!expectedResource.fetchInfo().isDirectory());
|
||||
}
|
||||
/*
|
||||
* Select any directory.
|
||||
*/
|
||||
@Test
|
||||
public void browseDirectoryTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
|
||||
browser.setTitle("Allows to select directory only");
|
||||
browser.open();
|
||||
expectedResource = browser.getResource();
|
||||
assertNotNull(expectedResource);
|
||||
assertTrue(expectedResource.fetchInfo().isDirectory());
|
||||
}
|
||||
/*
|
||||
* Select either file or directory.
|
||||
*/
|
||||
@Test
|
||||
public void browseResourceTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setTitle("Allows to select either file or directory");
|
||||
browser.open();
|
||||
expectedResource = browser.getResource();
|
||||
assertNotNull(expectedResource);
|
||||
}
|
||||
/*
|
||||
* Select more than one resource.
|
||||
*/
|
||||
@Test
|
||||
public void browseResourcesTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.MULTI);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setTitle("Allows to select either multiple resources");
|
||||
browser.open();
|
||||
List<IFileStore> expectedResources = browser.getResources();
|
||||
assertNotNull(expectedResources);
|
||||
assertTrue(expectedResources.size() > 0);
|
||||
}
|
||||
/*
|
||||
* Select to local connection and select a directory.
|
||||
*/
|
||||
@Test
|
||||
public void changeLocalConnectionTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setTitle("Allows to switch to local browsing");
|
||||
browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
|
||||
browser.showConnections(true);
|
||||
browser.showLocalSelection(true);
|
||||
browser.open();
|
||||
expectedResource = browser.getResource();
|
||||
assertNotNull(expectedResource);
|
||||
assertEquals(expectedResource.getFileSystem().getScheme(), "file");
|
||||
}
|
||||
/*
|
||||
* Initial path set.
|
||||
*/
|
||||
@Test
|
||||
public void setInitialPathTest() {
|
||||
String initialPath = "/tmp";
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setTitle("Initial path set to " + initialPath);
|
||||
browser.setType(RemoteResourceBrowser.FILE_BROWSER);
|
||||
browser.setInitialPath(initialPath);
|
||||
browser.open();
|
||||
}
|
||||
/*
|
||||
* Show connections.
|
||||
* Don't show hidden check box and new folder button.
|
||||
*/
|
||||
@Test
|
||||
public void changeDefaultSettingsTest() {
|
||||
browser = new RemoteResourceBrowser(shell, SWT.SINGLE);
|
||||
browser.setConnection(fRemoteConnection);
|
||||
browser.setType(RemoteResourceBrowser.FILE_BROWSER);
|
||||
browser.showConnections(true);
|
||||
browser.showHiddenCheckbox(false);
|
||||
browser.showNewFolderButton(false);
|
||||
browser.open();
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue