[ccmtools-cvs] ccmtools/test/CppGenerator/assembly_nested/impl SuperTest_basicType_impl.cc, 1.11, 1.12 SuperTest_userType_impl.cc, 1.11, 1.12 SuperTestMirror_impl.cc, 1.10, 1.11

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25389/test/CppGenerator/assembly_nested/impl

Modified Files:
	SuperTest_basicType_impl.cc SuperTest_userType_impl.cc 
	SuperTestMirror_impl.cc 
Log Message:
bug fix: wrong use of local impl. interfaces

Index: SuperTestMirror_impl.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTestMirror_impl.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SuperTestMirror_impl.cc	5 Jan 2007 14:17:26 -0000	1.10
--- SuperTestMirror_impl.cc	9 Mar 2007 09:03:28 -0000	1.11
***************
*** 1,13 ****
  
  /***
!  * This file was automatically generated by 
   * <http://ccmtools.sourceforge.net/>
   *
   * SuperTest_mirror component business logic implementation.
!  * 
!  * // TODO: WRITE YOUR DESCRIPTION HERE! 
   *
   * @author
!  * @version 
   ***/
  
--- 1,13 ----
  
  /***
!  * This file was automatically generated by
   * <http://ccmtools.sourceforge.net/>
   *
   * SuperTest_mirror component business logic implementation.
!  *
!  * // TODO: WRITE YOUR DESCRIPTION HERE!
   *
   * @author
!  * @version
   ***/
  
***************
*** 47,51 ****
      {
        // basic types test cases
!       CCM_BasicTypeInterface::SmartPtr basicType = 
            ctx->get_connection_basicType();
  
--- 47,51 ----
      {
        // basic types test cases
!       BasicTypeInterface::SmartPtr basicType =
            ctx->get_connection_basicType();
  
***************
*** 74,78 ****
  	assert(ushort_3 == 3);
  	assert(ushort_r == 3+7);
! 	cout << "BasicTypeInterface::f3() passed" << endl;      
        }
  
--- 74,78 ----
  	assert(ushort_3 == 3);
  	assert(ushort_r == 3+7);
! 	cout << "BasicTypeInterface::f3() passed" << endl;
        }
  
***************
*** 104,108 ****
        }
  
!       {	
  	char char_2=3, char_3, char_r;
  	char_r = basicType->f7(7,char_2, char_3);
--- 104,108 ----
        }
  
!       {
  	char char_2=3, char_3, char_r;
  	char_r = basicType->f7(7,char_2, char_3);
***************
*** 122,126 ****
        }
  
!       {	
  	bool bool_2=false, bool_3, bool_r;
  	bool_r = basicType->f9(true, bool_2, bool_3);
--- 122,126 ----
        }
  
