mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-13 20:15:22 +02:00
Bug 314547 - [testing] NPE test failure in RSESynchronizeTest.testExport
This commit is contained in:
parent
afa0d30c22
commit
d9980e153e
1 changed files with 23 additions and 8 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
|
* Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
@ -8,10 +8,12 @@
|
||||||
* Contributors:
|
* Contributors:
|
||||||
* Martin Oberhuber (Wind River) - initial API and implementation
|
* Martin Oberhuber (Wind River) - initial API and implementation
|
||||||
* Martin Oberhuber (Wind River) - Adapted from org.eclipse.rse.tests / FileServiceTest
|
* Martin Oberhuber (Wind River) - Adapted from org.eclipse.rse.tests / FileServiceTest
|
||||||
|
* Martin Oberhuber (Wind River) - [314547] NPE in RSESynchronizeTest
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
package org.eclipse.rse.tests.synchronize;
|
package org.eclipse.rse.tests.synchronize;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
import junit.framework.Test;
|
import junit.framework.Test;
|
||||||
import junit.framework.TestSuite;
|
import junit.framework.TestSuite;
|
||||||
|
@ -20,8 +22,10 @@ import org.eclipse.core.resources.IFile;
|
||||||
import org.eclipse.core.resources.IFolder;
|
import org.eclipse.core.resources.IFolder;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
import org.eclipse.core.resources.IResource;
|
import org.eclipse.core.resources.IResource;
|
||||||
|
import org.eclipse.rse.internal.importexport.files.Utilities;
|
||||||
import org.eclipse.rse.internal.synchronize.SynchronizeData;
|
import org.eclipse.rse.internal.synchronize.SynchronizeData;
|
||||||
import org.eclipse.rse.internal.synchronize.provisional.ISynchronizeConnectionManager;
|
import org.eclipse.rse.internal.synchronize.provisional.ISynchronizeConnectionManager;
|
||||||
|
import org.eclipse.rse.internal.synchronize.provisional.ISynchronizeOperation;
|
||||||
import org.eclipse.rse.internal.synchronize.provisional.ISynchronizer;
|
import org.eclipse.rse.internal.synchronize.provisional.ISynchronizer;
|
||||||
import org.eclipse.rse.internal.synchronize.provisional.SynchronizeConnectionManager;
|
import org.eclipse.rse.internal.synchronize.provisional.SynchronizeConnectionManager;
|
||||||
import org.eclipse.rse.internal.synchronize.provisional.SynchronizeOperation;
|
import org.eclipse.rse.internal.synchronize.provisional.SynchronizeOperation;
|
||||||
|
@ -111,26 +115,37 @@ public class RSESynchronizeTest extends SynchronizeTestBase {
|
||||||
IFolder folder = project.getFolder("folder");
|
IFolder folder = project.getFolder("folder");
|
||||||
IFile file = project.getFile("file.txt");
|
IFile file = project.getFile("file.txt");
|
||||||
IFile subFile = folder.getFile("subfile.txt");
|
IFile subFile = folder.getFile("subfile.txt");
|
||||||
IResource[] resources = new IResource[] { project, folder, file, subFile };
|
IFile subFile2 = folder.getFile("subfile2.txt");
|
||||||
|
IResource[] resources = new IResource[] { project, folder, file, subFile, subFile2 };
|
||||||
ensureExistsInWorkspace(resources, true);
|
ensureExistsInWorkspace(resources, true);
|
||||||
|
|
||||||
// Initial export of test project to remote folder
|
// Initial export of test project to remote folder
|
||||||
SynchronizeData sd = new SynchronizeData();
|
SynchronizeData sd = new SynchronizeData();
|
||||||
// //What to do here?
|
|
||||||
// sd.addChild(new SynchronizeDataNode());
|
// sync only folder and subFile
|
||||||
|
IResource[] resourcesToSync = new IResource[] { folder, subFile };
|
||||||
|
sd.setElements(Arrays.asList(resourcesToSync));
|
||||||
|
String remoteLocation = Utilities.getAsString(remoteTempDir);
|
||||||
|
sd.setRemoteLocation(remoteLocation);
|
||||||
|
sd.setSynchronizeType(ISynchronizeOperation.SYNC_MODE_OVERRIDE_DEST);
|
||||||
|
|
||||||
ISynchronizer synchronizer = new Synchronizer(sd);
|
ISynchronizer synchronizer = new Synchronizer(sd);
|
||||||
synchronizer.run(new SynchronizeOperation());
|
synchronizer.run(new SynchronizeOperation());
|
||||||
|
|
||||||
// Check file files and folders exist on the remote
|
// Check file files and folders exist on the remote
|
||||||
IRemoteFile rFolder = fss.getRemoteFileObject(remoteTempDir, "folder", getDefaultProgressMonitor());
|
IRemoteFile rProject = fss.getRemoteFileObject(remoteTempDir, project.getName(), getDefaultProgressMonitor());
|
||||||
|
assertTrue("1.0", rProject.exists());
|
||||||
|
IRemoteFile rFolder = fss.getRemoteFileObject(rProject, "folder", getDefaultProgressMonitor());
|
||||||
assertTrue("1.1", rFolder.exists());
|
assertTrue("1.1", rFolder.exists());
|
||||||
assertTrue("1.2", rFolder.isDirectory());
|
assertTrue("1.2", rFolder.isDirectory());
|
||||||
IRemoteFile rFile = fss.getRemoteFileObject(remoteTempDir, "file.txt", getDefaultProgressMonitor());
|
IRemoteFile rFile = fss.getRemoteFileObject(rProject, "file.txt", getDefaultProgressMonitor());
|
||||||
assertTrue("2.1", rFile.exists());
|
assertFalse("2.1", rFile.exists());
|
||||||
assertTrue("2.2", rFile.isFile());
|
|
||||||
IRemoteFile rSubFile = fss.getRemoteFileObject(rFolder, "subfile.txt", getDefaultProgressMonitor());
|
IRemoteFile rSubFile = fss.getRemoteFileObject(rFolder, "subfile.txt", getDefaultProgressMonitor());
|
||||||
assertTrue("3.1", rSubFile.exists());
|
assertTrue("3.1", rSubFile.exists());
|
||||||
assertTrue("3.2", rSubFile.isFile());
|
assertTrue("3.2", rSubFile.isFile());
|
||||||
|
//bug....
|
||||||
|
//IRemoteFile rSubFile2 = fss.getRemoteFileObject(rFolder, "subfile2.txt", getDefaultProgressMonitor());
|
||||||
|
//assertFalse("4.1", rSubFile2.exists());
|
||||||
|
|
||||||
// TODO: Check file contents, timestamp etc
|
// TODO: Check file contents, timestamp etc
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue