From 6890b6b24ebd1d2d6d68248c8782d7e699fdb7c0 Mon Sep 17 00:00:00 2001 From: Mike Kucera Date: Tue, 29 Apr 2008 17:50:47 +0000 Subject: [PATCH] renamed a lot of the LR parser tests --- .../META-INF/MANIFEST.MF | 5 +- ...ISOCPPSpecTest.java => LRCPPSpecTest.java} | 9 +-- .../{cpp/ISOCPPTests.java => LRCPPTests.java} | 11 ++- .../C99SpecTests.java => LRCSpecTests.java} | 14 ++-- ...9CommentTests.java => LRCommentTests.java} | 5 +- ...Tests.java => LRCompleteParser2Tests.java} | 5 +- ...icTest.java => LRCompletionBasicTest.java} | 7 +- ...seTest.java => LRCompletionParseTest.java} | 79 +++++++++---------- ....java => LRDOMLocationInclusionTests.java} | 10 +-- ...ests.java => LRDOMLocationMacroTests.java} | 9 +-- ...tionTests.java => LRDOMLocationTests.java} | 9 +-- ... => LRDOMPreprocessorInformationTest.java} | 5 +- ...Tests.java => LRDigraphTrigraphTests.java} | 78 +++++++++--------- .../{c99/C99GCCTests.java => LRGCCTests.java} | 9 +-- .../{c99/C99KnRTests.java => LRKnRTests.java} | 5 +- .../lrparser/tests/LRParserTestSuite.java | 34 ++++++-- ...rseTest.java => LRSelectionParseTest.java} | 9 +-- ...kParserTest.java => LRTaskParserTest.java} | 5 +- .../tests/{c99/C99Tests.java => LRTests.java} | 9 +-- ...9UtilOldTests.java => LRUtilOldTests.java} | 5 +- .../C99UtilTests.java => LRUtilTests.java} | 5 +- .../core/lrparser/tests/c99/Activator.java | 54 ------------- .../tests/c99/C99ParserTestSuite.java | 56 ------------- .../tests/cpp/ISOCPPParserTestSuite.java | 27 ------- .../upc/tests/UPCC99CompletionParseTest.java | 26 ------ .../UPCC99DOMLocationInclusionTests.java | 30 ------- .../upc/tests/UPCC99DigraphTrigraphTests.java | 27 ------- .../upc/tests/UPCC99SelectionParseTest.java | 27 ------- ...UPCC99KnRTests.java => UPCCSpecTests.java} | 16 ++-- ...CommentTests.java => UPCCommentTests.java} | 10 +-- ...ests.java => UPCCompleteParser2Tests.java} | 10 +-- ...cTest.java => UPCCompletionBasicTest.java} | 12 +-- .../upc/tests/UPCCompletionParseTest.java | 26 ++++++ ...java => UPCDOMLocationInclusionTests.java} | 19 +++-- ...est.java => UPCDOMLocationMacroTests.java} | 14 ++-- ...ionTests.java => UPCDOMLocationTests.java} | 14 ++-- ...=> UPCDOMPreprocessorInformationTest.java} | 14 ++-- ...ests.java => UPCDigraphTrigraphTests.java} | 18 ++--- ...leteParser2Tests.java => UPCGCCTests.java} | 17 ++-- ...{UPCC99UtilTests.java => UPCKnRTests.java} | 13 +-- .../upc/tests/UPCLanguageExtensionTests.java | 2 +- .../parser/upc/tests/UPCParserTestSuite.java | 44 +++++------ .../upc/tests/UPCSelectionParseTest.java | 27 +++++++ ...ParserTest.java => UPCTaskParserTest.java} | 10 +-- .../tests/{UPCC99Tests.java => UPCTests.java} | 14 ++-- .../parser/upc/tests/UPCUtilOldTests.java | 24 ++++++ .../core/parser/upc/tests/UPCUtilTests.java | 24 ++++++ 47 files changed, 379 insertions(+), 523 deletions(-) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{cpp/ISOCPPSpecTest.java => LRCPPSpecTest.java} (84%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{cpp/ISOCPPTests.java => LRCPPTests.java} (90%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99SpecTests.java => LRCSpecTests.java} (94%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99CommentTests.java => LRCommentTests.java} (94%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99CompleteParser2Tests.java => LRCompleteParser2Tests.java} (95%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99CompletionBasicTest.java => LRCompletionBasicTest.java} (93%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99CompletionParseTest.java => LRCompletionParseTest.java} (83%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99DOMLocationInclusionTests.java => LRDOMLocationInclusionTests.java} (87%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99DOMLocationMacroTests.java => LRDOMLocationMacroTests.java} (87%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99DOMLocationTests.java => LRDOMLocationTests.java} (89%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99DOMPreprocessorInformationTest.java => LRDOMPreprocessorInformationTest.java} (88%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99DigraphTrigraphTests.java => LRDigraphTrigraphTests.java} (79%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99GCCTests.java => LRGCCTests.java} (87%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99KnRTests.java => LRKnRTests.java} (93%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99SelectionParseTest.java => LRSelectionParseTest.java} (96%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99TaskParserTest.java => LRTaskParserTest.java} (90%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99Tests.java => LRTests.java} (96%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99UtilOldTests.java => LRUtilOldTests.java} (91%) rename lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/{c99/C99UtilTests.java => LRUtilTests.java} (92%) delete mode 100644 lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java delete mode 100644 lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99ParserTestSuite.java delete mode 100644 lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPParserTestSuite.java delete mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java delete mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java delete mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java delete mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99KnRTests.java => UPCCSpecTests.java} (66%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99CommentTests.java => UPCCommentTests.java} (68%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99UtilOldTests.java => UPCCompleteParser2Tests.java} (68%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99CompletionBasicTest.java => UPCCompletionBasicTest.java} (64%) create mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99GCCTests.java => UPCDOMLocationInclusionTests.java} (61%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99DOMPreprocessorInformationTest.java => UPCDOMLocationMacroTests.java} (64%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99DOMLocationTests.java => UPCDOMLocationTests.java} (62%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99DOMLocationMacroTests.java => UPCDOMPreprocessorInformationTest.java} (63%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99SpecTests.java => UPCDigraphTrigraphTests.java} (62%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99CompleteParser2Tests.java => UPCGCCTests.java} (65%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99UtilTests.java => UPCKnRTests.java} (69%) create mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99TaskParserTest.java => UPCTaskParserTest.java} (67%) rename upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/{UPCC99Tests.java => UPCTests.java} (69%) create mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java create mode 100644 upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF index 12e535351b8..5aab5755389 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF @@ -3,16 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.cdt.core.lrparser.tests Bundle-Version: 4.0.0.qualifier -Bundle-Activator: org.eclipse.cdt.core.lrparser.tests.c99.Activator Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.cdt.core.tests, org.eclipse.cdt.core, org.eclipse.core.resources, org.eclipse.cdt.core.lrparser;bundle-version="4.0.1" -Export-Package: org.eclipse.cdt.core.lrparser.tests, - org.eclipse.cdt.core.lrparser.tests.c99, - org.eclipse.cdt.core.lrparser.tests.cpp +Export-Package: org.eclipse.cdt.core.lrparser.tests Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java similarity index 84% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java index 20a44949ab9..6b5e2620538 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java @@ -1,20 +1,19 @@ -package org.eclipse.cdt.core.lrparser.tests.cpp; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class ISOCPPSpecTest extends AST2CPPSpecTest { +public class LRCPPSpecTest extends AST2CPPSpecTest { - public ISOCPPSpecTest() { } - public ISOCPPSpecTest(String name) { super(name); } + public LRCPPSpecTest() { } + public LRCPPSpecTest(String name) { super(name); } @Override diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java similarity index 90% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java index 4080ef76ff5..3ce8e297144 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.core.lrparser.tests.cpp; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; import junit.framework.TestSuite; @@ -6,25 +6,24 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class ISOCPPTests extends AST2CPPTests { +public class LRCPPTests extends AST2CPPTests { public static TestSuite suite() { - return suite(ISOCPPTests.class); + return suite(LRCPPTests.class); } - public ISOCPPTests() { + public LRCPPTests() { } - public ISOCPPTests(String name) { + public LRCPPTests(String name) { super(name); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java similarity index 94% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java index 4292dec523c..e834716a723 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java @@ -8,25 +8,23 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99SpecTests extends AST2CSpecTest { +public class LRCSpecTests extends AST2CSpecTest { - public C99SpecTests() { } - public C99SpecTests(String name) { super(name); } + public LRCSpecTests() { } + public LRCSpecTests(String name) { super(name); } @Override @@ -41,11 +39,11 @@ public class C99SpecTests extends AST2CSpecTest { return ParseHelper.parse(code, language, true, checkBindings, expectedProblemBindings ); } - protected BaseExtensibleLanguage getCLanguage() { + protected ILanguage getCLanguage() { return C99Language.getDefault(); } - protected BaseExtensibleLanguage getCPPLanguage() { + protected ILanguage getCPPLanguage() { return ISOCPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java similarity index 94% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java index 75fcd70633b..fc0bcf3a99b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java @@ -8,21 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CommentTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99CommentTests extends CommentTests { +public class LRCommentTests extends CommentTests { @Override diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java similarity index 95% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java index d5b05c3ee9a..d396b4b0bee 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java @@ -8,19 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests; -public class C99CompleteParser2Tests extends CompleteParser2Tests { +public class LRCompleteParser2Tests extends CompleteParser2Tests { @Override @SuppressWarnings("unused") diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java similarity index 93% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java index 778a6d81bac..dae6f44f4de 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IASTName; @@ -17,16 +17,15 @@ import org.eclipse.cdt.core.dom.ast.IFunction; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.prefix.BasicCompletionTest; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99CompletionBasicTest extends BasicCompletionTest { +public class LRCompletionBasicTest extends BasicCompletionTest { - public C99CompletionBasicTest() { } + public LRCompletionBasicTest() { } @Override diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java similarity index 83% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionParseTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java index 47e35b78b4b..1f75da55a68 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import java.util.ArrayList; import java.util.Collections; @@ -24,19 +24,18 @@ import org.eclipse.cdt.core.dom.ast.IEnumerator; import org.eclipse.cdt.core.dom.ast.IField; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.IVariable; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; +import org.eclipse.cdt.core.model.ILanguage; /** * Reuse the completion parse tests from the old parser for now. */ @SuppressWarnings("nls") -public class C99CompletionParseTest extends TestCase { +public class LRCompletionParseTest extends TestCase { - public C99CompletionParseTest() { } - public C99CompletionParseTest(String name) { super(name); } + public LRCompletionParseTest() { } + public LRCompletionParseTest(String name) { super(name); } protected IASTCompletionNode parse(String code, int offset) throws Exception { @@ -63,7 +62,7 @@ public class C99CompletionParseTest extends TestCase { } - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return C99Language.getDefault(); } @@ -288,11 +287,10 @@ public class C99CompletionParseTest extends TestCase { public void testCompletionStructPointer() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append(" struct Temp { char * total; };" ); - sb.append(" int f(struct Temp * t) {" ); - sb.append(" t->t[5] = t->" ); - String code = sb.toString(); + String code = + " struct Temp { char * total; };" + + " int f(struct Temp * t) {" + + " t->t[5] = t->"; int index = code.indexOf("= t->"); @@ -310,19 +308,18 @@ public class C99CompletionParseTest extends TestCase { public void testCompletionEnum() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append( "typedef int DWORD;\n" ); //$NON-NLS-1$ - sb.append( "typedef char BYTE;\n"); //$NON-NLS-1$ - sb.append( "#define MAKEFOURCC(ch0, ch1, ch2, ch3) \\\n"); //$NON-NLS-1$ - sb.append( "((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\\n"); //$NON-NLS-1$ - sb.append( "((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))\n"); //$NON-NLS-1$ - sb.append( "enum e {\n"); //$NON-NLS-1$ - sb.append( "blah1 = 5,\n"); //$NON-NLS-1$ - sb.append( "blah2 = MAKEFOURCC('a', 'b', 'c', 'd'),\n"); //$NON-NLS-1$ - sb.append( "blah3\n"); //$NON-NLS-1$ - sb.append( "};\n"); //$NON-NLS-1$ - sb.append( "e mye = bl\n"); //$NON-NLS-1$ - String code = sb.toString(); + String code = + "typedef int DWORD;\n" + + "typedef char BYTE;\n" + + "#define MAKEFOURCC(ch0, ch1, ch2, ch3) \\\n" + + "((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \\\n" + + "((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))\n" + + "enum e {\n" + + "blah1 = 5,\n" + + "blah2 = MAKEFOURCC('a', 'b', 'c', 'd'),\n" + + "blah3\n" + + "};\n" + + "e mye = bl\n"; int index = code.indexOf("= bl"); @@ -342,12 +339,11 @@ public class C99CompletionParseTest extends TestCase { public void testCompletionStructArray() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append( "struct packet { int a; int b; };\n" ); //$NON-NLS-1$ - sb.append( "struct packet buffer[5];\n" ); //$NON-NLS-1$ - sb.append( "int main(int argc, char **argv) {\n" ); //$NON-NLS-1$ - sb.append( " buffer[2]." ); //$NON-NLS-1$ - String code = sb.toString(); + String code = + "struct packet { int a; int b; };\n" + + "struct packet buffer[5];\n" + + "int main(int argc, char **argv) {\n" + + " buffer[2]."; int index = code.indexOf("[2]."); @@ -376,12 +372,11 @@ public class C99CompletionParseTest extends TestCase { } public void testCompletionPreprocessorMacro() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append( "#define AMACRO 99 \n"); - sb.append( "int main() { \n"); - sb.append( " int AVAR; \n"); - sb.append( " int x = A \n"); - String code = sb.toString(); + String code = + "#define AMACRO 99 \n" + + "int main() { \n" + + " int AVAR; \n" + + " int x = A \n"; int index = code.indexOf("= A"); @@ -394,13 +389,11 @@ public class C99CompletionParseTest extends TestCase { } - public void testCompletionInsidePreprocessorDirective() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append( "#define MAC1 99 \n"); - sb.append( "#define MAC2 99 \n"); - sb.append( "#ifdef MA"); - String code = sb.toString(); + String code = + "#define MAC1 99 \n" + + "#define MAC2 99 \n" + + "#ifdef MA"; int index = code.length(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java similarity index 87% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java index ee74dbefa41..98b98a824a9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; @@ -23,16 +23,16 @@ import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; import org.eclipse.core.resources.IFile; @SuppressWarnings("restriction") -public class C99DOMLocationInclusionTests extends DOMLocationInclusionTests { +public class LRDOMLocationInclusionTests extends DOMLocationInclusionTests { - public C99DOMLocationInclusionTests() { + public LRDOMLocationInclusionTests() { } - public C99DOMLocationInclusionTests(String name, Class className) { + public LRDOMLocationInclusionTests(String name, Class className) { super(name, className); } - public C99DOMLocationInclusionTests(String name) { + public LRDOMLocationInclusionTests(String name) { super(name); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java similarity index 87% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java index 481175f222b..c7b09c85b4e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java @@ -8,27 +8,26 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationMacroTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99DOMLocationMacroTests extends DOMLocationMacroTests { +public class LRDOMLocationMacroTests extends DOMLocationMacroTests { - public C99DOMLocationMacroTests() { + public LRDOMLocationMacroTests() { super(); } - public C99DOMLocationMacroTests(String name) { + public LRDOMLocationMacroTests(String name) { super(name); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java similarity index 89% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java index 3d2a0a10c2c..d6c796b9f54 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java @@ -8,24 +8,23 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99DOMLocationTests extends DOMLocationTests { +public class LRDOMLocationTests extends DOMLocationTests { - public C99DOMLocationTests() { } - public C99DOMLocationTests(String name) { super(name); } + public LRDOMLocationTests() { } + public LRDOMLocationTests(String name) { super(name); } @Override @SuppressWarnings("unused") diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java similarity index 88% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java index a2508881d74..283a72e3c3f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java @@ -8,19 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMPreprocessorInformationTest; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99DOMPreprocessorInformationTest extends DOMPreprocessorInformationTest { +public class LRDOMPreprocessorInformationTest extends DOMPreprocessorInformationTest { @Override @SuppressWarnings("unused") diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java similarity index 79% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java index 62385cd1a91..fbab9d401bc 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestCase; @@ -31,38 +31,40 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; +import org.eclipse.cdt.core.model.ILanguage; + +/** + * TODO these tests can be moved into the core + */ @SuppressWarnings("nls") -public class C99DigraphTrigraphTests extends TestCase { +public class LRDigraphTrigraphTests extends TestCase { - public C99DigraphTrigraphTests() { } - public C99DigraphTrigraphTests(String name) { super(name); } + public LRDigraphTrigraphTests() { } + public LRDigraphTrigraphTests(String name) { super(name); } protected IASTTranslationUnit parse(String code) { - return ParseHelper.parse(code, getLanguage(), true); + return ParseHelper.parse(code, getCLanguage(), true); } - protected BaseExtensibleLanguage getLanguage() { + protected ILanguage getCLanguage() { return C99Language.getDefault(); } public void testTrigraphSequences() { - StringBuffer sb = new StringBuffer(); - sb.append("??=define SIZE ??/ \n"); // trigraph used as backslash to ignore newline - sb.append("99 \n"); - sb.append("int main(void)??< \n"); - sb.append(" int arr??(SIZE??); \n"); - sb.append(" arr??(4??) = '0' - (??-0 ??' 1 ??! 2); \n"); - sb.append(" printf(\"%c??/n\", arr??(4??)); \n"); - sb.append("??> \n"); - String code = sb.toString(); + String code = + "??=define SIZE ??/ \n" + // trigraph used as backslash to ignore newline + "99 \n" + + "int main(void)??< \n" + + " int arr??(SIZE??); \n" + + " arr??(4??) = '0' - (??-0 ??' 1 ??! 2); \n" + + " printf(\"%c??/n\", arr??(4??)); \n" + + "??> \n"; IASTTranslationUnit tu = parse(code); assertNotNull(tu); @@ -107,23 +109,22 @@ public class C99DigraphTrigraphTests extends TestCase { public void testTrigraphEscapeSequences() { // a ??/ trigraph should act just like a backslash in a string literal - StringBuffer sb = new StringBuffer(); - sb.append("int main(void)??< \n"); - sb.append(" char str[] = \"??/\"??/n\"; \n"); - sb.append(" char c = '??/u0000'; \n"); - sb.append("??> \n"); - String code = sb.toString(); + String code = + "int main(void)??< \n" + + " char str[] = \"??/\"??/n\"; \n" + + " char c = '??/u0000'; \n" + + "??> \n"; + parse(code); // will throw an exception if there are parse errors } public void testDigraphSequences() { - StringBuffer sb = new StringBuffer(); - sb.append("%:define join(a, b) a %:%: b \n"); - sb.append("int main() <% \n"); - sb.append(" int arr<:5:>; \n"); - sb.append("%> \n"); - String code = sb.toString(); + String code = + "%:define join(a, b) a %:%: b \n" + + "int main() <% \n" + + " int arr<:5:>; \n" + + "%> \n"; IASTTranslationUnit tu = parse(code); // will throw an exception if there are parse errors @@ -143,16 +144,15 @@ public class C99DigraphTrigraphTests extends TestCase { public void testTrigraphAndDigraphSequecesInPreprocessorDirectives() { - StringBuffer sb = new StringBuffer(); - sb.append("%:define join1(a, b) a %:%: b \n"); - sb.append("%:define str1(a) %: a \n"); - sb.append("??=define join2(a, b) a ??=??= b \n"); - sb.append("??=define str2(a) ??= a \n"); - sb.append("int main() <% \n"); - sb.append(" int join1(x, y) = str1(its all good); \n"); - sb.append(" int join2(a, b) = str2(its still good); \n"); - sb.append("%> \n"); - String code = sb.toString(); + String code = + "%:define join1(a, b) a %:%: b \n" + + "%:define str1(a) %: a \n" + + "??=define join2(a, b) a ??=??= b \n" + + "??=define str2(a) ??= a \n" + + "int main() <% \n" + + " int join1(x, y) = str1(its all good); \n" + + " int join2(a, b) = str2(its still good); \n" + + "%> \n"; IASTTranslationUnit tu = parse(code); // will throw an exception if there are parse errors diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java similarity index 87% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java index 8dfdcd62c4f..5a24a43468c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java @@ -8,22 +8,21 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.GCCTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99GCCTests extends GCCTests { +public class LRGCCTests extends GCCTests { - public C99GCCTests() {} - public C99GCCTests(String name) { super(name); } + public LRGCCTests() {} + public LRGCCTests(String name) { super(name); } @Override diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java similarity index 93% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java index 20bef1e34ba..479bda3d048 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java @@ -8,12 +8,11 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2KnRTests; @@ -23,7 +22,7 @@ import org.eclipse.cdt.internal.core.parser.ParserException; * @author Mike Kucera */ @SuppressWarnings("restriction") -public class C99KnRTests extends AST2KnRTests { +public class LRKnRTests extends AST2KnRTests { @Override 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 4ee607a08b4..a9985afc113 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 @@ -10,8 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.core.lrparser.tests; -import org.eclipse.cdt.core.lrparser.tests.c99.*; -import org.eclipse.cdt.core.lrparser.tests.cpp.ISOCPPParserTestSuite; + import junit.framework.Test; import junit.framework.TestSuite; @@ -28,12 +27,35 @@ public class LRParserTestSuite extends TestSuite { // and perhaps others public static Test suite() { - TestSuite suite = new TestSuite(); + return new TestSuite() {{ - suite.addTest(C99ParserTestSuite.suite()); - suite.addTest(ISOCPPParserTestSuite.suite()); + addTestSuite(LRTests.class); // has some tests that do fail + + addTestSuite(LRCSpecTests.class); // a couple of failures + addTestSuite(LRKnRTests.class); // mostly fail due to ambiguities + + // The majority of the content assist test are in the ui tests plugin + addTestSuite(LRCompletionBasicTest.class); + addTestSuite(LRCompletionParseTest.class); + // this one still has a lot of failing tests though + addTestSuite(LRSelectionParseTest.class); + + addTestSuite(LRDOMLocationInclusionTests.class); + addTestSuite(LRDOMLocationTests.class); + addTestSuite(LRDOMLocationMacroTests.class); + addTestSuite(LRDOMPreprocessorInformationTest.class); + addTestSuite(LRCommentTests.class); + addTestSuite(LRDigraphTrigraphTests.class); + addTestSuite(LRGCCTests.class); + addTestSuite(LRUtilOldTests.class); + addTestSuite(LRUtilTests.class); + addTestSuite(LRCompleteParser2Tests.class); + addTestSuite(LRTaskParserTest.class); + + addTestSuite(LRCPPSpecTest.class); + addTestSuite(LRCPPTests.class); - return suite; + }}; } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java similarity index 96% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java index b8293403cd3..8357fa21021 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java @@ -8,14 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -27,10 +26,10 @@ import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.core.resources.IFile; @SuppressWarnings("restriction") -public class C99SelectionParseTest extends AST2SelectionParseTest { +public class LRSelectionParseTest extends AST2SelectionParseTest { - public C99SelectionParseTest() {} - public C99SelectionParseTest(String name) { super(name); } + public LRSelectionParseTest() {} + public LRSelectionParseTest(String name) { super(name); } @Override protected IASTNode parse(String code, ParserLanguage lang, int offset, int length) throws ParserException { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java similarity index 90% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java index 0f4cae94946..253b0b95b90 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java @@ -8,19 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.TaskParserTest; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99TaskParserTest extends TaskParserTest { +public class LRTaskParserTest extends TaskParserTest { @Override @SuppressWarnings("unused") diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java similarity index 96% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99Tests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java index fd29e043476..302632d0f98 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; @@ -18,7 +18,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2Tests; @@ -31,13 +30,13 @@ import org.eclipse.cdt.internal.core.parser.ParserException; * */ @SuppressWarnings({ "nls", "restriction" }) -public class C99Tests extends AST2Tests { +public class LRTests extends AST2Tests { public static TestSuite suite() { - return suite(C99Tests.class); + return suite(LRTests.class); } - public C99Tests(String name) { + public LRTests(String name) { super(name); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java similarity index 91% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java index d3b0b0418e7..4a39099cc65 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java @@ -8,21 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilOldTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99UtilOldTests extends AST2UtilOldTests { +public class LRUtilOldTests extends AST2UtilOldTests { @Override diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java similarity index 92% rename from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java rename to lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java index d4521d6243e..faa184c30a9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java @@ -8,19 +8,18 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; +package org.eclipse.cdt.core.lrparser.tests; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; -import org.eclipse.cdt.core.lrparser.tests.ParseHelper; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilTests; import org.eclipse.cdt.internal.core.parser.ParserException; @SuppressWarnings("restriction") -public class C99UtilTests extends AST2UtilTests { +public class LRUtilTests extends AST2UtilTests { @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang ) throws ParserException { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java deleted file mode 100644 index 71ba806c61f..00000000000 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends Plugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.cdt.core.parser.c99.tests"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - -} diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99ParserTestSuite.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99ParserTestSuite.java deleted file mode 100644 index d50e1eef7a8..00000000000 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99ParserTestSuite.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.c99; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class C99ParserTestSuite extends TestSuite { - - // TODO: the following test are not being reused - // - // DOMGCCSelectionParseExtensionsTest - // DOMSelectionParseTest - // GCCCompleteParseExtensionsTest - // QuickParser2Tests - // - // and perhaps others - - public static Test suite() { - TestSuite suite = new TestSuite(); - - suite.addTestSuite(C99Tests.class); // has some tests that do fail - - suite.addTestSuite(C99SpecTests.class); // a couple of failures - suite.addTestSuite(C99KnRTests.class); // mostly fail due to ambiguities - - // The majority of the content assist test are in the ui tests plugin - suite.addTestSuite(C99CompletionBasicTest.class); - suite.addTestSuite(C99CompletionParseTest.class); - // this one still has a lot of failing tests though - suite.addTestSuite(C99SelectionParseTest.class); - - suite.addTestSuite(C99DOMLocationInclusionTests.class); - suite.addTestSuite(C99DOMLocationTests.class); - suite.addTestSuite(C99DOMLocationMacroTests.class); - suite.addTestSuite(C99DOMPreprocessorInformationTest.class); - suite.addTestSuite(C99CommentTests.class); - suite.addTestSuite(C99DigraphTrigraphTests.class); - suite.addTestSuite(C99GCCTests.class); - suite.addTestSuite(C99UtilOldTests.class); - suite.addTestSuite(C99UtilTests.class); - suite.addTestSuite(C99CompleteParser2Tests.class); - suite.addTestSuite(C99TaskParserTest.class); - - - return suite; - } -} diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPParserTestSuite.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPParserTestSuite.java deleted file mode 100644 index 8e04c41f9ea..00000000000 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPParserTestSuite.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.lrparser.tests.cpp; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class ISOCPPParserTestSuite extends TestSuite { - - - public static Test suite() { - TestSuite suite = new TestSuite(); - - suite.addTestSuite(ISOCPPSpecTest.class); - suite.addTestSuite(ISOCPPTests.class); - - return suite; - } -} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java deleted file mode 100644 index 32c07c56fc0..00000000000 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.parser.upc.tests; - -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; -import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99CompletionParseTest; - -public class UPCC99CompletionParseTest extends C99CompletionParseTest { - - public UPCC99CompletionParseTest() { } - public UPCC99CompletionParseTest(String name) { super(name); } - - @Override - protected BaseExtensibleLanguage getC99Language() { - return UPCLanguage.getDefault(); - } -} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java deleted file mode 100644 index c236bf00c93..00000000000 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.parser.upc.tests; - -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; -import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationInclusionTests; - -public class UPCC99DOMLocationInclusionTests extends C99DOMLocationInclusionTests { - - public UPCC99DOMLocationInclusionTests() { - } - - public UPCC99DOMLocationInclusionTests(String name) { - super(name); - } - - @Override - protected BaseExtensibleLanguage getC99Language() { - return UPCLanguage.getDefault(); - } -} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java deleted file mode 100644 index 9aaaf2a61c7..00000000000 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.parser.upc.tests; - -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; -import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99DigraphTrigraphTests; - - -public class UPCC99DigraphTrigraphTests extends C99DigraphTrigraphTests { - - public UPCC99DigraphTrigraphTests() { } - public UPCC99DigraphTrigraphTests(String name) { super(name); } - - @Override - protected BaseExtensibleLanguage getLanguage() { - return UPCLanguage.getDefault(); - } -} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java deleted file mode 100644 index 72eb13f5081..00000000000 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * 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 - *******************************************************************************/ -package org.eclipse.cdt.core.parser.upc.tests; - -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; -import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99SelectionParseTest; - -public class UPCC99SelectionParseTest extends C99SelectionParseTest { - - public UPCC99SelectionParseTest() { } - public UPCC99SelectionParseTest(String name) { super(name); } - - - @Override - protected BaseExtensibleLanguage getC99Language() { - return UPCLanguage.getDefault(); - } -} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99KnRTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java similarity index 66% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99KnRTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java index b5b254088a8..54f87b22b0f 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99KnRTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,17 +10,21 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99KnRTests; +import org.eclipse.cdt.core.lrparser.tests.LRCSpecTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99KnRTests extends C99KnRTests { +public class UPCCSpecTests extends LRCSpecTests { - public UPCC99KnRTests() { + public UPCCSpecTests() { + } + + public UPCCSpecTests(String name) { + super(name); } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getCLanguage() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CommentTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java similarity index 68% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CommentTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java index 376f0418128..348902a0e7c 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CommentTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99CommentTests; +import org.eclipse.cdt.core.lrparser.tests.LRCommentTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99CommentTests extends C99CommentTests { +public class UPCCommentTests extends LRCommentTests { @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilOldTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java similarity index 68% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilOldTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java index 9d3aee00671..7d18d2b1414 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilOldTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99UtilOldTests; +import org.eclipse.cdt.core.lrparser.tests.LRCompleteParser2Tests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99UtilOldTests extends C99UtilOldTests { +public class UPCCompleteParser2Tests extends LRCompleteParser2Tests { @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionBasicTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java similarity index 64% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionBasicTest.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java index 287c7d6fdee..6353ad0bbf7 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionBasicTest.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,16 +10,16 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.lrparser.tests.c99.C99CompletionBasicTest; +import org.eclipse.cdt.core.lrparser.tests.LRCompletionBasicTest; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99CompletionBasicTest extends C99CompletionBasicTest { +public class UPCCompletionBasicTest extends LRCompletionBasicTest { - public UPCC99CompletionBasicTest() { } + public UPCCompletionBasicTest() { } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return C99Language.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java new file mode 100644 index 00000000000..7208a3c7687 --- /dev/null +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * 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 + *******************************************************************************/ +package org.eclipse.cdt.core.parser.upc.tests; + +import org.eclipse.cdt.core.dom.upc.UPCLanguage; +import org.eclipse.cdt.core.lrparser.tests.LRCompletionParseTest; +import org.eclipse.cdt.core.model.ILanguage; + +public class UPCCompletionParseTest extends LRCompletionParseTest { + + public UPCCompletionParseTest() { } + public UPCCompletionParseTest(String name) { super(name); } + + @Override + protected ILanguage getC99Language() { + return UPCLanguage.getDefault(); + } +} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99GCCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java similarity index 61% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99GCCTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java index 2debeefe409..9a76613e012 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99GCCTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,22 +10,21 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99GCCTests; +import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationInclusionTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99GCCTests extends C99GCCTests { +public class UPCDOMLocationInclusionTests extends LRDOMLocationInclusionTests { - public UPCC99GCCTests() { + public UPCDOMLocationInclusionTests() { } - - public UPCC99GCCTests(String message) { - super(message); + + public UPCDOMLocationInclusionTests(String name) { + super(name); } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } - } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMPreprocessorInformationTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java similarity index 64% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMPreprocessorInformationTest.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java index d46398babce..3ed629bf5d6 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMPreprocessorInformationTest.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,15 +10,17 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMPreprocessorInformationTest; +import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationMacroTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99DOMPreprocessorInformationTest extends C99DOMPreprocessorInformationTest { +public class UPCDOMLocationMacroTests extends LRDOMLocationMacroTests { + + public UPCDOMLocationMacroTests() { + } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } - } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java similarity index 62% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java index 90005c24cb2..bad2b688ee6 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,21 +10,21 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationTests; +import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99DOMLocationTests extends C99DOMLocationTests { +public class UPCDOMLocationTests extends LRDOMLocationTests { - public UPCC99DOMLocationTests() { + public UPCDOMLocationTests() { } - public UPCC99DOMLocationTests(String name) { + public UPCDOMLocationTests(String name) { super(name); } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationMacroTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java similarity index 63% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationMacroTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java index 4e14043177a..15f74558153 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationMacroTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,17 +10,15 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationMacroTests; +import org.eclipse.cdt.core.lrparser.tests.LRDOMPreprocessorInformationTest; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99DOMLocationMacroTests extends C99DOMLocationMacroTests { - - public UPCC99DOMLocationMacroTests() { - } +public class UPCDOMPreprocessorInformationTest extends LRDOMPreprocessorInformationTest { @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } + } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SpecTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java similarity index 62% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SpecTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java index c342ab82120..990f5b15ebb 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SpecTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,22 +10,18 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99SpecTests; +import org.eclipse.cdt.core.lrparser.tests.LRDigraphTrigraphTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99SpecTests extends C99SpecTests { - public UPCC99SpecTests() { - } +public class UPCDigraphTrigraphTests extends LRDigraphTrigraphTests { - public UPCC99SpecTests(String name) { - super(name); - } + public UPCDigraphTrigraphTests() { } + public UPCDigraphTrigraphTests(String name) { super(name); } @Override - protected BaseExtensibleLanguage getCLanguage() { + protected ILanguage getCLanguage() { return UPCLanguage.getDefault(); } - } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java similarity index 65% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java index d5d9fba2361..8b8f2ea3eac 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,14 +10,21 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99CompleteParser2Tests; +import org.eclipse.cdt.core.lrparser.tests.LRGCCTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99CompleteParser2Tests extends C99CompleteParser2Tests { +public class UPCGCCTests extends LRGCCTests { + + public UPCGCCTests() { + } + + public UPCGCCTests(String message) { + super(message); + } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java similarity index 69% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java index c167045cdaf..cac0c19edc8 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,14 +10,17 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99UtilTests; +import org.eclipse.cdt.core.lrparser.tests.LRKnRTests; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99UtilTests extends C99UtilTests { +public class UPCKnRTests extends LRKnRTests { + + public UPCKnRTests() { + } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java index dfec4dc6f6f..78250638b5c 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at 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 d1afdb0cbe1..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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,27 +16,25 @@ import junit.framework.TestSuite; public class UPCParserTestSuite extends TestSuite { public static Test suite() { - TestSuite suite = new TestSuite(); - - suite.addTestSuite(UPCC99CommentTests.class); - suite.addTestSuite(UPCC99CompletionBasicTest.class); - suite.addTestSuite(UPCC99CompletionParseTest.class); - suite.addTestSuite(UPCC99DOMLocationInclusionTests.class); - suite.addTestSuite(UPCC99DOMLocationMacroTests.class); - suite.addTestSuite(UPCC99DOMLocationTests.class); - suite.addTestSuite(UPCC99DOMPreprocessorInformationTest.class); - suite.addTestSuite(UPCC99KnRTests.class); - suite.addTestSuite(UPCC99SelectionParseTest.class); - suite.addTestSuite(UPCC99SpecTests.class); - suite.addTestSuite(UPCC99Tests.class); - suite.addTestSuite(UPCLanguageExtensionTests.class); - suite.addTestSuite(UPCC99DigraphTrigraphTests.class); - suite.addTestSuite(UPCC99GCCTests.class); - suite.addTestSuite(UPCC99UtilOldTests.class); - suite.addTestSuite(UPCC99UtilTests.class); - suite.addTestSuite(UPCC99CompleteParser2Tests.class); - suite.addTestSuite(UPCC99TaskParserTest.class); - - return suite; + return new TestSuite() {{ + 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/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java new file mode 100644 index 00000000000..6b1345bfb04 --- /dev/null +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * 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 + *******************************************************************************/ +package org.eclipse.cdt.core.parser.upc.tests; + +import org.eclipse.cdt.core.dom.upc.UPCLanguage; +import org.eclipse.cdt.core.lrparser.tests.LRSelectionParseTest; +import org.eclipse.cdt.core.model.ILanguage; + +public class UPCSelectionParseTest extends LRSelectionParseTest { + + public UPCSelectionParseTest() { } + public UPCSelectionParseTest(String name) { super(name); } + + + @Override + protected ILanguage getC99Language() { + return UPCLanguage.getDefault(); + } +} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java similarity index 67% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java index 5231b3ecd13..2bfdf839f00 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.upc.tests; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99TaskParserTest; +import org.eclipse.cdt.core.lrparser.tests.LRTaskParserTest; +import org.eclipse.cdt.core.model.ILanguage; -public class UPCC99TaskParserTest extends C99TaskParserTest { +public class UPCTaskParserTest extends LRTaskParserTest { @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java similarity index 69% rename from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99Tests.java rename to upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java index 9cf08d3f375..d2c245260f4 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99Tests.java +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 IBM Corporation and others. + * Copyright (c) 2006, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -12,25 +12,25 @@ package org.eclipse.cdt.core.parser.upc.tests; import junit.framework.TestSuite; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.upc.UPCLanguage; -import org.eclipse.cdt.core.lrparser.tests.c99.C99Tests; +import org.eclipse.cdt.core.lrparser.tests.LRTests; +import org.eclipse.cdt.core.model.ILanguage; /** * Run the C99 tests against the UPC parser * */ -public class UPCC99Tests extends C99Tests { +public class UPCTests extends LRTests { public static TestSuite suite() { - return suite(UPCC99Tests.class); + return suite(UPCTests.class); } - public UPCC99Tests(String name) { + public UPCTests(String name) { super(name); } @Override - protected BaseExtensibleLanguage getC99Language() { + protected ILanguage getC99Language() { return UPCLanguage.getDefault(); } diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java new file mode 100644 index 00000000000..3c29524c27f --- /dev/null +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * 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 + *******************************************************************************/ +package org.eclipse.cdt.core.parser.upc.tests; + +import org.eclipse.cdt.core.dom.upc.UPCLanguage; +import org.eclipse.cdt.core.lrparser.tests.LRUtilOldTests; +import org.eclipse.cdt.core.model.ILanguage; + +public class UPCUtilOldTests extends LRUtilOldTests { + + @Override + protected ILanguage getC99Language() { + return UPCLanguage.getDefault(); + } + +} diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java new file mode 100644 index 00000000000..b3cb530ff4e --- /dev/null +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java @@ -0,0 +1,24 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * 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 + *******************************************************************************/ +package org.eclipse.cdt.core.parser.upc.tests; + +import org.eclipse.cdt.core.dom.upc.UPCLanguage; +import org.eclipse.cdt.core.lrparser.tests.LRUtilTests; +import org.eclipse.cdt.core.model.ILanguage; + +public class UPCUtilTests extends LRUtilTests { + + @Override + protected ILanguage getC99Language() { + return UPCLanguage.getDefault(); + } + +}