From c80603bf8696ac360934f5449c455508c1319473 Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 13 Jan 2009 12:01:30 +0000 Subject: [PATCH] Fixes a test-failure. --- .../ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java | 3 +++ .../text/contentassist2/CompletionTest_MacroRef_NoPrefix.java | 1 + .../ui/tests/text/contentassist2/CompletionTests_PlainC.java | 1 + .../ui/tests/text/selection/CPPSelectionTestsNoIndexer.java | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java index 01d3578d8d6..79b81346454 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/BaseUITestCase.java @@ -49,6 +49,7 @@ import org.eclipse.cdt.core.index.IIndex; import org.eclipse.cdt.core.index.IIndexFile; import org.eclipse.cdt.core.index.IndexLocationFactory; 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.testplugin.util.BaseTestCase; import org.eclipse.cdt.core.testplugin.util.TestSourceReader; @@ -115,6 +116,8 @@ public class BaseUITestCase extends BaseTestCase { Thread.sleep(50); firstTime= false; + if (CCorePlugin.getIndexManager().isIndexerSetupPostponed(CoreModel.getDefault().create(file.getProject()))) + continue; index.acquireReadLock(); try { IIndexFile pfile= index.getFile(ILinkage.CPP_LINKAGE_ID, IndexLocationFactory.getWorkspaceIFL(file)); diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java index a84a0986327..b6f83880532 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTest_MacroRef_NoPrefix.java @@ -46,6 +46,7 @@ public class CompletionTest_MacroRef_NoPrefix extends CompletionProposalsBaseTe "__null", "__real__", "__stdcall", + "__thread", }; public CompletionTest_MacroRef_NoPrefix(String name) { diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java index affa81e9841..af707c07131 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CompletionTests_PlainC.java @@ -375,6 +375,7 @@ public class CompletionTests_PlainC extends AbstractContentAssistTest { "__null", "__real__", "__stdcall", + "__thread", }; assertCompletionResults(expected); } diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java index 0f155a99b1b..bbb541de4d0 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsNoIndexer.java @@ -917,7 +917,7 @@ public class CPPSelectionTestsNoIndexer extends BaseUITestCase { int offset = code.indexOf("rator short(); // F3"); //$NON-NLS-1$ IASTNode decl = testF3(file, offset); 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).getLength(), 14); }