mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

More descriptive names of temporary files.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/ResourceLookupTests.java
View file

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

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/GeneratePDOMApplicationTest.java
View file

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

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMCPPBugsTest.java
View file

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

23
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMProviderTests.java
View file

@ -11,6 +11,8 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.pdom.tests; package org.eclipse.cdt.internal.pdom.tests;
import static org.eclipse.cdt.core.testplugin.CProjectHelper.createCCProject;
import java.io.File; import java.io.File;
import java.net.URI; import java.net.URI;
@ -53,10 +55,10 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
public void testLifeCycle() throws Exception { 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"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject); waitForIndexer(cproject);
@ -77,7 +79,7 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
final URI baseURI= new File("c:/ExternalSDK/").toURI(); 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"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2); waitForIndexer(cproject2);
@ -125,10 +127,10 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
public void testCommonSDK() throws Exception { 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"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject); waitForIndexer(cproject);
@ -148,12 +150,12 @@ public class PDOMProviderTests extends PDOMTestBase {
CProjectHelper.delete(cproject); 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"); TestSourceReader.createFile(cproject3.getProject(), new Path("/source.cpp"), "namespace Y { class A {}; }\n\n");
waitForIndexer(cproject3); waitForIndexer(cproject3);
final URI baseURI= new File("c:/ExternalSDK/").toURI(); 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"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2); waitForIndexer(cproject2);
@ -243,10 +245,10 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
public void testVersionMismatchOfExternalPDOM_178998() throws Exception { 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"); TestSourceReader.createFile(cproject.getProject(), new Path("/this.h"), "class A {};\n\n");
waitForIndexer(cproject); waitForIndexer(cproject);
ResourceContainerRelativeLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject()); ResourceContainerRelativeLocationConverter cvr= new ResourceContainerRelativeLocationConverter(cproject.getProject());
@ -265,7 +267,8 @@ public class PDOMProviderTests extends PDOMTestBase {
} }
final URI baseURI= new File("c:/ExternalSDK/").toURI(); 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"); TestSourceReader.createFile(cproject2.getProject(), new Path("/source.cpp"), "namespace X { class A {}; }\n\n");
waitForIndexer(cproject2); waitForIndexer(cproject2);

2
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/util/BaseTestCase.java
View file

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