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

Use generics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-02-07 10:24:00 -08:00
parent 929cc935a9
commit fda493a012
1 changed files with 16 additions and 17 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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2012 Symbian Software Systems and others. * Copyright (c) 2007, 2013 Symbian Software Systems and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,13 +7,13 @@
* *
* Contributors: * Contributors:
* Andrew Ferguson (Symbian) - Initial implementation * Andrew Ferguson (Symbian) - Initial implementation
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.index.tests; package org.eclipse.cdt.internal.index.tests;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -52,8 +52,8 @@ public class IndexCompositeTests extends BaseTestCase {
private static class ProjectBuilder { private static class ProjectBuilder {
private final String name; private final String name;
private final boolean cpp; private final boolean cpp;
private List dependencies = new ArrayList(); private List<IProject> dependencies = new ArrayList<IProject>();
private Map path2content = new HashMap(); private Map<String, String> path2content = new HashMap<String, String>();
ProjectBuilder(String name, boolean cpp) { ProjectBuilder(String name, boolean cpp) {
this.name = name; this.name = name;
@ -73,16 +73,15 @@ public class IndexCompositeTests extends BaseTestCase {
ICProject create() throws Exception { ICProject create() throws Exception {
ICProject result = cpp ? 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); CProjectHelper.createCProject(name, "bin", IPDOMManager.ID_NO_INDEXER);
IFile lastFile= null; IFile lastFile= null;
for (Iterator i = path2content.entrySet().iterator(); i.hasNext();) { for (Map.Entry<String, String> entry : path2content.entrySet()) {
Map.Entry entry = (Map.Entry) i.next(); lastFile= TestSourceReader.createFile(result.getProject(), new Path(entry.getKey()), entry.getValue());
lastFile= 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(dependencies.toArray(new IProject[dependencies.size()]));
result.getProject().setDescription(desc, new NullProgressMonitor()); result.getProject().setDescription(desc, new NullProgressMonitor());
IIndexManager indexManager = CCorePlugin.getIndexManager(); IIndexManager indexManager = CCorePlugin.getIndexManager();
@ -152,10 +151,11 @@ 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 (ICProject project : projects) for (ICProject project : projects) {
project.getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
}
// class C1 {public: int i;}; // class C1 {public: int i;};
// namespace X { class C2 {}; } // namespace X { class C2 {}; }
@ -226,7 +226,6 @@ public class IndexCompositeTests extends BaseTestCase {
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
assertFieldCount("C1", 1); assertFieldCount("C1", 1);
setIndex(cprojB, NONE); setIndex(cprojB, NONE);
assertBCount(gBC, aBC); assertBCount(gBC, aBC);
assertNamespaceXMemberCount(2); assertNamespaceXMemberCount(2);
@ -247,7 +246,6 @@ public class IndexCompositeTests extends BaseTestCase {
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
assertFieldCount("C1", 1); assertFieldCount("C1", 1);
setIndex(cprojA, NONE); setIndex(cprojA, NONE);
assertBCount(gABC, aABC); assertBCount(gABC, aABC);
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
@ -268,10 +266,11 @@ public class IndexCompositeTests extends BaseTestCase {
assertNamespaceXMemberCount(5); assertNamespaceXMemberCount(5);
assertFieldCount("C1", 1); assertFieldCount("C1", 1);
} finally { } finally {
for (ICProject project : projects) for (ICProject project : projects) {
project.getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
}
// class B1 {}; // class B1 {};
// namespace X { class B2 {}; } // namespace X { class B2 {}; }
@ -310,7 +309,6 @@ public class IndexCompositeTests extends BaseTestCase {
ICProject cprojC = pb.create(); ICProject cprojC = pb.create();
projects.add(cprojC); projects.add(cprojC);
/* A C | /* A C |
* \ / | Depends On / References * \ / | Depends On / References
* B V * B V
@ -329,7 +327,6 @@ public class IndexCompositeTests extends BaseTestCase {
final int gAB= gA + gB - 1, aAB= aA + aB - 1; final int gAB= gA + gB - 1, aAB= aA + aB - 1;
final int gABC= gA + gBC - 1, aABC= aA + aBC - 1; final int gABC= gA + gBC - 1, aABC= aA + aBC - 1;
setIndex(cprojC, NONE); setIndex(cprojC, NONE);
assertBCount(gBC, aBC); assertBCount(gBC, aBC);
assertNamespaceXMemberCount(3); assertNamespaceXMemberCount(3);
@ -369,10 +366,11 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(gABC, aABC); assertBCount(gABC, aABC);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for (ICProject project : projects) for (ICProject project : projects) {
project.getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
}
// class C1 {}; // class C1 {};
// namespace X { class C2 {}; } // namespace X { class C2 {}; }
@ -466,10 +464,11 @@ public class IndexCompositeTests extends BaseTestCase {
assertBCount(gABC, aABC); assertBCount(gABC, aABC);
assertNamespaceXMemberCount(4); assertNamespaceXMemberCount(4);
} finally { } finally {
for (ICProject project : projects) for (ICProject project : projects) {
project.getProject().delete(true, true, new NullProgressMonitor()); project.getProject().delete(true, true, new NullProgressMonitor());
} }
} }
}
/** /**
* Asserts binding counts, and returns the index tested against * Asserts binding counts, and returns the index tested against