[Rtk-cvs] rtk/test/core CMakeLists.txt,1.2,1.3 dict0.cpp,1.5,1.6 string0.cpp,1.8,1.9

[<sp...@us...>]

Update of /cvsroot/rtk/rtk/test/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11319/test/core

Modified Files:
	CMakeLists.txt dict0.cpp string0.cpp 
Log Message:
CMakeList rewritten to be more elegant
dict0.cpp fixed so it works in ASCII mode also
Some minor changes in string0.cpp also


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/rtk/rtk/test/core/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CMakeLists.txt	21 Feb 2004 23:49:03 -0000	1.2
--- CMakeLists.txt	23 Feb 2004 18:13:36 -0000	1.3
***************
*** 40,58 ****
  LINK_DIRECTORIES(${RTK_SOURCE_DIR}/lib ${RTK_SOURCE_DIR}/src/core/lib ${RTK_SOURCE_DIR}/src/core)
  
! # Debug test
! ADD_EXECUTABLE(test_core_debug0 debug0.cpp)
! TARGET_LINK_LIBRARIES(test_core_debug0 ${RTK_LIBRTK})
! 
! # SList test
! ADD_EXECUTABLE(test_core_list0 list0.cpp)
! TARGET_LINK_LIBRARIES(test_core_list0 ${RTK_LIBRTK})
! 
! # String test
! ADD_EXECUTABLE(test_core_string0 string0.cpp)
! TARGET_LINK_LIBRARIES(test_core_string0 ${RTK_LIBRTK})
! 
! # Variant test
! ADD_EXECUTABLE(test_core_variant0 variant0.cpp)
! TARGET_LINK_LIBRARIES(test_core_variant0 ${RTK_LIBRTK})
  
  ##
--- 40,47 ----
  LINK_DIRECTORIES(${RTK_SOURCE_DIR}/lib ${RTK_SOURCE_DIR}/src/core/lib ${RTK_SOURCE_DIR}/src/core)
  
! FOREACH(NAME debug0 list0 variant0 array0 dict0 error0)
!     ADD_EXECUTABLE(test_core_${NAME} ${NAME}.cpp)
!     TARGET_LINK_LIBRARIES(test_core_${NAME} ${RTK_LIBRTK})
! ENDFOREACH(NAME)
  
  ##

Index: dict0.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/test/core/dict0.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dict0.cpp	21 Feb 2004 15:11:34 -0000	1.5
--- dict0.cpp	23 Feb 2004 18:13:36 -0000	1.6
***************
*** 47,51 ****
  void DictPrint(const RCHAR* oString, void* oData,void *userData)
  {
! 	rprintf(L"Dict[\"%s\"]=%s\n", oString, (RCHAR *)oData);
  }
  
--- 47,51 ----
  void DictPrint(const RCHAR* oString, void* oData,void *userData)
  {
! 	rprintf(_R("Dict[\"%s\"]=%s\n"), oString, (RCHAR *)oData);
  }
  
***************
*** 93,106 ****
  
  	if (!oDict.Replace(oTmp, (void*)oString.c_str()))
!     	rprintf(L"Error!\n");
  
! 	if (!oDict.Replace(L"Two", (void*)oTmp.c_str()))
!     	rprintf(L"Error!\n");
  
! 	rprintf(_R("Loopup(\"One\") = %s\n"), (RCHAR*)oDict.Lookup(L"One"));
  
! 	rprintf(_R("oDict[\"Two\"] = %s\n"), (RCHAR*)oDict[L"Two"]);
  
!     rprintf(L"\nNumber of DictNodes: %d\n", oDict.GetCount());
  
  	oDict.Enumerate(DictPrint);
--- 93,106 ----
  
  	if (!oDict.Replace(oTmp, (void*)oString.c_str()))
!     	rprintf(_R("Error!\n"));
  
! 	if (!oDict.Replace(_R("Two"), (void*)oTmp.c_str()))
!     	rprintf(_R("Error!\n"));
  
! 	rprintf(_R("Loopup(\"One\") = %s\n"), (RCHAR*)oDict.Lookup(_R("One")));
  
! 	rprintf(_R("oDict[\"Two\"] = %s\n"), (RCHAR*)oDict[_R("Two")]);
  
!     rprintf(_R("\nNumber of DictNodes: %d\n"), oDict.GetCount());
  
  	oDict.Enumerate(DictPrint);

Index: string0.cpp
===================================================================
RCS file: /cvsroot/rtk/rtk/test/core/string0.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** string0.cpp	22 Feb 2004 11:50:15 -0000	1.8
--- string0.cpp	23 Feb 2004 18:13:36 -0000	1.9
***************
*** 124,128 ****
  	rfgets(0,0,0);
  	rgets(0);
! 	rgettchar();
  	rungetc(0,0);
  
--- 124,128 ----
  	rfgets(0,0,0);
  	rgets(0);
! 	rgetchar();
  	rungetc(0,0);