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

Fixes a test-failure.

Browse source
This commit is contained in:
Markus Schorn 2009-01-13 12:01:30 +00:00
parent feffc835cb
commit c80603bf86
4 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java
View file

@ -49,6 +49,7 @@ import org.eclipse.cdt.core.index.IIndex;
import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IIndexFile;
import org.eclipse.cdt.core.index.IndexLocationFactory; import org.eclipse.cdt.core.index.IndexLocationFactory;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.ICProject; import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.BaseTestCase;
import org.eclipse.cdt.core.testplugin.util.TestSourceReader; import org.eclipse.cdt.core.testplugin.util.TestSourceReader;
@ -115,6 +116,8 @@ public class BaseUITestCase extends BaseTestCase {
Thread.sleep(50); Thread.sleep(50);
firstTime= false; firstTime= false;
if (CCorePlugin.getIndexManager().isIndexerSetupPostponed(CoreModel.getDefault().create(file.getProject())))
continue;
index.acquireReadLock(); index.acquireReadLock();
try { try {
IIndexFile pfile= index.getFile(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file)); IIndexFile pfile= index.getFile(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file));

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java
View file

@ -46,6 +46,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe
"__null", "__null",
"__real__", "__real__",
"__stdcall", "__stdcall",
"__thread",
}; };
public CompletionTest_MacroRef_NoPrefix(String name) { public CompletionTest_MacroRef_NoPrefix(String name) {

1
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java
View file

@ -375,6 +375,7 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest {
"__null", "__null",
"__real__", "__real__",
"__stdcall", "__stdcall",
"__thread",
}; };
assertCompletionResults(expected); assertCompletionResults(expected);
} }

2
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java
View file

@ -917,7 +917,7 @@ public class CPPSelectionTestsNoIndexer extends BaseUITestCase {
int offset = code.indexOf("rator short(); // F3"); //$NON-NLS-1$ int offset = code.indexOf("rator short(); // F3"); //$NON-NLS-1$
IASTNode decl = testF3(file, offset); IASTNode decl = testF3(file, offset);
assertTrue(decl instanceof IASTName); assertTrue(decl instanceof IASTName);
assertEquals(((IASTName)decl).toString(), "operator short"); //$NON-NLS-1$ assertEquals(((IASTName)decl).toString(), "operator short int"); //$NON-NLS-1$
assertEquals(((ASTNode)decl).getOffset(), 11); assertEquals(((ASTNode)decl).getOffset(), 11);
assertEquals(((ASTNode)decl).getLength(), 14); assertEquals(((ASTNode)decl).getLength(), 14);
} }