diff options
Diffstat (limited to 'tests/junit/extraplugins/codegen')
25 files changed, 79 insertions, 436 deletions
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp deleted file mode 100644 index eacc3508b50..00000000000 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - -#define CppCodegenTest_Package1_Class8_BODY - -/************************************************************ - Class8 class body - ************************************************************/ - -// include associated header file -#include "CppCodegenTest/Package1/Class8.h" - -// Derived includes directives - -namespace Package1 { - -// static attributes (if any) - -/** - * - * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this - */ -int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1, - char /*in*/cVal2) -{ - -} - -/** - * - * @param iVal1 - */ -void Class8::operation1(int /*in*/iVal1) -{ - -} - -} // of namespace Package1 - -/************************************************************ - End of Class8 class body - ************************************************************/
\ No newline at end of file diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h deleted file mode 100644 index a9ce8cc797f..00000000000 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class8.h +++ /dev/null @@ -1,64 +0,0 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - -#ifndef CPPCODEGENTEST_PACKAGE1_CLASS8_H -#define CPPCODEGENTEST_PACKAGE1_CLASS8_H - -/************************************************************ - Class8 class header - ************************************************************/ - -#include "CppCodegenTest/Package1/Pkg_Package1.h" - -#include "AnsiCLibrary/Pkg_AnsiCLibrary.h" - -namespace Package1 { - -/************************************************************/ -/** - * - */ - -class Class8 -{ - -public: - Class8() : - defaultIValue(12) - { - } - - /** - * - */ - int defaultIValue; - - /** - * - * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this - */ - int operation1(int /*in*/iVal1, int /*in*/iVal2 = 2, char /*in*/cVal1, - char /*in*/cVal2); - - /** - * - * @param iVal1 - */ - void operation1(int /*in*/iVal1); - -}; -/************************************************************/ -/* External declarations (package visibility) */ - -/************************************************************/ - -/* Inline functions */ - -} // of namespace Package1 - -/************************************************************ - End of Class8 class header - ************************************************************/ - -#endif diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp deleted file mode 100644 index e02f960c86d..00000000000 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.cpp +++ /dev/null @@ -1,51 +0,0 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - -#define CppCodegenTest_Package1_Class9_BODY - -/************************************************************ - Class9 class body - ************************************************************/ - -// include associated header file -#include "CppCodegenTest/Package1/Class9.h" - -// Derived includes directives - -namespace Package1 { - -// static attributes (if any) - -/** - * - * @param - */ -int Class9::volatileIntOperation() -{ - -} - -/** - * Should not generate the 'register' keyword as it cannot be used in method signatures. - * @param - */ -int Class9::registerOperation() -{ - -} - -/** - * - * @param - */ -int Class9::externOperation() -{ - -} - -} // of namespace Package1 - -/************************************************************ - End of Class9 class body - ************************************************************/
\ No newline at end of file diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h deleted file mode 100644 index 427cfa5b191..00000000000 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Class9.h +++ /dev/null @@ -1,79 +0,0 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - -#ifndef CPPCODEGENTEST_PACKAGE1_CLASS9_H -#define CPPCODEGENTEST_PACKAGE1_CLASS9_H - -/************************************************************ - Class9 class header - ************************************************************/ - -#include "CppCodegenTest/Package1/Pkg_Package1.h" - -#include "AnsiCLibrary/Pkg_AnsiCLibrary.h" - -namespace Package1 { - -/************************************************************/ -/** - * - */ - -class Class9 -{ - -public: - Class9() : - externAttribute(3) - { - } - - /** - * - */ - int volatileAttribute; - - /** - * Should not generate 'register' keyword as 'register' only applies to properties declared within the scope of an operation. - */ - int registerAttribute; - - /** - * - * @param - */ - int volatileIntOperation(); - - /** - * Should not generate the 'register' keyword as it cannot be used in method signatures. - * @param - */ - int registerOperation(); - -}; -/************************************************************/ -/* External declarations (package visibility) */ - -/** - * - */ -int externAttribute; - -/** - * - * @param - */ -int externOperation(); - -/************************************************************/ - -/* Inline functions */ - -} // of namespace Package1 - -/************************************************************ - End of Class9 class header - ************************************************************/ - -#endif diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h deleted file mode 100644 index 6fee268eb47..00000000000 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/CppCodegenTest/Package1/Pkg_Package1.h +++ /dev/null @@ -1,36 +0,0 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - -#ifndef PKG_CPPCODEGENTEST_PACKAGE1 -#define PKG_CPPCODEGENTEST_PACKAGE1 - -/************************************************************ - Pkg_Package1 package header - ************************************************************/ - -#include "CppCodegenTest/Pkg_CppCodegenTest.h" - -#ifndef _IN_ -#define _IN_ -#endif -#ifndef _OUT_ -#define _OUT_ -#endif -#ifndef _INOUT_ -#define _INOUT_ -#endif - -/* Package dependency header include */ - -namespace Package1 { - -// Types defined within the package - -}// of namespace Package1 - -/************************************************************ - End of Pkg_Package1 package header - ************************************************************/ - -#endif diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp index e89d702b3f9..a5cf3849df5 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.cpp @@ -17,9 +17,11 @@ /** * Assignment operator - * @param cSource @param this + * @param cSource + * @return this */ Class1& Class1::operator =(const Class1 /*in*/& cSource) { + if (this == &cSource) return *this; @@ -30,7 +32,6 @@ Class1& Class1::operator =(const Class1 /*in*/& cSource) { /** * Destructor - * */ Class1::~Class1() { @@ -41,6 +42,7 @@ Class1::~Class1() { * @param cSource */ Class1::Class1(const Class1 /*in*/& cSource) { + iVal = cSource.iVal; } diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h index f6818875447..76afbc28aef 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class1.h @@ -17,20 +17,18 @@ /** * */ - class Class1 { - public: /** * Assignment operator - * @param cSource @param this + * @param cSource + * @return this */ Class1& operator =(const Class1 /*in*/& cSource); /** * Destructor - * */ ~Class1(); @@ -41,16 +39,13 @@ public: Class1(const Class1 /*in*/& cSource); private: - /** * */ int iVal; - }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp index 2086e77728f..d90fadbc9d9 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.cpp @@ -15,13 +15,12 @@ // Include from Include declaration (body) #include <string.h> -// End of Include stereotype (body) +// End of Include declaration (body) // static attributes (if any) /** * Default constructor - * */ Class2::Class2() { iVal1 = 0; @@ -31,7 +30,9 @@ Class2::Class2() { /** * Constructor with parameters - * @param newIVal1 @param newIVal2 @param newBVal + * @param newIVal1 + * @param newIVal2 + * @param newBVal */ Class2::Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal) { iVal1 = newIVal1; @@ -41,7 +42,9 @@ Class2::Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal) { /** * Virtual method - * @param a @param b @param + * @param a + * @param b + * @return */ double Class2::virtualOp(double /*in*/a, double /*in*/b) { return; @@ -49,42 +52,37 @@ double Class2::virtualOp(double /*in*/a, double /*in*/b) { /** * Static method - * */ void Class2::staticOp() { - } /** * Friend method - * */ void Class2::friendOp() { - } /** * Non-static method - * */ void Class2::nonStaticOp() { - } /** * Method with in, out, inout, return parameters - * @param in @param out @param inout @param ret + * @param in + * @param out + * @param inout + * @return ret */ int Class2::paramsOp(int /*in*/in, int /*out*/* out, int /*inout*/* inout) { - } /** * Void Method - * @param + * @return */ void Class2::voidOp() { - } /** @@ -92,28 +90,24 @@ void Class2::voidOp() { * @param newIVal1 */ void Class2::defaultValueOp(int /*in*/newIVal1) { - } /** * Virtual destructor - * */ Class2::~Class2() { - } /** * - * @param c1 @param + * @param c1 + * @return */ Class1 Class2::classesOp(Class1 /*in*/c1) { - } /** * Const method - * */ void Class2::constOp() const { std::cout << "I am a const method" << std::endl; diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h index 047fb6e8bb4..037be014e9c 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class2.h @@ -12,7 +12,6 @@ #include "CppCodegenTest/Pkg_CppCodegenTest.h" #include "AnsiCLibrary/Pkg_AnsiCLibrary.h" - #include "CppCodegenTest/Class1.h" // Include from Include stereotype (header) @@ -23,11 +22,8 @@ /** * */ - class Class2 { - public: - /** * boolean value with public visibility */ @@ -35,55 +31,60 @@ public: /** * Default constructor - * */ Class2(); /** * Constructor with parameters - * @param newIVal1 @param newIVal2 @param newBVal + * @param newIVal1 + * @param newIVal2 + * @param newBVal */ Class2(int /*in*/newIVal1, int /*in*/newIVal2, bool /*in*/newBVal); /** * Virtual method - * @param a @param b @param + * @param a + * @param b + * @return */ virtual double virtualOp(double /*in*/a, double /*in*/b); /** * Static method - * */ static void staticOp(); /** * Inline method - * @param a @param b @param + * @param a + * @param b + * @return */ inline int inlineOp(int /*in*/a, int /*in*/b); /** * Friend method - * */ void friendOp(); /** * Non-static method - * */ void nonStaticOp(); /** * Method with in, out, inout, return parameters - * @param in @param out @param inout @param ret + * @param in + * @param out + * @param inout + * @return ret */ int paramsOp(int /*in*/in, int /*out*/* out, int /*inout*/* inout); /** * Void Method - * @param + * @return */ void voidOp(); @@ -95,52 +96,47 @@ public: /** * Virtual destructor - * */ virtual ~Class2(); /** * - * @param c1 @param + * @param c1 + * @return */ Class1 classesOp(Class1 /*in*/c1); /** * Const method - * */ void constOp() const; protected: - /** * int value with protected visibility */ int protectedIVal1; private: - /** * int value with private visibility */ int privateIVal2; - }; /************************************************************/ /* External declarations (package visibility) */ - /** * int value with package visibility */ int packageIVal3; - /************************************************************/ /* Inline functions */ - /** * Inline method - * @param a @param b @param + * @param a + * @param b + * @return */ inline int Class2::inlineOp(int /*in*/a, int /*in*/b) { return a + b; diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp index 730349c9c02..df4c1ee3a6a 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.cpp @@ -17,7 +17,9 @@ /** * Inherited method overriding. - * @param a @param b @param + * @param a + * @param b + * @return */ double Class3::virtualOp(double /*in*/a, double /*in*/b) { return a + b; @@ -25,18 +27,14 @@ double Class3::virtualOp(double /*in*/a, double /*in*/b) { /** * Inherited virtual destructor - * */ Class3::~Class3() { - } /** * Default constructor - * */ Class3::Class3() { - } /************************************************************ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h index fb742f16899..21c580f553e 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class3.h @@ -12,40 +12,36 @@ #include "CppCodegenTest/Pkg_CppCodegenTest.h" #include "AnsiCLibrary/Pkg_AnsiCLibrary.h" - #include "CppCodegenTest/Class2.h" /************************************************************/ /** * */ - class Class3: public Class2 { - public: /** * Inherited method overriding. - * @param a @param b @param + * @param a + * @param b + * @return */ double virtualOp(double /*in*/a, double /*in*/b); /** * Inherited virtual destructor - * */ ~Class3(); /** * Default constructor - * */ Class3(); }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h index c39f38c764d..961583668f7 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.h @@ -11,18 +11,15 @@ #include "CppCodegenTest/Pkg_CppCodegenTest.h" -#include "CppCodegenTest/Class3.h" - #include "AnsiCLibrary/Pkg_AnsiCLibrary.h" +#include "CppCodegenTest/Class3.h" /************************************************************/ /** * */ - class Class4 { public: - /** * */ @@ -31,148 +28,119 @@ public: Class4() : arrayDoubleDefault( { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }) { } - /** * */ Class3* c3; - /** * */ char charVar; - /** * */ double doubleVar; - /** * */ float floatVar; - /** * */ int intVar; - /** * */ void voidVar; - /** * */ long longVar; - /** * */ long double longDoubleVar; - /** * */ short shortVar; - /** * */ unsigned int unsignedIntVar; - /** * */ unsigned short unsignedShortVar; - /** * */ unsigned char unsignedCharVar; - /** * */ unsigned long unsignedLongVar; - /** * */ bool boolVar; - /** * */ int16_t int16_tVar; - /** * */ uint16_t uint16_tVar; - /** * */ int32_t int32_tVar; - /** * */ uint32_t uint32_tVar; - /** * */ int64_t int64_tVar; - /** * */ uint64_t uint64_tVar; - /** * */ wchar_t wchar_tVar; - /** * */ int8_t int8_tVar; - /** * */ uint8_t uint8_tVar; - /** * */ ::CppCodegenTest::Class4::pChar pc; - /** * */ double arrayDoubleDefault[13]; - /** * */ char arrayCharInit[11] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd' }; - /** * */ char* charString; - /** * */ char* ptrChar; - /** * */ @@ -181,7 +149,6 @@ public: }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h index cdbc8316b4a..03a45babb83 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.h @@ -17,11 +17,8 @@ /** * C++ Virtual Interface */ - class Class5 { - public: - /** * */ @@ -29,20 +26,19 @@ public: /** * - * @param iReturn + * @return iReturn */ virtual int pureVirtualOp() = 0; /** * - * @param iReturn + * @return iReturn */ virtual int* pureVirtualConstOp() = 0; }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h index a7bb70004da..9d3f1d42847 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.h @@ -12,18 +12,14 @@ #include "CppCodegenTest/Pkg_CppCodegenTest.h" #include "CppCodegenTest/Class3.h" - #include "CppCodegenTest/Class5.h" /************************************************************/ /** * Virtual class inheritance and class instantiation */ - class Class6: public Class5 { - public: - /** * */ @@ -32,7 +28,6 @@ public: }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h index ba39ae90524..163c5fef2c9 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.h @@ -21,19 +21,15 @@ /** * */ - class Class7 { - public: Class7() : defaultProp(43) { } - /** * */ static int staticProp; - /** * */ @@ -42,12 +38,10 @@ public: }; /************************************************************/ /* External declarations (package visibility) */ - /** * */ int externProp; - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp index c0c966cbd99..f58270b9f4f 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.cpp @@ -19,11 +19,14 @@ namespace Package1 { /** * - * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this + * @param iVal1 + * @param iVal2 + * @param cVal1 + * @param cVal2 + * @return this */ int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1, char /*in*/cVal2) { - } /** @@ -31,7 +34,6 @@ int Class8::operation1(int /*in*/iVal1, int /*in*/iVal2, char /*in*/cVal1, * @param iVal1 */ void Class8::operation1(int /*in*/iVal1) { - } } // of namespace Package1 diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h index 194ce808122..38718cf0b89 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class8.h @@ -19,14 +19,11 @@ namespace Package1 { /** * */ - class Class8 { - public: Class8() : defaultIValue(12) { } - /** * */ @@ -34,7 +31,11 @@ public: /** * - * @param iVal1 @param iVal2 @param cVal1 @param cVal2 @param this + * @param iVal1 + * @param iVal2 + * @param cVal1 + * @param cVal2 + * @return this */ int operation1(int /*in*/iVal1, int /*in*/iVal2 = 2, char /*in*/cVal1, char /*in*/cVal2); @@ -48,7 +49,6 @@ public: }; /************************************************************/ /* External declarations (package visibility) */ - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp index 26d3b037db4..7421ee6daa6 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.cpp @@ -19,26 +19,23 @@ namespace Package1 { /** * - * @param + * @return */ int Class9::volatileIntOperation() { - } /** * Should not generate the 'register' keyword as it cannot be used in method signatures. - * @param + * @return */ int Class9::registerOperation() { - } /** * - * @param + * @return */ int Class9::externOperation() { - } } // of namespace Package1 diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h index 03603e898f5..b1972b6446f 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Class9.h @@ -19,19 +19,15 @@ namespace Package1 { /** * */ - class Class9 { - public: Class9() : externAttribute(3) { } - /** * */ int volatileAttribute; - /** * Should not generate 'register' keyword as 'register' only applies to properties declared within the scope of an operation. */ @@ -39,20 +35,19 @@ public: /** * - * @param + * @return */ int volatileIntOperation(); /** * Should not generate the 'register' keyword as it cannot be used in method signatures. - * @param + * @return */ int registerOperation(); }; /************************************************************/ /* External declarations (package visibility) */ - /** * */ @@ -60,10 +55,9 @@ int externAttribute; /** * - * @param + * @return */ int externOperation(); - /************************************************************/ /* Inline functions */ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h index 6fee268eb47..2e26af6ff93 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Package1/Pkg_Package1.h @@ -1,7 +1,3 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - #ifndef PKG_CPPCODEGENTEST_PACKAGE1 #define PKG_CPPCODEGENTEST_PACKAGE1 @@ -26,7 +22,6 @@ namespace Package1 { // Types defined within the package - }// of namespace Package1 /************************************************************ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h index 62e2045f7ef..bc206abeaee 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Pkg_CppCodegenTest.h @@ -1,7 +1,3 @@ -// -------------------------------------------------------- -// Code generated by Papyrus C++ -// -------------------------------------------------------- - #ifndef PKG_CPPCODEGENTEST #define PKG_CPPCODEGENTEST @@ -24,7 +20,6 @@ namespace CppCodegenTest { // Types defined within the package - }// of namespace CppCodegenTest /************************************************************ diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF index a90e2fe8750..5e514658522 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/META-INF/MANIFEST.MF @@ -2,25 +2,25 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.junit,
- org.eclipse.papyrus.cpp.codegen;bundle-version="1.0.1",
- org.eclipse.papyrus.cpp.codegen.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.core;bundle-version="1.0.1",
+ org.eclipse.papyrus.cpp.codegen;bundle-version="1.1.0",
+ org.eclipse.papyrus.cpp.codegen.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
org.eclipse.ui.ide,
org.eclipse.emf.common.ui,
- org.eclipse.papyrus.editor;bundle-version="1.0.1",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
org.eclipse.emf.edit,
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.infra.services.openelement;bundle-version="1.0.1",
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.1.0",
org.eclipse.cdt.core,
- org.eclipse.papyrus.acceleo;bundle-version="1.0.1",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.framework;bundle-version="1.0.1",
- org.eclipse.papyrus.junit.utils;bundle-version="1.0.1"
+ org.eclipse.papyrus.acceleo;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.1.0"
Export-Package: org.eclipse.papyrus.cpp.codegen.tests
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
Eclipse-BundleShape: dir
Bundle-Name: Papyrus CPP Codegen Tests (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties index 11811fead79..196f960c0e9 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/build.properties @@ -4,6 +4,5 @@ bin.includes = .,\ resources/,\
META-INF/,\
ExpectedModel/,\
- about.html,\
- CppCodegenTest/
+ about.html
src.includes = about.html
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml index 8693fb3e9f6..5dff9a50400 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <relativePath>../../../../../releng/top-pom-extra-tests.xml</relativePath> </parent> <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.cpp.codegen.tests</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java index fdbc25e5389..435eb82ab26 100644 --- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java +++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/src/org/eclipse/papyrus/cpp/codegen/tests/CppCodegenTest.java @@ -43,6 +43,7 @@ import org.junit.BeforeClass; import org.junit.ClassRule;
import org.junit.Test;
+@SuppressWarnings("nls")
public class CppCodegenTest {
static {
|