diff options
Diffstat (limited to 'xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc')
33 files changed, 328 insertions, 471 deletions
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/VectorExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/VectorExtensionsTest.java index cabf940057c..63d91e07771 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/VectorExtensionsTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/VectorExtensionsTest.java @@ -24,183 +24,123 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; - public class VectorExtensionsTest extends XlcTestBase { public VectorExtensionsTest() { } - + public VectorExtensionsTest(String name) { super(name); } - - - - public void testVector1() { - String code = - "int test() { \n" + - " vector unsigned int a = {1,2,3,4}; \n" + - " vector unsigned int b = {2,4,6,8}; \n" + - " vector unsigned int c = a + b; \n" + - " int e = b > a; \n" + - " int f = a[2]; \n" + - " vector unsigned int d = ++a; \n" + - "}\n"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void testVectorDeclarations() { - String code = - "vector unsigned char a; \n" + - "vector signed char b; \n" + - "vector bool char c; \n" + - "vector unsigned short d; \n" + - "vector unsigned short int e; \n" + - "vector signed short f; \n" + - "vector signed short int g; \n" + - "vector bool short h; \n" + - "vector bool short int i; \n" + - "vector unsigned int j; \n" + - "vector unsigned long k; \n" + - "vector unsigned long int l; \n" + - "vector signed int m; \n" + - "vector signed long n; \n" + - "vector signed long int o; \n" + - "vector bool int p; \n" + - "vector bool long q; \n" + - "vector bool long int r; \n" + - "vector float s; \n" + - "vector pixel t; \n" + - "__vector __pixel u; \n"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - // these are only treated as keywords inside a vector declaration - public void testReservedWords() { - String code = - "int pixel; " + - "int bool; "; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - - public void testVectorLiterals() { - String code = - "int test() {" + - " (vector unsigned int)(10); " + - " (vector unsigned int)(14, 82, 73, 700); " + - " (vector pixel)(14, 82, 73, 700); " + - " (vector bool int)(10); " + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void testVectorInitializers() { - String code = - "int test() {" + - " vector unsigned int v3 = {1,2,3,4}; " + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - - public void testVectorTypedefs() { - String code = - "int test() {" + - " typedef vector pixel vint16; " + - " vint16 v1;" + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void testVectorCompoundLiterals() { - String code = - "int test() {" + - " (vector unsigned int){10}; " + - " (vector unsigned int){14, 82, 73, 700}; " + - " (vector pixel){14, 82, 73, 700}; " + - " (vector bool int){10}; " + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void testVectorAlignof() { - String code = - "int test() {" + - " vector unsigned int v1 = (vector unsigned int)(10); \n" + - " vector unsigned int *pv1 = &v1; \n" + - " __alignof__(v1); \n" + - " __alignof__(&v1); \n" + - " __alignof__(*pv1); \n" + - " __alignof__(pv1); \n" + - " __alignof__(vector signed char); \n" + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void testVectorTypeof() { - String code = - "int test() {" + - " vector unsigned int v1 = (vector unsigned int)(10); \n" + - " vector unsigned int *pv1 = &v1; \n" + - " __typeof__(v1); \n" + - " __typeof__(&v1); \n" + - " __typeof__(*pv1); \n" + - " __typeof__(pv1); \n" + - " __typeof__(vector signed char); \n" + - "}"; - - parse(code, getCLanguage(), true); - parse(code, getCPPLanguage(), true); - } - - public void _testOverloads() { - String code = - "void foo(int); \n" + - "void foo(vector unsigned int); \n" + - "void foo(vector pixel) \n" + - "int test() { \n" + - " int x; \n" + - " vector unsigned int y; \n" + - " vector pixel z; \n" + - " foo(x); \n" + - " foo(y); \n" + - " foo(z); \n" + - "} \n"; - - IASTTranslationUnit tu = parse(code, getCPPLanguage(), true); - - - IASTDeclaration[] decls = tu.getDeclarations(); - IASTName foo1 = ((IASTSimpleDeclaration)decls[0]).getDeclarators()[0].getName(); - IASTName foo2 = ((IASTSimpleDeclaration)decls[1]).getDeclarators()[0].getName(); - IASTName foo3 = ((IASTSimpleDeclaration)decls[2]).getDeclarators()[0].getName(); - - IASTFunctionDefinition func = (IASTFunctionDefinition) decls[4]; - IASTStatement[] stats = ((IASTCompoundStatement)func.getBody()).getStatements(); - - IASTName fooCall1 = ((IASTIdExpression)((IASTFunctionCallExpression)((IASTExpressionStatement)stats[3]).getExpression()).getFunctionNameExpression()).getName(); - IASTName fooCall2 = ((IASTIdExpression)((IASTFunctionCallExpression)((IASTExpressionStatement)stats[4]).getExpression()).getFunctionNameExpression()).getName(); - IASTName fooCall3 = ((IASTIdExpression)((IASTFunctionCallExpression)((IASTExpressionStatement)stats[5]).getExpression()).getFunctionNameExpression()).getName(); - - assertSame(foo1.resolveBinding(), fooCall1.resolveBinding()); - assertSame(foo2.resolveBinding(), fooCall2.resolveBinding()); - assertSame(foo3.resolveBinding(), fooCall3.resolveBinding()); - } + + public void testVector1() { + String code = "int test() { \n" + " vector unsigned int a = {1,2,3,4}; \n" + + " vector unsigned int b = {2,4,6,8}; \n" + " vector unsigned int c = a + b; \n" + + " int e = b > a; \n" + " int f = a[2]; \n" + + " vector unsigned int d = ++a; \n" + "}\n"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorDeclarations() { + String code = "vector unsigned char a; \n" + "vector signed char b; \n" + "vector bool char c; \n" + + "vector unsigned short d; \n" + "vector unsigned short int e; \n" + + "vector signed short f; \n" + "vector signed short int g; \n" + "vector bool short h; \n" + + "vector bool short int i; \n" + "vector unsigned int j; \n" + "vector unsigned long k; \n" + + "vector unsigned long int l; \n" + "vector signed int m; \n" + "vector signed long n; \n" + + "vector signed long int o; \n" + "vector bool int p; \n" + "vector bool long q; \n" + + "vector bool long int r; \n" + "vector float s; \n" + "vector pixel t; \n" + + "__vector __pixel u; \n"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + // these are only treated as keywords inside a vector declaration + public void testReservedWords() { + String code = "int pixel; " + "int bool; "; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorLiterals() { + String code = "int test() {" + " (vector unsigned int)(10); " + + " (vector unsigned int)(14, 82, 73, 700); " + " (vector pixel)(14, 82, 73, 700); " + + " (vector bool int)(10); " + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorInitializers() { + String code = "int test() {" + " vector unsigned int v3 = {1,2,3,4}; " + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorTypedefs() { + String code = "int test() {" + " typedef vector pixel vint16; " + " vint16 v1;" + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorCompoundLiterals() { + String code = "int test() {" + " (vector unsigned int){10}; " + + " (vector unsigned int){14, 82, 73, 700}; " + " (vector pixel){14, 82, 73, 700}; " + + " (vector bool int){10}; " + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorAlignof() { + String code = "int test() {" + " vector unsigned int v1 = (vector unsigned int)(10); \n" + + " vector unsigned int *pv1 = &v1; \n" + " __alignof__(v1); \n" + " __alignof__(&v1); \n" + + " __alignof__(*pv1); \n" + " __alignof__(pv1); \n" + " __alignof__(vector signed char); \n" + + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void testVectorTypeof() { + String code = "int test() {" + " vector unsigned int v1 = (vector unsigned int)(10); \n" + + " vector unsigned int *pv1 = &v1; \n" + " __typeof__(v1); \n" + " __typeof__(&v1); \n" + + " __typeof__(*pv1); \n" + " __typeof__(pv1); \n" + " __typeof__(vector signed char); \n" + + "}"; + + parse(code, getCLanguage(), true); + parse(code, getCPPLanguage(), true); + } + + public void _testOverloads() { + String code = "void foo(int); \n" + "void foo(vector unsigned int); \n" + "void foo(vector pixel) \n" + + "int test() { \n" + " int x; \n" + " vector unsigned int y; \n" + " vector pixel z; \n" + + " foo(x); \n" + " foo(y); \n" + " foo(z); \n" + "} \n"; + + IASTTranslationUnit tu = parse(code, getCPPLanguage(), true); + + IASTDeclaration[] decls = tu.getDeclarations(); + IASTName foo1 = ((IASTSimpleDeclaration) decls[0]).getDeclarators()[0].getName(); + IASTName foo2 = ((IASTSimpleDeclaration) decls[1]).getDeclarators()[0].getName(); + IASTName foo3 = ((IASTSimpleDeclaration) decls[2]).getDeclarators()[0].getName(); + + IASTFunctionDefinition func = (IASTFunctionDefinition) decls[4]; + IASTStatement[] stats = ((IASTCompoundStatement) func.getBody()).getStatements(); + + IASTName fooCall1 = ((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTExpressionStatement) stats[3]) + .getExpression()).getFunctionNameExpression()).getName(); + IASTName fooCall2 = ((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTExpressionStatement) stats[4]) + .getExpression()).getFunctionNameExpression()).getName(); + IASTName fooCall3 = ((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTExpressionStatement) stats[5]) + .getExpression()).getFunctionNameExpression()).getName(); + + assertSame(foo1.resolveBinding(), fooCall1.resolveBinding()); + assertSame(foo2.resolveBinding(), fooCall2.resolveBinding()); + assertSame(foo3.resolveBinding(), fooCall3.resolveBinding()); + } } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTest.java index 2db13e11da3..59e08e4958c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTest.java @@ -16,286 +16,201 @@ package org.eclipse.cdt.core.parser.xlc.tests; import org.eclipse.cdt.core.lrparser.xlc.preferences.XlcLanguagePreferences; import org.eclipse.cdt.core.lrparser.xlc.preferences.XlcPref; - public class XlcExtensionsTest extends XlcTestBase { public XlcExtensionsTest() { } - + public XlcExtensionsTest(String name) { super(name); } - + public void testHexadecimalFloatingPointLiterals() throws Exception { - String code = - "int test() { \n"+ - " 0x0A2B.0FDp+2f; \n"+ - " 0X12D.p-44F; \n"+ - " 0xBACP+2L; \n"+ - "}\n"; + String code = "int test() { \n" + " 0x0A2B.0FDp+2f; \n" + " 0X12D.p-44F; \n" + + " 0xBACP+2L; \n" + "}\n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testFuncPredefinedIdentifier() { - String code = - "void test() { \n" + - " __func__; \n" + - " } \n"; + String code = "void test() { \n" + " __func__; \n" + " } \n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testStringConcatenation() { - String code = - "void test() { \n" + - " \"hello \" \"there\"; \n" + - " \"hello \" L\"there\"; \n" + - " } \n"; + String code = "void test() { \n" + " \"hello \" \"there\"; \n" + " \"hello \" L\"there\"; \n" + + " } \n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testLongLong() { - String code = - "void test() { \n" + - " long long x; \n" + - " } \n"; + String code = "void test() { \n" + " long long x; \n" + " } \n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testComplex() { - String code = - "void test() { \n" + - " float _Complex x; \n" + - " double _Complex y; \n" + - " long double _Complex z; \n" + - " } \n"; + String code = "void test() { \n" + " float _Complex x; \n" + " double _Complex y; \n" + + " long double _Complex z; \n" + " } \n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testBool() { - String code = - "_Bool f(int a, int b) { \n" + - " return a==b; \n" + - " } \n"; + String code = "_Bool f(int a, int b) { \n" + " return a==b; \n" + " } \n"; parse(code, getCLanguage(), true); } - + public void testTrailingCommaInEnum() { - String code = - "void test() { \n" + - " enum grain { oats, wheat, barley, corn, rice, }; \n" + - " } \n"; + String code = "void test() { \n" + " enum grain { oats, wheat, barley, corn, rice, }; \n" + + " } \n"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - public void testNonLValueArraySubscript() { - String code = - "struct trio{int a[3];}; \n" + - "struct trio f(); \n" + - "foo (int index) \n" + - "{ \n" + - " return f().a[index]; \n" + - "} \n"; + String code = "struct trio{int a[3];}; \n" + "struct trio f(); \n" + "foo (int index) \n" + + "{ \n" + " return f().a[index]; \n" + "} \n"; parse(code, getCLanguage(), true); } - + public void testStaticArrayIndices() { - String code = - "void test() { \n" + - " void foo1(int arr [static 10]); \n" + - " int i = 10; \n" + - " void foo2(int arr [static const i]); \n" + - " } \n"; + String code = "void test() { \n" + " void foo1(int arr [static 10]); \n" + + " int i = 10; \n" + " void foo2(int arr [static const i]); \n" + + " } \n"; parse(code, getCLanguage(), true); } - + public void testFunctionLikeMacrosVariableArguments() { - String code = - "#define debug(...) fprintf(stderr, __VA_ARGS__) \n" + - "int test() { \n" + - " debug(\"flag\"); \n" + - " } \n"; + String code = "#define debug(...) fprintf(stderr, __VA_ARGS__) \n" + "int test() { \n" + + " debug(\"flag\"); \n" + " } \n"; parse(code, getCLanguage(), false); } - + public void testFunctionLikeMacrosEmptyArgument() { - String code = - "#define SUM(a,b,c) a + b + c \n" + - "int test() { \n" + - " SUM(1,,3); \n" + - " } \n"; + String code = "#define SUM(a,b,c) a + b + c \n" + "int test() { \n" + " SUM(1,,3); \n" + " } \n"; parse(code, getCLanguage(), true); } - + public void testPredefinedMacroNamesC() { - String code = - "void test() { \n" + - " __DATE__; \n" + - " __FILE__; \n" + - " __LINE__; \n" + - " __STDC_HOSTED__; \n" + - " __STDC_VERSION__; \n" + - " __TIME__; \n" + - "} \n"; + String code = "void test() { \n" + " __DATE__; \n" + " __FILE__; \n" + + " __LINE__; \n" + " __STDC_HOSTED__; \n" + " __STDC_VERSION__; \n" + + " __TIME__; \n" + "} \n"; parse(code, getCLanguage(), true); } - + public void testPredefinedMacroNamesCpp() { - String code = - "void test() { \n" + - " __DATE__; \n" + - " __FILE__; \n" + - " __LINE__; \n" + - " __TIME__; \n" + - // " __cplusplus; \n" + - "} \n"; + String code = "void test() { \n" + " __DATE__; \n" + " __FILE__; \n" + + " __LINE__; \n" + " __TIME__; \n" + + // " __cplusplus; \n" + + "} \n"; parse(code, getCPPLanguage(), true); } - - + public void testCompoundLiterals() { - String code = - "void test() { \n" + - " drawline((struct point){6,7}); \n" + - " } \n"; + String code = "void test() { \n" + " drawline((struct point){6,7}); \n" + " } \n"; parse(code, getCLanguage(), false); } - - public void testPragma() { - String code = - "void test() { \n" + - " _Pragma ( \"pack(full)\" ) \n" + - " } \n"; + String code = "void test() { \n" + " _Pragma ( \"pack(full)\" ) \n" + " } \n"; parse(code, getCLanguage(), true); } - - + public void testStandardPragmas() { - String code = - "#pragma STDC FP_CONTRACT ON \n" + - "#pragma STDC FENV_ACCESS OFF \n" + - "#pragma STDC CX_LIMITED_RANGE DEFAULT \n"; + String code = "#pragma STDC FP_CONTRACT ON \n" + "#pragma STDC FENV_ACCESS OFF \n" + + "#pragma STDC CX_LIMITED_RANGE DEFAULT \n"; parse(code, getCLanguage(), true); } - + public void testLineDirective() { - String code = - "#define LINE200 200 \n" + - "#line 100 \n" + - "#line LINE200 \n"; + String code = "#define LINE200 200 \n" + "#line 100 \n" + "#line LINE200 \n"; parse(code, getCLanguage(), true); } - - + /** * https://bugs.eclipse.org/bugs/show_bug.cgi?id=228826 * http://publib.boulder.ibm.com/infocenter/comphelp/v101v121/index.jsp?topic=/com.ibm.xlcpp101.aix.doc/language_ref/restrict_type_qualifier.html - * + * * TODO Need a properties page so that things like this can be configured by the user. */ public void testRestrictC() { - String code = - "void foo(int n, int * restrict a, int * __restrict b, int * __restrict__ c) {} "; + String code = "void foo(int n, int * restrict a, int * __restrict b, int * __restrict__ c) {} "; parse(code, getCLanguage(), true); } - + public void testRestrictCPPOn() { - String code = - "void foo(int n, int * restrict a, int * __restrict b, int * __restrict__ c) {} "; + String code = "void foo(int n, int * restrict a, int * __restrict b, int * __restrict__ c) {} "; parse(code, getCPPLanguage(), true); } + public void testRestrictCPPOff() { XlcLanguagePreferences.setWorkspacePreference(XlcPref.SUPPORT_RESTRICT_IN_CPP, String.valueOf(false)); - String code = - "void restrict(); \n " + - "void foo(int n, int * __restrict b, int * __restrict__ c) {} "; + String code = "void restrict(); \n " + "void foo(int n, int * __restrict b, int * __restrict__ c) {} "; parse(code, getCPPLanguage(), true); } - - - + public void testUTFLiterals() { - String code = - "void test() { \n " + - " u\"ucs characters \\u1234 and \\u8180 \"; \n " + - " U\"ucs characters \\u1234 and \\u8180 \"; \n " + - " U\"concatenation \\u1234 \" u\"is allowed \\u8180 \"; \n " + - " u'\\u1234'; \n " + - " U'\\u1234'; \n " + - "}"; + String code = "void test() { \n " + " u\"ucs characters \\u1234 and \\u8180 \"; \n " + + " U\"ucs characters \\u1234 and \\u8180 \"; \n " + + " U\"concatenation \\u1234 \" u\"is allowed \\u8180 \"; \n " + " u'\\u1234'; \n " + + " U'\\u1234'; \n " + "}"; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - - + public void testFloatingPointTypes() { - String code = - " _Decimal32 x = 22.2df; \n " + - " _Decimal64 y = 33.3dd; \n " + - " _Decimal128 z = 33.3dl; \n "; + String code = " _Decimal32 x = 22.2df; \n " + " _Decimal64 y = 33.3dd; \n " + " _Decimal128 z = 33.3dl; \n "; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); } - + public void testVariableLengthArrays() { - String code = - "double maximum1(int n, int m, double a[n][m]);\n" + - "double maximum2(int n, int m, double a[*][*]);\n" + - "double maximum3(int n, int m, double a[ ][*]);\n" + - "double maximum4(int n, int m, double a[ ][m]);\n"; - + String code = "double maximum1(int n, int m, double a[n][m]);\n" + + "double maximum2(int n, int m, double a[*][*]);\n" + + "double maximum3(int n, int m, double a[ ][*]);\n" + + "double maximum4(int n, int m, double a[ ][m]);\n"; + parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); // xlc supports this in C++ } - + public void testV11Attributes() { - String code = - "#define __inline__ __inline__ __attribute__((gnu_inline)) \n" + - - "static int w() __attribute__ ((weakref (\"y\")));\n" + - /* is equivalent to... */ - "static int x() __attribute__ ((weak, weakref, alias (\"y\")));\n" + - /* and to... */ - "static int y() __attribute__ ((weakref));\n" + - "static int z() __attribute__ ((alias (\"y\"))); \n" + - - "int foo() __attribute__((gnu_inline)); \n" + - "static inline __attribute__((gnu_inline)) int ins (int *a){ \n" + - " (*a)++; \n" + - "} \n" + - "inline __attribute__((gnu_inline)) int inc (int *a){ \n" + - " (*a)++; \n" + - "} "; + String code = "#define __inline__ __inline__ __attribute__((gnu_inline)) \n" + + + "static int w() __attribute__ ((weakref (\"y\")));\n" + + /* is equivalent to... */ + "static int x() __attribute__ ((weak, weakref, alias (\"y\")));\n" + + /* and to... */ + "static int y() __attribute__ ((weakref));\n" + "static int z() __attribute__ ((alias (\"y\"))); \n" + + + "int foo() __attribute__((gnu_inline)); \n" + + "static inline __attribute__((gnu_inline)) int ins (int *a){ \n" + " (*a)++; \n" + "} \n" + + "inline __attribute__((gnu_inline)) int inc (int *a){ \n" + " (*a)++; \n" + "} "; parse(code, getCLanguage(), true); parse(code, getCPPLanguage(), true); diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTestSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTestSuite.java index c00b93049a8..42a42ae5268 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTestSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcExtensionsTestSuite.java @@ -19,9 +19,11 @@ import junit.framework.TestSuite; public class XlcExtensionsTestSuite extends TestSuite { public static Test suite() { - return new TestSuite() {{ - addTestSuite(VectorExtensionsTest.class); - addTestSuite(XlcExtensionsTest.class); - }}; + return new TestSuite() { + { + addTestSuite(VectorExtensionsTest.class); + addTestSuite(XlcExtensionsTest.class); + } + }; } }
\ No newline at end of file diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java index af38de28c15..c4d3cf3c419 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/XlcTestBase.java @@ -25,11 +25,11 @@ public class XlcTestBase extends TestCase { public XlcTestBase() { } - + public XlcTestBase(String name) { super(name); } - + protected IASTTranslationUnit parse(String code, ILanguage language, boolean checkBindings) { ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(true); @@ -37,13 +37,13 @@ public class XlcTestBase extends TestCase { options.setCheckBindings(checkBindings); return ParseHelper.parse(code, language, options); } - - protected XlcCLanguage getCLanguage() { - return XlcCLanguage.getDefault(); - } - - protected XlcCPPLanguage getCPPLanguage() { - return XlcCPPLanguage.getDefault(); - } - + + protected XlcCLanguage getCLanguage() { + return XlcCLanguage.getDefault(); + } + + protected XlcCPPLanguage getCPPLanguage() { + return XlcCPPLanguage.getDefault(); + } + } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java index 09c6e264a45..fcabbf988a7 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java @@ -7,7 +7,7 @@ * https://www.eclipse.org/legal/epl-2.0/ * * SPDX-License-Identifier: EPL-2.0 - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ @@ -19,32 +19,32 @@ import org.eclipse.cdt.core.lrparser.tests.LRCompletionHangingTest; import org.eclipse.cdt.core.lrparser.xlc.XlcCLanguage; import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; -public class XlcCompletionHangingTest extends LRCompletionHangingTest{ +public class XlcCompletionHangingTest extends LRCompletionHangingTest { - public static TestSuite suite() { return new TestSuite(XlcCompletionHangingTest.class); } - - + //TODO ??? overwrite some failed test cases - public void testCompletionTemplateClassForCPP() throws Exception {} - public void testCompletionGnuCPP() throws Exception {} - - - protected XlcCLanguage getCLanguage() { - return XlcCLanguage.getDefault(); - } - + public void testCompletionTemplateClassForCPP() throws Exception { + } + + public void testCompletionGnuCPP() throws Exception { + } + + protected XlcCLanguage getCLanguage() { + return XlcCLanguage.getDefault(); + } + protected XlcCPPLanguage getCPPLanguage() { - return XlcCPPLanguage.getDefault(); + return XlcCPPLanguage.getDefault(); } - + public void testCompletionXlc() throws Exception { - String code = - " __static_assert" + CONTENT_ASIST_CURSOR +"(a>" + CONTENT_ASIST_CURSOR +"b, \"no 64-bit support\"); \n"+ - " vector " + CONTENT_ASIST_CURSOR +"unsigned " + CONTENT_ASIST_CURSOR +"int d = ++a; \n"; + String code = " __static_assert" + CONTENT_ASIST_CURSOR + "(a>" + CONTENT_ASIST_CURSOR + + "b, \"no 64-bit support\"); \n" + " vector " + CONTENT_ASIST_CURSOR + "unsigned " + + CONTENT_ASIST_CURSOR + "int d = ++a; \n"; runTestCase(code, getCPPLanguage()); } } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java index 1202c907f4a..2d6050baa6c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java @@ -24,11 +24,11 @@ public class XlcLRCPPImplicitNameTests extends LRCPPImplicitNameTests { public static TestSuite suite() { return suite(XlcLRCPPImplicitNameTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java index 814db43d48a..1900fca8e28 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java @@ -24,11 +24,11 @@ public class XlcLRCPPSpecTest extends LRCPPSpecTest { public static TestSuite suite() { return suite(XlcLRCPPSpecTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java index 8da81d45da2..b76de18c521 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java @@ -25,17 +25,18 @@ public class XlcLRCPPTests extends LRCPPTests { public static TestSuite suite() { return suite(XlcLRCPPTests.class); } + //CDT_70_FIX_FROM_50-#9 public void testStaticAssertions_294730() throws Exception { - String code= getAboveComment(); + String code = getAboveComment(); code = code.replaceAll("static_assert", "__static_assert"); parseAndCheckBindings(code, ParserLanguage.CPP); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java index 1d0dac14b36..8607ef23f23 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java @@ -24,11 +24,11 @@ public class XlcLRCSpecTests extends LRCSpecTests { public static TestSuite suite() { return suite(XlcLRCSpecTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java index 5a359aeaa15..172863181bf 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java @@ -21,16 +21,15 @@ import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; public class XlcLRCommentTests extends LRCommentTests { - - + public static TestSuite suite() { - return suite(XlcLRCommentTests.class); - } - + return suite(XlcLRCommentTests.class); + } + protected ILanguage getCLanguage() { - return XlcCLanguage.getDefault(); - } - + return XlcCLanguage.getDefault(); + } + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java index 0a2e5969859..fbbda23e66a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java @@ -25,11 +25,11 @@ public class XlcLRCompleteParser2Tests extends LRCompleteParser2Tests { public static TestSuite suite() { return suite(XlcLRCompleteParser2Tests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java index 6cd1a7ffe51..394a9baf277 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java @@ -24,11 +24,11 @@ public class XlcLRCompletionBasicTest extends LRCompletionBasicTest { public static TestSuite suite() { return suite(XlcLRCompletionBasicTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java index e96f13bf06a..fd5ed160751 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java @@ -24,11 +24,11 @@ public class XlcLRCompletionParseTest extends LRCompletionParseTest { public static TestSuite suite() { return new TestSuite(XlcLRCompletionParseTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java index 20e28cca007..8e2d936df6f 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java @@ -24,11 +24,11 @@ public class XlcLRDOMLocationMacroTests extends LRDOMLocationMacroTests { public static TestSuite suite() { return suite(XlcLRDOMLocationMacroTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java index 08dac57e6ca..b2108ca084a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java @@ -24,11 +24,11 @@ public class XlcLRDOMLocationTests extends LRDOMLocationTests { public static TestSuite suite() { return suite(XlcLRDOMLocationTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java index 7dce686dbc1..d4b2a04abb6 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java @@ -24,11 +24,11 @@ public class XlcLRDOMPreprocessorInformationTest extends LRDOMPreprocessorInform public static TestSuite suite() { return suite(XlcLRDOMPreprocessorInformationTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java index f7d90e9eb89..eaa4da889c3 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java @@ -25,11 +25,11 @@ public class XlcLRDigraphTrigraphTests extends LRDigraphTrigraphTests { public static TestSuite suite() { return new TestSuite(XlcLRDigraphTrigraphTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java index c036eac6a53..187580d9871 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java @@ -24,11 +24,11 @@ public class XlcLRGCCCompleteParseExtensionsTest extends LRGCCCompleteParseExten public static TestSuite suite() { return suite(XlcLRGCCCompleteParseExtensionsTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java index 5297c7b93fb..967aaa79114 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java @@ -24,11 +24,11 @@ public class XlcLRGCCTests extends LRGCCTests { public static TestSuite suite() { return suite(XlcLRGCCTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java index 1ee0030f6c5..0e9c557d9ce 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java @@ -24,11 +24,11 @@ public class XlcLRImageLocationTests extends LRImageLocationTests { public static TestSuite suite() { return suite(XlcLRImageLocationTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java index e050e796f6d..342e7dc17c1 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java @@ -24,11 +24,11 @@ public class XlcLRInactiveCodeTests extends LRInactiveCodeTests { public static TestSuite suite() { return suite(XlcLRInactiveCodeTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java index 31bb9d8e2e1..d9a34967ffc 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java @@ -24,11 +24,11 @@ public class XlcLRKnRTests extends LRKnRTests { public static TestSuite suite() { return suite(XlcLRKnRTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java index 021ed9671b4..54f859a83a4 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java @@ -24,11 +24,11 @@ public class XlcLRNodeSelectorTest extends LRNodeSelectorTest { public static TestSuite suite() { return suite(XlcLRNodeSelectorTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRParserTestSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRParserTestSuite.java index 7e8c9a8d923..4db01c58b36 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRParserTestSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRParserTestSuite.java @@ -13,13 +13,11 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.base; - - import junit.framework.Test; import junit.framework.TestSuite; public class XlcLRParserTestSuite extends TestSuite { - + // TODO: the following test are not being reused // // DOMGCCSelectionParseExtensionsTest @@ -28,39 +26,40 @@ public class XlcLRParserTestSuite extends TestSuite { // QuickParser2Tests // // and perhaps others - + public static Test suite() { - return new TestSuite() {{ - - addTest(XlcLRCommentTests.suite()); - addTest(XlcLRCompleteParser2Tests.suite()); - addTest(XlcLRCompletionBasicTest.suite()); - addTest(XlcLRCompletionParseTest.suite()); - addTest(XlcLRCPPSpecTest.suite()); - addTest(XlcLRCPPTests.suite()); - addTest(XlcLRCSpecTests.suite()); // a couple of failures - addTest(XlcLRDigraphTrigraphTests.suite()); - addTest(XlcLRDOMLocationMacroTests.suite()); - addTest(XlcLRDOMLocationTests.suite()); - addTest(XlcLRDOMPreprocessorInformationTest.suite()); - addTest(XlcLRGCCTests.suite()); - addTest(XlcLRGCCCompleteParseExtensionsTest.suite()); - addTest(XlcLRImageLocationTests.suite()); - addTest(XlcLRKnRTests.suite()); // mostly fail due to ambiguities - addTest(XlcLRNodeSelectorTest.suite()); - addTest(XlcLRQuickParser2Tests.suite()); - addTest(XlcLRSelectionParseTest.suite()); // this one still has a lot of failing tests though - addTest(XlcLRSemanticsTests.suite()); - addTest(XlcLRTaskParserTest.suite()); - addTest(XlcLRTemplateTests.suite()); - addTest(XlcLRTests.suite()); // has some tests that do fail - addTest(XlcLRUtilOldTests.suite()); - addTest(XlcLRUtilTests.suite()); - addTest(XlcCompletionHangingTest.suite()); - addTest(XlcLRCPPImplicitNameTests.suite()); - //addTest(LRInactiveCodeTests.suite()); + return new TestSuite() { + { - }}; - } -} + addTest(XlcLRCommentTests.suite()); + addTest(XlcLRCompleteParser2Tests.suite()); + addTest(XlcLRCompletionBasicTest.suite()); + addTest(XlcLRCompletionParseTest.suite()); + addTest(XlcLRCPPSpecTest.suite()); + addTest(XlcLRCPPTests.suite()); + addTest(XlcLRCSpecTests.suite()); // a couple of failures + addTest(XlcLRDigraphTrigraphTests.suite()); + addTest(XlcLRDOMLocationMacroTests.suite()); + addTest(XlcLRDOMLocationTests.suite()); + addTest(XlcLRDOMPreprocessorInformationTest.suite()); + addTest(XlcLRGCCTests.suite()); + addTest(XlcLRGCCCompleteParseExtensionsTest.suite()); + addTest(XlcLRImageLocationTests.suite()); + addTest(XlcLRKnRTests.suite()); // mostly fail due to ambiguities + addTest(XlcLRNodeSelectorTest.suite()); + addTest(XlcLRQuickParser2Tests.suite()); + addTest(XlcLRSelectionParseTest.suite()); // this one still has a lot of failing tests though + addTest(XlcLRSemanticsTests.suite()); + addTest(XlcLRTaskParserTest.suite()); + addTest(XlcLRTemplateTests.suite()); + addTest(XlcLRTests.suite()); // has some tests that do fail + addTest(XlcLRUtilOldTests.suite()); + addTest(XlcLRUtilTests.suite()); + addTest(XlcCompletionHangingTest.suite()); + addTest(XlcLRCPPImplicitNameTests.suite()); + //addTest(LRInactiveCodeTests.suite()); + } + }; + } +} diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java index 2b0bc037d2c..860a2b43dc8 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java @@ -24,11 +24,11 @@ public class XlcLRQuickParser2Tests extends LRQuickParser2Tests { public static TestSuite suite() { return new TestSuite(XlcLRQuickParser2Tests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java index fcf72512f62..0fac0baf0b8 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java @@ -21,7 +21,7 @@ import org.eclipse.cdt.core.lrparser.xlc.XlcCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; public class XlcLRSelectionParseTest extends LRSelectionParseTest { - + public XlcLRSelectionParseTest() { } @@ -32,11 +32,11 @@ public class XlcLRSelectionParseTest extends LRSelectionParseTest { public static TestSuite suite() { return new TestSuite(XlcLRSelectionParseTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java index 60150ce85e0..8b59776a0cc 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java @@ -24,11 +24,11 @@ public class XlcLRSemanticsTests extends LRSemanticsTests { public static TestSuite suite() { return suite(XlcLRSemanticsTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java index 2d291f21f84..d2e602b5741 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java @@ -24,11 +24,11 @@ public class XlcLRTaskParserTest extends LRTaskParserTest { public static TestSuite suite() { return suite(XlcLRTaskParserTest.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java index c2f7e260dc4..fa2c1c18089 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java @@ -24,11 +24,11 @@ public class XlcLRTemplateTests extends LRTemplateTests { public static TestSuite suite() { return suite(XlcLRTemplateTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java index d755b1cd750..4eb9418e20f 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java @@ -26,15 +26,15 @@ public class XlcLRTests extends LRTests { super(name); // TODO Auto-generated constructor stub } - + public static TestSuite suite() { return suite(XlcLRTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java index e7ed83f8bc6..895eb9da8a4 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java @@ -24,11 +24,11 @@ public class XlcLRUtilOldTests extends LRUtilOldTests { public static TestSuite suite() { return suite(XlcLRUtilOldTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java index b0d9892e5e8..5026cd26895 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java @@ -24,11 +24,11 @@ public class XlcLRUtilTests extends LRUtilTests { public static TestSuite suite() { return suite(XlcLRUtilTests.class); } - + protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } - + protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java index 3a3d517e251..280a4f4dde6 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java @@ -13,7 +13,6 @@ *******************************************************************************/ package org.eclipse.cdt.core.parser.xlc.tests.suite; - import junit.framework.Test; import junit.framework.TestSuite; @@ -23,9 +22,11 @@ import org.eclipse.cdt.core.parser.xlc.tests.base.XlcLRParserTestSuite; public class AutomatedIntegrationSuite extends TestSuite { public static Test suite() { - return new TestSuite() {{ - addTest(XlcExtensionsTestSuite.suite()); - addTest(XlcLRParserTestSuite.suite()); - }}; + return new TestSuite() { + { + addTest(XlcExtensionsTestSuite.suite()); + addTest(XlcLRParserTestSuite.suite()); + } + }; } } |