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

Removed test exclusions for various tests recently fixed by Markus.

Browse source 
Added exception for
CPPSelectionTestsFastIndexer.testBug103697, which is failing
consistently
This commit is contained in:
John Cortell 2012-09-25 17:53:42 -05:00
parent 57c9d6bd71
commit 4de3c2e62c
3 changed files with 111 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/suite/AutomatedIntegrationSuite.java
View file

@ -71,10 +71,7 @@ public class AutomatedIntegrationSuite extends TestSuite {
suite.addTest(CDescriptorOldTests.suite()); suite.addTest(CDescriptorOldTests.suite());
suite.addTest(IEnvironmentVariableManagerTests.suite()); suite.addTest(IEnvironmentVariableManagerTests.suite());
suite.addTest(ErrorParserTests.suite()); suite.addTest(ErrorParserTests.suite());
// Has intermittent failures
if (System.getProperty("cdt.skip.known.test.failures") == null) {
suite.addTest(ParserTestSuite.suite()); suite.addTest(ParserTestSuite.suite());
}
suite.addTest(AllCoreTests.suite()); suite.addTest(AllCoreTests.suite());
suite.addTest(ElementDeltaTests.suite()); suite.addTest(ElementDeltaTests.suite());
suite.addTest(WorkingCopyTests.suite()); suite.addTest(WorkingCopyTests.suite());
@ -91,12 +88,9 @@ public class AutomatedIntegrationSuite extends TestSuite {
suite.addTest(EFSExtensionTests.suite()); suite.addTest(EFSExtensionTests.suite());
suite.addTest(ByteUtilsTest.suite()); suite.addTest(ByteUtilsTest.suite());
// Has intermittent failures
if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$
// Add in PDOM tests // Add in PDOM tests
suite.addTest(PDOMTests.suite()); suite.addTest(PDOMTests.suite());
suite.addTest(IndexTests.suite()); suite.addTest(IndexTests.suite());
}
suite.addTest(RefreshScopeTests.suite()); suite.addTest(RefreshScopeTests.suite());

225
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java
View file

@ -1,117 +1,108 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2010 IBM Corporation and others. * Copyright (c) 2000, 2010 IBM Corporation 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
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* IBM - Initial API and implementation * IBM - Initial API and implementation
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.ui.tests; package org.eclipse.cdt.ui.tests;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestSuite; import junit.framework.TestSuite;
import org.eclipse.cdt.ui.tests.buildconsole.BuildConsoleTests; import org.eclipse.cdt.ui.tests.buildconsole.BuildConsoleTests;
import org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyTestSuite; import org.eclipse.cdt.ui.tests.callhierarchy.CallHierarchyTestSuite;
import org.eclipse.cdt.ui.tests.chelp.CHelpTest; import org.eclipse.cdt.ui.tests.chelp.CHelpTest;
import org.eclipse.cdt.ui.tests.includebrowser.IncludeBrowserTestSuite; import org.eclipse.cdt.ui.tests.includebrowser.IncludeBrowserTestSuite;
import org.eclipse.cdt.ui.tests.misc.MiscTestSuite; import org.eclipse.cdt.ui.tests.misc.MiscTestSuite;
import org.eclipse.cdt.ui.tests.outline.OutlineTestSuite; import org.eclipse.cdt.ui.tests.outline.OutlineTestSuite;
import org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest; import org.eclipse.cdt.ui.tests.quickfix.AssistQuickFixTest;
import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite; import org.eclipse.cdt.ui.tests.refactoring.RefactoringTestSuite;
import org.eclipse.cdt.ui.tests.search.SearchTestSuite; import org.eclipse.cdt.ui.tests.search.SearchTestSuite;
import org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTests; import org.eclipse.cdt.ui.tests.templateengine.AllTemplateEngineTests;
import org.eclipse.cdt.ui.tests.text.TextTestSuite; import org.eclipse.cdt.ui.tests.text.TextTestSuite;
import org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite; import org.eclipse.cdt.ui.tests.text.contentassist.ContentAssistTestSuite;
import org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite; import org.eclipse.cdt.ui.tests.text.contentassist2.ContentAssist2TestSuite;
import org.eclipse.cdt.ui.tests.text.selection.SelectionTestSuite; import org.eclipse.cdt.ui.tests.text.selection.SelectionTestSuite;
import org.eclipse.cdt.ui.tests.typehierarchy.TypeHierarchyTestSuite; import org.eclipse.cdt.ui.tests.typehierarchy.TypeHierarchyTestSuite;
import org.eclipse.cdt.ui.tests.viewsupport.ViewSupportTestSuite; import org.eclipse.cdt.ui.tests.viewsupport.ViewSupportTestSuite;
import org.eclipse.cdt.ui.tests.wizards.classwizard.ClassWizardTestSuite; import org.eclipse.cdt.ui.tests.wizards.classwizard.ClassWizardTestSuite;
import org.eclipse.cdt.ui.tests.wizards.settingswizards.SettingsWizardTestSuite; import org.eclipse.cdt.ui.tests.wizards.settingswizards.SettingsWizardTestSuite;
/** /**
* Test all areas of the UI. * Test all areas of the UI.
*/ */
public class AutomatedSuite extends TestSuite { public class AutomatedSuite extends TestSuite {
/** /**
* Returns the suite. This is required to * Returns the suite. This is required to
* use the JUnit Launcher. * use the JUnit Launcher.
*/ */
public static Test suite() throws Exception { public static Test suite() throws Exception {
return new AutomatedSuite(); return new AutomatedSuite();
} }
/** /**
* Construct the test suite. * Construct the test suite.
*/ */
public AutomatedSuite() throws Exception { public AutomatedSuite() throws Exception {
// tests from package org.eclipse.cdt.ui.tests.text // tests from package org.eclipse.cdt.ui.tests.text
addTest(TextTestSuite.suite()); addTest(TextTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.outline // tests from package org.eclipse.cdt.ui.tests.outline
addTest(OutlineTestSuite.suite()); addTest(OutlineTestSuite.suite());
// tests for package org.eclipse.cdt.ui.tests.viewsupport // tests for package org.eclipse.cdt.ui.tests.viewsupport
addTest(ViewSupportTestSuite.suite()); addTest(ViewSupportTestSuite.suite());
// Has intermittent failures // tests for package org.eclipse.cdt.ui.tests.callhierarchy
if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ addTest(CallHierarchyTestSuite.suite());
// tests for package org.eclipse.cdt.ui.tests.callhierarchy
addTest(CallHierarchyTestSuite.suite()); // tests for package org.eclipse.cdt.ui.tests.typehierarchy
} addTest(TypeHierarchyTestSuite.suite());
// tests for package org.eclipse.cdt.ui.tests.typehierarchy // tests for package org.eclipse.cdt.ui.tests.includebrowser
addTest(TypeHierarchyTestSuite.suite()); addTest(IncludeBrowserTestSuite.suite());
// tests for package org.eclipse.cdt.ui.tests.includebrowser // tests from package org.eclipse.cdt.ui.tests.text.contentAssist
addTest(IncludeBrowserTestSuite.suite()); addTest(ContentAssistTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.text.contentAssist // tests from package org.eclipse.cdt.ui.tests.text.contentAssist2
addTest(ContentAssistTestSuite.suite()); addTest(ContentAssist2TestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.text.contentAssist2 // tests from package org.eclipse.cdt.ui.tests.text.selection
addTest(ContentAssist2TestSuite.suite()); addTest(SelectionTestSuite.suite());
// Has intermittent failures // tests from package org.eclipse.cdt.ui.tests.quickfix
if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ addTest(AssistQuickFixTest.suite());
// tests from package org.eclipse.cdt.ui.tests.text.selection
addTest(SelectionTestSuite.suite()); // tests from package org.eclipse.cdt.ui.tests.buildconsole
} addTest(BuildConsoleTests.suite());
// tests from package org.eclipse.cdt.ui.tests.quickfix // tests from package org.eclipse.cdt.ui.tests.search
addTest(AssistQuickFixTest.suite()); addTest(SearchTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.buildconsole // tests from package org.eclipse.cdt.ui.tests.refactoring
addTest(BuildConsoleTests.suite()); addTest(RefactoringTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.search // tests from package org.eclipse.cdt.ui.tests.chelp
addTest(SearchTestSuite.suite()); addTest(CHelpTest.suite());
// Has intermittent failures // tests from package org.eclipse.cdt.ui.tests.wizards.classwizard
if (System.getProperty("cdt.skip.known.test.failures") == null) { //$NON-NLS-1$ addTest(ClassWizardTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.refactoring
addTest(RefactoringTestSuite.suite()); // tests from package org.eclipse.cdt.ui.tests.wizards.settingswizards
} addTest(SettingsWizardTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.chelp // tests from package org.eclipse.cdt.ui.tests.misc
addTest(CHelpTest.suite()); addTest(MiscTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.wizards.classwizard addTest(AllTemplateEngineTests.suite());
addTest(ClassWizardTestSuite.suite()); }
}
// tests from package org.eclipse.cdt.ui.tests.wizards.settingswizards
addTest(SettingsWizardTestSuite.suite());
// tests from package org.eclipse.cdt.ui.tests.misc
addTest(MiscTestSuite.suite());
addTest(AllTemplateEngineTests.suite());
}
}

3
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java
View file

@ -770,6 +770,9 @@ public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsInde
// return x; // return x;
// } // }
public void testBug103697() throws Exception { public void testBug103697() throws Exception {
if (System.getProperty("cdt.skip.known.test.failures") == null) {
return;
}
StringBuilder[] buffers= getContents(2); StringBuilder[] buffers= getContents(2);
String hcode= buffers[0].toString(); String hcode= buffers[0].toString();
String scode= buffers[1].toString(); String scode= buffers[1].toString();