[Mocklib-checkins] /cppmocklib/src/mock CalledMethod.cpp, 1.1, 1.2 MockSuperclass.cpp, 1.1, 1.2 Behavior.h, 1.1, NONE MockSuperclass.h, 1.1, NONE MockObject.h, 1.1, NONE CalledMethod.h, 1.1, NONE basic.h, 1.1, NONE

[jiangh <cac...@us...>]

Update of /cvsroot/mocklib//cppmocklib/src/mock
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2676/src/mock

Modified Files:
	CalledMethod.cpp MockSuperclass.cpp 
Removed Files:
	Behavior.h MockSuperclass.h MockObject.h CalledMethod.h 
	basic.h 
Log Message:
using loki to resolve the valist problem

--- basic.h DELETED ---

Index: MockSuperclass.cpp
===================================================================
RCS file: /cvsroot/mocklib//cppmocklib/src/mock/MockSuperclass.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MockSuperclass.cpp	27 Dec 2007 08:25:01 -0000	1.1
--- MockSuperclass.cpp	3 Feb 2008 03:03:34 -0000	1.2
***************
*** 1,8 ****
  using namespace std;
! #include"MockSuperclass.h"
  
- string MockObject::NONE="No method should have been called";
  
  string MockObject::ANY="Any method";
  void MockSuperclass::removeIgnore(string method){
  	
--- 1,10 ----
  using namespace std;
! #include "../../include/cppmocklib/MockSuperclass.h"
  
  
+ string MockObject::NONE="No method should have been called";
  string MockObject::ANY="Any method";
+ 
+ 
  void MockSuperclass::removeIgnore(string method){
  	
***************
*** 12,28 ****
  CalledMethod & MockSuperclass::expect(string method){
  	return (calledMethods.at(0));
! };
  
- MockSuperclass::vector_CalledMethod * MockSuperclass::expect(string method[]){
- 	return &calledMethods;
- };
  
! void MockSuperclass::methodCalled(string methodName, ...){
! 	va_list argus;
  	CalledMethod *pCalledMethod =  new CalledMethod();	
  	pCalledMethod->setMethod(methodName);
! 	va_start(argus, methodName);
  	
! };
   
  
--- 14,32 ----
  CalledMethod & MockSuperclass::expect(string method){
  	return (calledMethods.at(0));
! }; 
  
  
! vector<CalledMethod> *MockSuperclass::expect(string methods[]){
! 	return &calledMethods;
! }
!  
!  
! void MockSuperclass::methodCalled(string methodName, Loki::BasicTypeList *params){
! 	
  	CalledMethod *pCalledMethod =  new CalledMethod();	
  	pCalledMethod->setMethod(methodName);
! 	pCalledMethod->setParams(params);
  	
! }; 
   
  

Index: CalledMethod.cpp
===================================================================
RCS file: /cvsroot/mocklib//cppmocklib/src/mock/CalledMethod.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CalledMethod.cpp	27 Dec 2007 08:25:00 -0000	1.1
--- CalledMethod.cpp	3 Feb 2008 03:03:33 -0000	1.2
***************
*** 1,3 ****
! #include "CalledMethod.h"
! 
  
--- 1,3 ----
! //#include "CalledMethod.h"
! #include "../../include/cppmocklib/CalledMethod.h"
  

--- CalledMethod.h DELETED ---

--- MockSuperclass.h DELETED ---

--- MockObject.h DELETED ---

--- Behavior.h DELETED ---