!       {
  	bool bool_2=false, bool_3, bool_r;
  	bool_r = basicType->f9(true, bool_2, bool_3);
***************
*** 144,151 ****
      {
        // user types test cases
!       CCM_UserTypeInterface::SmartPtr userType = 
            ctx->get_connection_userType();
        {
! 	// Test case: enum Color {red, green, blue, black, orange}; 
  	Color Color_2,Color_3, Color_r;
  	Color_2 = Color(blue);
--- 144,151 ----
      {
        // user types test cases
!       UserTypeInterface::SmartPtr userType =
            ctx->get_connection_userType();
        {
! 	// Test case: enum Color {red, green, blue, black, orange};
  	Color Color_2,Color_3, Color_r;
  	Color_2 = Color(blue);
***************
*** 160,172 ****
  	// test case: struct Person { long id; string name; };
  	Person p1, p2, p3, result;
! 	p1.name = "Egon"; 
  	p1.id = 3;
! 	p2.name = "Andrea"; 
  	p2.id = 23;
  	result = userType->f2(p1,p2,p3);
  	assert(p3.name == "Andrea");
! 	assert(p3.id == 23); 
  	assert(p2.name == "Egon");
! 	assert(p2.id == 3); 
  	assert(result.name  == "EgonAndrea");
  	assert(result.id == 26);
--- 160,172 ----
  	// test case: struct Person { long id; string name; };
  	Person p1, p2, p3, result;
! 	p1.name = "Egon";
  	p1.id = 3;
! 	p2.name = "Andrea";
  	p2.id = 23;
  	result = userType->f2(p1,p2,p3);
  	assert(p3.name == "Andrea");
! 	assert(p3.id == 23);
  	assert(p2.name == "Egon");
! 	assert(p2.id == 3);
  	assert(result.name  == "EgonAndrea");
  	assert(result.id == 26);
***************
*** 178,206 ****
  	Address p1, p2, p3, result;
  	Person person;
! 	
! 	p1.street = "Waltendorf";   
  	p1.number = 7;
! 	person.name = "Egon";   
  	person.id   = 3;
  	p1.resident = person;
! 	
! 	p2.street   = "Petersgasse"; 
  	p2.number   =17;
! 	person.name = "Andrea";   
  	person.id   = 23;
  	p2.resident = person;
! 	
  	result = userType->f3(p1,p2,p3);
! 	
  	assert(p3.street == "Petersgasse");
  	assert(p3.number == 17);
  	assert(p3.resident.name == "Andrea");
  	assert(p3.resident.id == 23);
! 	
  	assert(p2.street == "Waltendorf");
  	assert(p2.number == 7);
  	assert(p2.resident.name == "Egon");
  	assert(p2.resident.id == 3);
! 	
  	assert(result.street == "WaltendorfPetersgasse");
  	assert(result.number == 24);
--- 178,206 ----
  	Address p1, p2, p3, result;
  	Person person;
! 
! 	p1.street = "Waltendorf";
  	p1.number = 7;
! 	person.name = "Egon";
  	person.id   = 3;
  	p1.resident = person;
! 
! 	p2.street   = "Petersgasse";
  	p2.number   =17;
! 	person.name = "Andrea";
  	person.id   = 23;
  	p2.resident = person;
! 
  	result = userType->f3(p1,p2,p3);
! 
  	assert(p3.street == "Petersgasse");
  	assert(p3.number == 17);
  	assert(p3.resident.name == "Andrea");
  	assert(p3.resident.id == 23);
! 
  	assert(p2.street == "Waltendorf");
  	assert(p2.number == 7);
  	assert(p2.resident.name == "Egon");
  	assert(p2.resident.id == 3);
! 
  	assert(result.street == "WaltendorfPetersgasse");
  	assert(result.number == 24);
***************
*** 218,224 ****
  	  p2.push_back(i+i);
  	}
! 	
  	result = userType->f4(p1, p2, p3);
! 	
  	assert(result.size() == size);
  	for(unsigned int i=0;i<result.size();i++) {
--- 218,224 ----
  	  p2.push_back(i+i);
  	}
! 
  	result = userType->f4(p1, p2, p3);
! 
  	assert(result.size() == size);
  	for(unsigned int i=0;i<result.size();i++) {
***************
*** 226,230 ****
  	  assert(p == (long)i);
  	}
! 	
  	assert(p2.size() == size);
  	for(unsigned int i=0;i<p2.size();i++) {
--- 226,230 ----
  	  assert(p == (long)i);
  	}
! 
  	assert(p2.size() == size);
  	for(unsigned int i=0;i<p2.size();i++) {
***************
*** 232,236 ****
  	  assert(p == (long)i);
  	}
! 	
  	assert(p3.size() == size);
  	for(unsigned int i=0;i<p3.size();i++) {
--- 232,236 ----
  	  assert(p == (long)i);
  	}
! 
  	assert(p3.size() == size);
  	for(unsigned int i=0;i<p3.size();i++) {
***************
*** 240,244 ****
  	cout << "UserTypeInterface::f4() passed" << endl;
        }
!       
        {
  	// Test case: typedef sequence<string> StringList;
--- 240,244 ----
  	cout << "UserTypeInterface::f4() passed" << endl;
        }
! 
        {
  	// Test case: typedef sequence<string> StringList;
***************
*** 249,255 ****
  	  p2.push_back("two");
  	}
! 	
  	result = userType->f5(p1, p2, p3);
! 	
  	assert(result.size() == size);
  	for(unsigned int i=0;i<result.size();i++) {
--- 249,255 ----
  	  p2.push_back("two");
  	}
! 
  	result = userType->f5(p1, p2, p3);
! 
  	assert(result.size() == size);
  	for(unsigned int i=0;i<result.size();i++) {
***************
*** 257,261 ****
  	  assert(p == "Test");
  	}
! 	
  	assert(p2.size() == size);
  	for(unsigned int i=0;i<p2.size();i++) {
--- 257,261 ----
  	  assert(p == "Test");
  	}
! 
  	assert(p2.size() == size);
  	for(unsigned int i=0;i<p2.size();i++) {
***************
*** 263,267 ****
  	  assert(p == "one");
  	}
! 	
  	assert(p3.size() == size);
  	for(unsigned int i=0;i<p3.size();i++) {
--- 263,267 ----
  	  assert(p == "one");
  	}
! 
  	assert(p3.size() == size);
  	for(unsigned int i=0;i<p3.size();i++) {
***************
*** 308,312 ****
  	cout << "UserTypeInterface::f6() passed" << endl;
        }
!       
        {
  	// test case: typedef long time_t;
--- 308,312 ----
  	cout << "UserTypeInterface::f6() passed" << endl;
        }
! 
        {
  	// test case: typedef long time_t;

Index: SuperTest_userType_impl.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTest_userType_impl.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SuperTest_userType_impl.cc	5 Jan 2007 14:17:26 -0000	1.11
--- SuperTest_userType_impl.cc	9 Mar 2007 09:03:28 -0000	1.12
***************
*** 1,14 ****
  
  /**
!  * This file was automatically generated by 
   * <http://ccmtools.sourceforge.net/>
   * DO NOT EDIT !
   *
!  * CCM_UserTypeInterface facet class implementation. 
   *
!  * // TODO: WRITE YOUR DESCRIPTION HERE! 
   *
   * @author
!  * @version 
   **/
  
--- 1,14 ----
  
  /**
!  * This file was automatically generated by
   * <http://ccmtools.sourceforge.net/>
   * DO NOT EDIT !
   *
!  * CCM_UserTypeInterface facet class implementation.
   *
!  * // TODO: WRITE YOUR DESCRIPTION HERE!
   *
   * @author
!  * @version
   **/
  
***************
*** 35,39 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f1(p1,p2,p3);
--- 35,39 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f1(p1,p2,p3);
***************
*** 44,48 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f2(p1,p2,p3);
--- 44,48 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f2(p1,p2,p3);
***************
*** 53,57 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f3(p1,p2,p3);
--- 53,57 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f3(p1,p2,p3);
***************
*** 62,66 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f4(p1,p2,p3);
--- 62,66 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f4(p1,p2,p3);
***************
*** 71,75 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f5(p1,p2,p3);
--- 71,75 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f5(p1,p2,p3);
***************
*** 80,84 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f6(p1,p2,p3);
--- 80,84 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f6(p1,p2,p3);
***************
*** 89,93 ****
      throw (Components::CCMException)
  {
!     CCM_UserTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerUserType();
      return inner->f7(t1,t2,t3);
--- 89,93 ----
      throw (Components::CCMException)
  {
!     UserTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerUserType();
      return inner->f7(t1,t2,t3);

Index: SuperTest_basicType_impl.cc
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/assembly_nested/impl/SuperTest_basicType_impl.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SuperTest_basicType_impl.cc	5 Jan 2007 14:17:26 -0000	1.11
--- SuperTest_basicType_impl.cc	9 Mar 2007 09:03:27 -0000	1.12
***************
*** 1,14 ****
  
  /**
!  * This file was automatically generated by 
   * <http://ccmtools.sourceforge.net/>
   * DO NOT EDIT !
   *
!  * CCM_BasicTypeInterface facet class implementation. 
   *
!  * // TODO: WRITE YOUR DESCRIPTION HERE! 
   *
   * @author
!  * @version 
   **/
  
--- 1,14 ----
  
  /**
!  * This file was automatically generated by
   * <http://ccmtools.sourceforge.net/>
   * DO NOT EDIT !
   *
!  * CCM_BasicTypeInterface facet class implementation.
   *
!  * // TODO: WRITE YOUR DESCRIPTION HERE!
   *
   * @author
!  * @version
   **/
  
***************
*** 36,40 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f1(p1,p2,p3);
--- 36,40 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f1(p1,p2,p3);
***************
*** 45,49 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f2(p1,p2,p3);
--- 45,49 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f2(p1,p2,p3);
***************
*** 54,58 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f3(p1,p2,p3);
--- 54,58 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f3(p1,p2,p3);
***************
*** 63,67 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f4(p1,p2,p3);
--- 63,67 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f4(p1,p2,p3);
***************
*** 72,76 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f5(p1,p2,p3);
--- 72,76 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f5(p1,p2,p3);
***************
*** 81,85 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f6(p1,p2,p3);
--- 81,85 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f6(p1,p2,p3);
***************
*** 90,94 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f7(p1,p2,p3);
--- 90,94 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f7(p1,p2,p3);
***************
*** 99,103 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f8(p1,p2,p3);
--- 99,103 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f8(p1,p2,p3);
***************
*** 108,112 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f9(p1,p2,p3);
--- 108,112 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f9(p1,p2,p3);
***************
*** 117,121 ****
      throw (Components::CCMException)
  {
!     CCM_BasicTypeInterface::SmartPtr inner = 
          component->ctx->get_connection_innerBasicType();
      return inner->f10(p1,p2,p3);
--- 117,121 ----
      throw (Components::CCMException)
  {
!     BasicTypeInterface::SmartPtr inner =
          component->ctx->get_connection_innerBasicType();
      return inner->f10(p1,p2,p3);