1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00

More descriptive names of temporary files.

Change-Id: Ib3627818fdff1d2d8c63cabe7ed2c3790448f09d
This commit is contained in:
Sergey Prigogin 2014-08-04 09:44:21 -07:00
parent af7c0a635b
commit 914dc65ffb
5 changed files with 18 additions and 15 deletions

View file

@ -217,7 +217,7 @@ public class ResourceLookupTests extends BaseTestCase {
fProject.create(new NullProgressMonitor());
fProject.open(new NullProgressMonitor());
createFolder(fProject, "folder1");
File f= createTempFile("extern", "h");
File f= createTempFile("extern", ".h");
IPath location= Path.fromOSString(f.getAbsolutePath());
IFile file1= fProject.getFile("linked1");
IFile file2= fProject.getFile("linked2.h");

View file

@ -75,7 +75,7 @@ public class GeneratePDOMApplicationTest extends PDOMTestBase {
protected void setUp() throws Exception {
super.setUp();
projectsToDeleteOnTearDown.clear();
target = nonExistentTempFile("temp", "pdom");
target = nonExistentTempFile("temp", ".pdom");
}
@Override

View file

@ -109,7 +109,7 @@ public class PDOMCPPBugsTest extends BaseTestCase {
// this test is currently failing on the cdt test build machine, but
// not on my local linux or windows boxes.
File tmp = nonExistentTempFile("temp", "pdom");
File tmp = nonExistentTempFile("temp", ".pdom");
IIndexLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject());
final PDOMManager pdomManager = CCoreInternals.getPDOMManager();
pdomManager.exportProjectPDOM(cproject, tmp, cvr, null);

View file

@ -11,6 +11,8 @@
*******************************************************************************/
package org.eclipse.cdt.internal.pdom.tests;
import static org.eclipse.cdt.core.testplugin.CProjectHelper.createCCProject;
import java.io.File;
import java.net.URI;
@ -53,10 +55,10 @@ public class PDOMProviderTests extends PDOMTestBase {
}
public void testLifeCycle() throws Exception {
final File tempPDOM= createTempFile("foo", "bar");
final File tempPDOM= createTempFile("temp", ".pdom");
{
ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
ICProject cproject= createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject);
@ -77,7 +79,7 @@ public class PDOMProviderTests extends PDOMTestBase {
}
final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
final ICProject cproject2= createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2);
@ -125,10 +127,10 @@ public class PDOMProviderTests extends PDOMTestBase {
}
public void testCommonSDK() throws Exception {
final File tempPDOM= createTempFile("foo", "bar");
final File tempPDOM= createTempFile("temp", ".pdom");
{
ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
ICProject cproject= createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject);
@ -148,12 +150,12 @@ public class PDOMProviderTests extends PDOMTestBase {
CProjectHelper.delete(cproject);
}
final ICProject cproject3= CProjectHelper.createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
final ICProject cproject3= createCCProject("bar" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject3.getProject(), new Path("/source.cpp"), "namespace Y { class A {}; }\n\n");
waitForIndexer(cproject3);
final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
final ICProject cproject2= createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2);
@ -182,7 +184,7 @@ public class PDOMProviderTests extends PDOMTestBase {
return cproject2.equals(project) || cproject3.equals(project);
}
}
));
));
{
IIndex index= CCorePlugin.getIndexManager().getIndex(cproject2, A_FRAGMENT_OPTIONS);
@ -243,10 +245,10 @@ public class PDOMProviderTests extends PDOMTestBase {
}
public void testVersionMismatchOfExternalPDOM_178998() throws Exception {
final File tempPDOM= createTempFile("foo", "bar");
final File tempPDOM= createTempFile("temp", ".pdom");
{
ICProject cproject= CProjectHelper.createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
ICProject cproject= createCCProject("foo" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject);
ResourceContainerRelativeLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject());
@ -265,7 +267,8 @@ public class PDOMProviderTests extends PDOMTestBase {
}
final URI baseURI= new File("c:/ExternalSDK/").toURI();
final ICProject cproject2= CProjectHelper.createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
final ICProject cproject2=
createCCProject("baz" + System.currentTimeMillis(), null, IPDOMManager.ID_FAST_INDEXER);
TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2);

View file

@ -110,7 +110,7 @@ public class BaseTestCase extends TestCase {
protected File nonExistentTempFile(String prefix, String suffix) {
File file= new File(System.getProperty("java.io.tmpdir"),
prefix + System.currentTimeMillis() + '.' + suffix);
prefix + System.currentTimeMillis() + suffix);
filesToDeleteOnTearDown.add(file);
return file;
}