Bug 480316 - [Codegen C++] Forward declaration

Update expectedModel (code) to match generator changes

10 files changed, 17 insertions, 9 deletions

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 b5d6ecec6d3..f1cf05b6466 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
@@ -12,6 +12,8 @@
 #include "CppCodegenTest/Class2.h"
 
 // Derived includes directives
+#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
+#include "CppCodegenTest/Class1.h"
 
 // Include from Include declaration (body)
 #include <string.h>
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 afb67ab1659..e49f7be5d78 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,12 +12,13 @@
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
 #include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-#include "CppCodegenTest/Class1.h"
 
 // Include from Include stereotype (header)
 #include <iostream>
 // End of Include stereotype (header)
 
+class Class1;
+
 /************************************************************/
 /**
  * 
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 df4c1ee3a6a..673c8259348 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
@@ -12,6 +12,7 @@
 #include "CppCodegenTest/Class3.h"
 
 // Derived includes directives
+#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
 
 // static attributes (if any)
 
@@ -39,4 +40,4 @@ Class3::Class3() {
 
 /************************************************************
  End of Class3 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.cpp
index e27afac327d..aec8e22df91 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class4.cpp
@@ -25,4 +25,4 @@ const char* Class4::charStringStaticConstInit = "Hello World";
 
 /************************************************************
  End of Class4 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
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 da12975d2df..cfac83894b0 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
@@ -12,7 +12,8 @@
 #include "CppCodegenTest/Pkg_CppCodegenTest.h"
 
 #include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
-#include "CppCodegenTest/Class3.h"
+
+class Class3;
 
 /************************************************************/
 /**
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.cpp
index 84c89f0d548..c3e7c75d359 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class5.cpp
@@ -12,9 +12,10 @@
 #include "CppCodegenTest/Class5.h"
 
 // Derived includes directives
+#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
 
 // static attributes (if any)
 
 /************************************************************
  End of Class5 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.cpp
index e25e51cf38f..5ac7a371640 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class6.cpp
@@ -17,4 +17,4 @@
 
 /************************************************************
  End of Class6 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
diff --git a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.cpp b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.cpp
index 19d9e613ad2..9a594fa0231 100644
--- a/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.cpp
+++ b/tests/junit/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.tests/ExpectedModel/Class7.cpp
@@ -21,4 +21,4 @@ int Class7::staticProp;
 
 /************************************************************
  End of Class7 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
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 f58270b9f4f..8076ca17c86 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
@@ -12,6 +12,7 @@
 #include "CppCodegenTest/Package1/Class8.h"
 
 // Derived includes directives
+#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
 
 namespace Package1 {
 
@@ -40,4 +41,4 @@ void Class8::operation1(int /*in*/iVal1) {
 
 /************************************************************
  End of Class8 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/
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 7421ee6daa6..4ac8456311e 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
@@ -12,6 +12,7 @@
 #include "CppCodegenTest/Package1/Class9.h"
 
 // Derived includes directives
+#include "AnsiCLibrary/Pkg_AnsiCLibrary.h"
 
 namespace Package1 {
 
@@ -42,4 +43,4 @@ int Class9::externOperation() {
 
 /************************************************************
  End of Class9 class body
- ************************************************************/
\ No newline at end of file
+ ************************************************************/