mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-14 12:35:22 +02:00
[199854] Fix regressions in unit tests
This commit is contained in:
parent
2ffdc02079
commit
2561ea2cfd
2 changed files with 51 additions and 47 deletions
|
@ -1538,19 +1538,20 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
|||
if (isVirtual || isArchive)
|
||||
{
|
||||
moveByCopy(srcParent, srcName, tgtParent, tgtName, monitor);
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
rename("", src, tgt, monitor); //$NON-NLS-1$
|
||||
return;
|
||||
}
|
||||
catch (SystemMessageException e)
|
||||
{
|
||||
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
|
||||
de.setAttribute(DE.A_SOURCE, timestamp + ""); //$NON-NLS-1$
|
||||
ds.command(setCmd, de, true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
|
||||
|
@ -2068,6 +2070,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
|
|||
{
|
||||
throw new RemoteFileIOException(e);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
throw new SystemMessageException(new SimpleSystemMessage(Activator.PLUGIN_ID,
|
||||
|
|
|
@ -171,6 +171,7 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
|
|||
if (thisName.equals(childName))
|
||||
{
|
||||
foundChild = children[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
return foundChild;
|
||||
|
|
Loading…
Add table
Reference in a new issue