mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fixed compiler warnings.

Browse source
This commit is contained in:
Sergey Prigogin 2011-08-20 20:19:45 -07:00
parent 0d95c85386
commit 9ba2f49c40
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/index/tests/IndexCompositeTests.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Andrew Ferguson (Symbian) - Initial implementation * Andrew Ferguson (Symbian) - Initial implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.index.tests; package org.eclipse.cdt.internal.index.tests;
@ -96,7 +96,7 @@ public class IndexCompositeTests extends BaseTestCase {
setIndex(cprojA, REFD); assertBCount(1, 1); setIndex(cprojA, REFD); assertBCount(1, 1);
setIndex(cprojA, BOTH); assertBCount(2, 2); setIndex(cprojA, BOTH); assertBCount(2, 2);
} finally { } finally {
for(Iterator i = projects.iterator(); i.hasNext(); ) for (Iterator i = projects.iterator(); i.hasNext();)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); ((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -203,7 +203,7 @@ public class IndexCompositeTests extends BaseTestCase {
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
assertFieldCount("C1", 1); assertFieldCount("C1", 1);
} finally { } finally {
for(Iterator i = projects.iterator(); i.hasNext(); ) for (Iterator i = projects.iterator(); i.hasNext();)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); ((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -226,8 +226,6 @@ public class IndexCompositeTests extends BaseTestCase {
public void testTripleUpwardV() throws Exception { public void testTripleUpwardV() throws Exception {
CharSequence[] contents = getContentsForTest(3); CharSequence[] contents = getContentsForTest(3);
List projects = new ArrayList(); List projects = new ArrayList();
try { try {
ProjectBuilder pb = new ProjectBuilder("projB"+System.currentTimeMillis(), true); ProjectBuilder pb = new ProjectBuilder("projB"+System.currentTimeMillis(), true);
@ -294,7 +292,7 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(7+4+4-2, 7+4+4-2 +2+1+1); assertBCount(7+4+4-2, 7+4+4-2 +2+1+1);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for(Iterator i = projects.iterator(); i.hasNext(); ) for (Iterator i = projects.iterator(); i.hasNext();)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); ((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor());
} }
} }
@ -349,7 +347,7 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(6, 6+1); assertBCount(6, 6+1);
assertNamespaceXMemberCount(1); assertNamespaceXMemberCount(1);
setIndex(cprojC, REFD); setIndex(cprojC, REFD);
assertBCount(6+4+1-1, 6+4+1-1 +1+1+1+1 ); assertBCount(6+4+1-1, 6+4+1-1 +1+1+1+1);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
setIndex(cprojC, BOTH); setIndex(cprojC, BOTH);
assertBCount(6+4+3-2, 6+4+3-2 +1+2+1); assertBCount(6+4+3-2, 6+4+3-2 +1+2+1);
@ -375,24 +373,22 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(3, 3 +1); assertBCount(3, 3 +1);
assertNamespaceXMemberCount(1); assertNamespaceXMemberCount(1);
setIndex(cprojA, REFD); setIndex(cprojA, REFD);
assertBCount(4+2+3-1-1, 4+2+3-1-1 +2+1 ); assertBCount(4+2+3-1-1, 4+2+3-1-1 +2+1);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
setIndex(cprojA, BOTH); setIndex(cprojA, BOTH);
assertBCount(6+4+3-2, 6+4+3-2 +1+2+1); assertBCount(6+4+3-2, 6+4+3-2 +1+2+1);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for(Iterator i = projects.iterator(); i.hasNext(); ) for (Iterator i = projects.iterator(); i.hasNext();)
((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor()); ((ICProject)i.next()).getProject().delete(true, true, new NullProgressMonitor());
} }
} }
/** /**
* Asserts binding counts, and returns the index tested against * Asserts binding counts, and returns the index tested against
* @param cprojA the project to obtain the index for
* @param options the options to obtain the index for
* @param global the number of bindings expected to be found at global scope * @param global the number of bindings expected to be found at global scope
* @param all the number of bindings expected to be found at all scopes * @param all the number of bindings expected to be found at all scopes
* @return * @return the index
* @throws CoreException * @throws CoreException
*/ */
private IIndex assertBCount(int global, int all) throws CoreException { private IIndex assertBCount(int global, int all) throws CoreException {
@ -416,7 +412,7 @@ public class IndexCompositeTests extends BaseTestCase {
} }
private void setIndex(ICProject project, int options) throws CoreException, InterruptedException { private void setIndex(ICProject project, int options) throws CoreException, InterruptedException {
if(index!=null) { if (index != null) {
index.releaseReadLock(); index.releaseReadLock();
} }
index = CCorePlugin.getIndexManager().getIndex(project, options); index = CCorePlugin.getIndexManager().getIndex(project, options);
@ -424,7 +420,7 @@ public class IndexCompositeTests extends BaseTestCase {
} }
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
if(index!=null) { if (index != null) {
index.releaseReadLock(); index.releaseReadLock();
} }
super.tearDown(); super.tearDown();
@ -456,16 +452,17 @@ class ProjectBuilder {
} }
ICProject create() throws CoreException { ICProject create() throws CoreException {
ICProject result = cpp ? CProjectHelper.createCCProject(name, "bin", IPDOMManager.ID_NO_INDEXER) ICProject result = cpp ?
: CProjectHelper.createCCProject(name, "bin", IPDOMManager.ID_NO_INDEXER); CProjectHelper.createCCProject(name, "bin", IPDOMManager.ID_NO_INDEXER) :
CProjectHelper.createCCProject(name, "bin", IPDOMManager.ID_NO_INDEXER);
for(Iterator i = path2content.entrySet().iterator(); i.hasNext(); ) { for (Iterator i = path2content.entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next(); Map.Entry entry = (Map.Entry) i.next();
TestSourceReader.createFile(result.getProject(), new Path((String)entry.getKey()), (String) entry.getValue()); TestSourceReader.createFile(result.getProject(), new Path((String)entry.getKey()), (String) entry.getValue());
} }
IProjectDescription desc = result.getProject().getDescription(); IProjectDescription desc = result.getProject().getDescription();
desc.setReferencedProjects( (IProject[]) dependencies.toArray(new IProject[dependencies.size()]) ); desc.setReferencedProjects((IProject[]) dependencies.toArray(new IProject[dependencies.size()]));
result.getProject().setDescription(desc, new NullProgressMonitor()); result.getProject().setDescription(desc, new NullProgressMonitor());
CCorePlugin.getIndexManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER); CCorePlugin.getIndexManager().setIndexerId(result, IPDOMManager.ID_FAST_INDEXER);