mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

[199854] Fix regressions in unit tests

Browse source
This commit is contained in:
Martin Oberhuber 2008-05-07 12:23:09 +00:00
parent 2ffdc02079
commit 2561ea2cfd
2 changed files with 51 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java
View file

@ -1538,19 +1538,20 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
if (isVirtual || isArchive) if (isVirtual || isArchive)
{ {
moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor); moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor);
return;
} }
else else
{ {
try try
{ {
rename("", src, tgt, monitor); //$NON-NLS-1$ rename("", src, tgt, monitor); //$NON-NLS-1$
return;
} }
catch (SystemMessageException e) catch (SystemMessageException e)
{ {
moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor); moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor);
return;
} }
// movedOk should never be false otherwise the last DataElement status was null
moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor);
} }
/* /*
@ -2038,6 +2039,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
// first modify the source attribute to temporarily be the date field // first modify the source attribute to temporarily be the date field
de.setAttribute(DE.A_SOURCE, timestamp + ""); //$NON-NLS-1$ de.setAttribute(DE.A_SOURCE, timestamp + ""); //$NON-NLS-1$
ds.command(setCmd, de, true); ds.command(setCmd, de, true);
return;
} }
} }
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
@ -2068,6 +2070,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
{ {
throw new RemoteFileIOException(e); throw new RemoteFileIOException(e);
} }
return;
} }
} }
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID, throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,

1
rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java
View file

@ -171,6 +171,7 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
if (thisName.equals(childName)) if (thisName.equals(childName))
{ {
foundChild = children[i]; foundChild = children[i];
break;
} }
} }
return foundChild; return foundChild;