From 449e95e3f2f9156e2fb497931a94738d73e83e20 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 11 Apr 2012 10:12:41 -0400 Subject: [PATCH] Revert "Commented out test cases not being maintained by IBM team. Temporary on sd90 only." This reverts commit 5c3a375818cdfef82f723dc8e1e24ae17a295c50. --- .../lrparser/tests/LRParserTestSuite.java | 67 +++++++++---------- .../parser/upc/tests/UPCParserTestSuite.java | 39 ++++++----- .../parser/xlc/tests/suite/XlcTestSuite.java | 8 ++- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java index 5cd3836fbec..bcbc5e371c8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -16,7 +16,7 @@ import junit.framework.Test; import junit.framework.TestSuite; public class LRParserTestSuite extends TestSuite { - + // TODO: the following test are not being reused // // DOMGCCSelectionParseExtensionsTest @@ -25,41 +25,40 @@ public class LRParserTestSuite extends TestSuite { // QuickParser2Tests // // and perhaps others - + public static Test suite() { return new TestSuite() {{ - - // AG FIXME - temporarily commented out on sd90 branch -// addTest(LRCommentTests.suite()); -// addTest(LRCompleteParser2Tests.suite()); -// addTest(LRCompletionBasicTest.suite()); -// addTest(LRCompletionParseTest.suite()); -// addTest(LRCPPSpecTest.suite()); -// addTest(LRCPPTests.suite()); -// addTest(LRCSpecTests.suite()); // a couple of failures -// addTest(LRDigraphTrigraphTests.suite()); -// addTest(LRDOMLocationInclusionTests.suite()); -// addTest(LRDOMLocationMacroTests.suite()); -// addTest(LRDOMLocationTests.suite()); -// addTest(LRDOMPreprocessorInformationTest.suite()); -// addTest(LRGCCTests.suite()); -// addTest(LRGCCCompleteParseExtensionsTest.suite()); -// addTest(LRImageLocationTests.suite()); -// addTest(LRKnRTests.suite()); // mostly fail due to ambiguities -// addTest(LRNodeSelectorTest.suite()); -// addTestSuite(LRQuickParser2Tests.class); -// addTest(LRSelectionParseTest.suite()); // this one still has a lot of failing tests though -// addTest(LRSemanticsTests.suite()); -// addTest(LRTaskParserTest.suite()); -// addTest(LRTemplateTests.suite()); -// addTest(LRTests.suite()); // has some tests that do fail -// addTest(LRUtilOldTests.suite()); -// addTest(LRUtilTests.suite()); -// addTest(LRCompletionHangingTest.suite()); -// addTest(LRCPPImplicitNameTests.suite()); -// //addTest(LRInactiveCodeTests.suite()); + + addTest(LRCommentTests.suite()); + addTest(LRCompleteParser2Tests.suite()); + addTest(LRCompletionBasicTest.suite()); + addTest(LRCompletionParseTest.suite()); + addTest(LRCPPSpecTest.suite()); + addTest(LRCPPTests.suite()); + addTest(LRCSpecTests.suite()); // a couple of failures + addTest(LRDigraphTrigraphTests.suite()); + addTest(LRDOMLocationInclusionTests.suite()); + addTest(LRDOMLocationMacroTests.suite()); + addTest(LRDOMLocationTests.suite()); + addTest(LRDOMPreprocessorInformationTest.suite()); + addTest(LRGCCTests.suite()); + addTest(LRGCCCompleteParseExtensionsTest.suite()); + addTest(LRImageLocationTests.suite()); + addTest(LRKnRTests.suite()); // mostly fail due to ambiguities + addTest(LRNodeSelectorTest.suite()); + addTestSuite(LRQuickParser2Tests.class); + addTest(LRSelectionParseTest.suite()); // this one still has a lot of failing tests though + addTest(LRSemanticsTests.suite()); + addTest(LRTaskParserTest.suite()); + addTest(LRTemplateTests.suite()); + addTest(LRTests.suite()); // has some tests that do fail + addTest(LRUtilOldTests.suite()); + addTest(LRUtilTests.suite()); + addTest(LRCompletionHangingTest.suite()); + addTest(LRCPPImplicitNameTests.suite()); + //addTest(LRInactiveCodeTests.suite()); }}; - } + } } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java index 7d4289e7367..ff84f06c478 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java @@ -14,28 +14,27 @@ import junit.framework.Test; import junit.framework.TestSuite; public class UPCParserTestSuite extends TestSuite { - + public static Test suite() { return new TestSuite() {{ - // AG FIXME - temporarily commented out on sd90 branch -// addTestSuite(UPCCommentTests.class); -// addTestSuite(UPCCompletionBasicTest.class); -// addTestSuite(UPCCompletionParseTest.class); -// addTestSuite(UPCDOMLocationInclusionTests.class); -// addTestSuite(UPCDOMLocationMacroTests.class); -// addTestSuite(UPCDOMLocationTests.class); -// addTestSuite(UPCDOMPreprocessorInformationTest.class); -// addTestSuite(UPCKnRTests.class); -// addTestSuite(UPCSelectionParseTest.class); -// addTestSuite(UPCCSpecTests.class); -// addTestSuite(UPCTests.class); -// addTestSuite(UPCLanguageExtensionTests.class); -// addTestSuite(UPCDigraphTrigraphTests.class); -// addTestSuite(UPCGCCTests.class); -// addTestSuite(UPCUtilOldTests.class); -// addTestSuite(UPCUtilTests.class); -// addTestSuite(UPCCompleteParser2Tests.class); -// addTestSuite(UPCTaskParserTest.class); + addTestSuite(UPCCommentTests.class); + addTestSuite(UPCCompletionBasicTest.class); + addTestSuite(UPCCompletionParseTest.class); + addTestSuite(UPCDOMLocationInclusionTests.class); + addTestSuite(UPCDOMLocationMacroTests.class); + addTestSuite(UPCDOMLocationTests.class); + addTestSuite(UPCDOMPreprocessorInformationTest.class); + addTestSuite(UPCKnRTests.class); + addTestSuite(UPCSelectionParseTest.class); + addTestSuite(UPCCSpecTests.class); + addTestSuite(UPCTests.class); + addTestSuite(UPCLanguageExtensionTests.class); + addTestSuite(UPCDigraphTrigraphTests.class); + addTestSuite(UPCGCCTests.class); + addTestSuite(UPCUtilOldTests.class); + addTestSuite(UPCUtilTests.class); + addTestSuite(UPCCompleteParser2Tests.class); + addTestSuite(UPCTaskParserTest.class); }}; } } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java index ea781d1c3a6..5c03a495158 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java @@ -14,13 +14,15 @@ package org.eclipse.cdt.core.parser.xlc.tests.suite; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.cdt.core.parser.xlc.tests.XlcExtensionsTestSuite; +import org.eclipse.cdt.core.parser.xlc.tests.base.XlcLRParserTestSuite; + public class XlcTestSuite extends TestSuite { public static Test suite() { return new TestSuite() {{ - // AG FIXME - temporarily commented out on sd90 branch -// addTest(XlcExtensionsTestSuite.suite()); -// addTest(XlcLRParserTestSuite.suite()); + addTest(XlcExtensionsTestSuite.suite()); + addTest(XlcLRParserTestSuite.suite()); }}; } }