From: Asbjorn M. <ste...@us...> - 2002-04-17 20:05:53
|
Update of /cvsroot/epp-rtk/name-rtk-addon/c++/src In directory usw-pr-cvs1:/tmp/cvs-serv16305 Modified Files: main_nameWatchcreate.cc main_nameWatchdelete.cc main_nameWatchinfo.cc main_nameWatchrenew.cc main_nameWatchupdate.cc Log Message: Added -testdata option to provide data to test programs. Index: main_nameWatchcreate.cc =================================================================== RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/main_nameWatchcreate.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main_nameWatchcreate.cc 12 Mar 2002 16:56:16 -0000 1.1 --- main_nameWatchcreate.cc 17 Apr 2002 20:05:46 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- #include "data/epp_NameWatchCreateReq.h" #include "data/epp_NameWatchCreateRsp.h" + #include "data/epp_nameWatchXMLbase.h" #include "epp_NameWatchCreate.h" #include "GNRtestTools.h" *************** *** 81,84 **** --- 82,97 ---- return 1; + map<int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } + testLogIn(test, username, password); *************** *** 86,102 **** epp_NameWatchCreateReq_ref l_req(new epp_NameWatchCreateReq()); l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid("ABC-12345"))); ! ! l_req->m_name.ref(new epp_string("doe")); ! l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, 1)); ! l_req->m_registrant.ref(new epp_string("jd1234")); ! l_req->m_rptTo.ref(new epp_NameWatchRptTo("jd...@ex...", WEEKLY)); ! l_req->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_auth_info->m_value.ref(new epp_string("2fooBAR")); epp_NameWatchCreate_ref l_obj(new epp_NameWatchCreate()); --- 99,142 ---- epp_NameWatchCreateReq_ref l_req(new epp_NameWatchCreateReq()); + + string trID; + if(testDataMap.empty()) trID = "ABC-12345"; + else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid(trID))); ! if(testDataMap.empty()) { ! l_req->m_name.ref(new epp_string("doe")); ! l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, 1)); ! l_req->m_registrant.ref(new epp_string("jd1234")); ! l_req->m_rptTo.ref(new epp_NameWatchRptTo("jd...@ex...", WEEKLY)); ! ! l_req->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_auth_info->m_value.ref(new epp_string("2fooBAR")); ! } ! else { ! if(testDataMap[2] != "-1") l_req->m_name.ref(new epp_string(testDataMap[2])); ! ! if(testDataMap[3] != "-1") l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, ! atol(testDataMap[3].c_str()))); ! ! if(testDataMap[4] != "-1") { ! l_req->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_auth_info->m_value.ref(new epp_string(testDataMap[4])); ! } ! ! if(testDataMap[5] != "-1") l_req->m_registrant.ref(new epp_string(testDataMap[5])); ! ! if(testDataMap[6] != "-1" && testDataMap[7] != "-1") { ! ! l_req->m_rptTo.ref(new epp_NameWatchRptTo(epp_string(testDataMap[7]), ! returnFreqEnumType(testDataMap[6]))); ! } ! ! } epp_NameWatchCreate_ref l_obj(new epp_NameWatchCreate()); Index: main_nameWatchdelete.cc =================================================================== RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/main_nameWatchdelete.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main_nameWatchdelete.cc 12 Mar 2002 16:56:16 -0000 1.1 --- main_nameWatchdelete.cc 17 Apr 2002 20:05:46 -0000 1.2 *************** *** 60,63 **** --- 60,75 ---- if(!handleArgs(test, argc, argv, username, password)) return 1; + + map<int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } testLogIn(test, username, password); *************** *** 66,75 **** epp_NameWatchDeleteReq_ref l_req(new epp_NameWatchDeleteReq()); l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid("ABC-12345"))); ! l_req->m_roid.ref(new epp_string("EXAMPLE1-REP")); epp_NameWatchDelete_ref l_obj(new epp_NameWatchDelete()); --- 78,96 ---- epp_NameWatchDeleteReq_ref l_req(new epp_NameWatchDeleteReq()); + + string trID; + if(testDataMap.empty()) trID = "ABC-12345"; + else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid(trID))); ! if(testDataMap.empty()) { ! l_req->m_roid.ref(new epp_roid("EXAMPLE1-REP")); ! } ! else { ! l_req->m_roid.ref(new epp_roid(testDataMap[2])); ! } epp_NameWatchDelete_ref l_obj(new epp_NameWatchDelete()); Index: main_nameWatchinfo.cc =================================================================== RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/main_nameWatchinfo.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main_nameWatchinfo.cc 12 Mar 2002 16:56:16 -0000 1.1 --- main_nameWatchinfo.cc 17 Apr 2002 20:05:46 -0000 1.2 *************** *** 157,160 **** --- 157,172 ---- if(!handleArgs(test, argc, argv, username, password)) return 1; + + map<int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } testLogIn(test, username, password); *************** *** 164,172 **** epp_NameWatchInfoReq_ref l_req(new epp_NameWatchInfoReq()); l_req->m_cmd.ref(new eppobject::epp::epp_Command(NULL, NULL, ! eppobject::epp::epp_trid("ABC-12345"))); ! l_req->m_roid.ref(new eppobject::epp::epp_roid("EXAMPLE1-REP")); epp_NameWatchInfo_ref l_obj(new epp_NameWatchInfo()); --- 176,193 ---- epp_NameWatchInfoReq_ref l_req(new epp_NameWatchInfoReq()); + string trID; + if(testDataMap.empty()) trID = "ABC-12345"; + else trID = testDataMap[1]; + l_req->m_cmd.ref(new eppobject::epp::epp_Command(NULL, NULL, ! eppobject::epp::epp_trid(trID))); ! if(testDataMap.empty()) { ! l_req->m_roid.ref(new eppobject::epp::epp_roid("EXAMPLE1-REP")); ! } ! else { ! l_req->m_roid.ref(new eppobject::epp::epp_roid(testDataMap[2])); ! } epp_NameWatchInfo_ref l_obj(new epp_NameWatchInfo()); Index: main_nameWatchrenew.cc =================================================================== RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/main_nameWatchrenew.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main_nameWatchrenew.cc 12 Mar 2002 16:56:16 -0000 1.1 --- main_nameWatchrenew.cc 17 Apr 2002 20:05:46 -0000 1.2 *************** *** 73,76 **** --- 73,88 ---- if(!handleArgs(test, argc, argv, username, password)) return 1; + + map<int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } testLogIn(test, username, password); *************** *** 79,90 **** epp_NameWatchRenewReq_ref l_req(new epp_NameWatchRenewReq()); l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid("ABC-12345"))); ! l_req->m_roid.ref(new epp_string("EXAMPLE1-REP")); ! l_req->m_current_expiration_date.ref(new epp_date("2000-04-03")); ! l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, 1)); epp_NameWatchRenew_ref l_obj(new epp_NameWatchRenew()); --- 91,116 ---- epp_NameWatchRenewReq_ref l_req(new epp_NameWatchRenewReq()); + + string trID; + if(testDataMap.empty()) trID = "ABC-12345"; + else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid(trID))); ! if(testDataMap.empty()) { ! l_req->m_roid.ref(new epp_string("EXAMPLE1-REP")); ! l_req->m_current_expiration_date.ref(new epp_date("2000-04-03")); ! l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, 1)); ! } ! else { ! if(testDataMap[2] != "-1") l_req->m_roid.ref(new epp_roid(testDataMap[2])); ! ! if(testDataMap[3] != "-1") l_req->m_period.ref(new epp_NameWatchPeriod(YEAR, atol(testDataMap[3].c_str()))); ! ! if(testDataMap[4] != "-1") l_req->m_current_expiration_date.ref(new epp_date(testDataMap[4])); ! } ! epp_NameWatchRenew_ref l_obj(new epp_NameWatchRenew()); Index: main_nameWatchupdate.cc =================================================================== RCS file: /cvsroot/epp-rtk/name-rtk-addon/c++/src/main_nameWatchupdate.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** main_nameWatchupdate.cc 12 Mar 2002 16:56:16 -0000 1.1 --- main_nameWatchupdate.cc 17 Apr 2002 20:05:46 -0000 1.2 *************** *** 36,39 **** --- 36,40 ---- #include "data/epp_NameWatchUpdateReq.h" #include "data/epp_NameWatchUpdateRsp.h" + #include "data/epp_nameWatchXMLbase.h" #include "epp_NameWatchUpdate.h" *************** *** 62,65 **** --- 63,78 ---- return 1; + map<int,string> testDataMap; + + if(argc > 1) { + for(int parm = 1; parm < argc; parm++) { + + if (!strncmp(argv[parm], "-testdata=", 10)) { + string td = &argv[parm][10]; + testDataMap = getTestDataMap(td); + } + } + } + testLogIn(test, username, password); *************** *** 67,98 **** epp_NameWatchUpdateReq_ref l_req(new epp_NameWatchUpdateReq()); l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid("ABC-12345"))); ! ! l_req->m_roid.ref(new epp_roid("EXAMPLE1-REP")); ! ! l_req->m_add.ref(new epp_NameWatchUpdateAddRemove()); ! l_req->m_add->m_status.ref(new epp_nameWatch_status_seq()); ! epp_NameWatchStatus stat; ! stat.m_type.ref(new epp_NameWatchStatusType(CLIENT_HOLD)); ! stat.m_lang.ref(new epp_string("en")); ! stat.m_value.ref(new epp_string("Payment overdue.")); ! l_req->m_add->m_status->push_back(stat); ! ! l_req->m_remove.ref(new epp_NameWatchUpdateAddRemove()); ! l_req->m_remove->m_status.ref(new epp_nameWatch_status_seq()); ! epp_NameWatchStatus stat2; ! stat2.m_type.ref(new epp_NameWatchStatusType(CLIENT_UPDATE_PROHIBITED)); ! l_req->m_remove->m_status->push_back(stat2); ! ! l_req->m_change.ref(new epp_NameWatchUpdateChange()); ! l_req->m_change->m_registrant.ref(new epp_string("sh8013")); ! l_req->m_change->m_rptTo.ref(new epp_NameWatchRptTo("jd...@ex...", DAILY)); ! l_req->m_change->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_change->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_change->m_auth_info->m_value.ref(new epp_string("2BARfoo")); epp_NameWatchUpdate_ref l_obj(new epp_NameWatchUpdate()); --- 80,186 ---- epp_NameWatchUpdateReq_ref l_req(new epp_NameWatchUpdateReq()); + + string trID; + if(testDataMap.empty()) trID = "ABC-12345"; + else trID = testDataMap[1]; l_req->m_cmd.ref(new epp_Command(NULL, NULL, ! epp_trid(trID))); ! if(testDataMap.empty()) { ! l_req->m_roid.ref(new epp_roid("EXAMPLE1-REP")); ! ! l_req->m_add.ref(new epp_NameWatchUpdateAddRemove()); ! l_req->m_add->m_status.ref(new epp_nameWatch_status_seq()); ! epp_NameWatchStatus stat; ! stat.m_type.ref(new epp_NameWatchStatusType(CLIENT_HOLD)); ! stat.m_lang.ref(new epp_string("en")); ! stat.m_value.ref(new epp_string("Payment overdue.")); ! l_req->m_add->m_status->push_back(stat); ! ! l_req->m_remove.ref(new epp_NameWatchUpdateAddRemove()); ! l_req->m_remove->m_status.ref(new epp_nameWatch_status_seq()); ! epp_NameWatchStatus stat2; ! stat2.m_type.ref(new epp_NameWatchStatusType(CLIENT_UPDATE_PROHIBITED)); ! l_req->m_remove->m_status->push_back(stat2); ! ! l_req->m_change.ref(new epp_NameWatchUpdateChange()); ! l_req->m_change->m_registrant.ref(new epp_string("sh8013")); ! l_req->m_change->m_rptTo.ref(new epp_NameWatchRptTo("jd...@ex...", DAILY)); ! l_req->m_change->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_change->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_change->m_auth_info->m_value.ref(new epp_string("2BARfoo")); ! } ! else { ! if(testDataMap[2] != "-1") l_req->m_roid.ref(new epp_roid(testDataMap[2])); ! ! if(testDataMap[3] == "chg") { ! ! l_req->m_change.ref(new epp_NameWatchUpdateChange()); ! ! if(testDataMap[4] != "-1") { ! l_req->m_change->m_auth_info.ref(new epp_AuthInfo()); ! l_req->m_change->m_auth_info->m_type.ref(new epp_AuthInfoType(PW)); ! l_req->m_change->m_auth_info->m_value.ref(new epp_string(testDataMap[4])); ! } ! ! if(testDataMap[5] != "-1") l_req->m_change->m_registrant.ref(new epp_string(testDataMap[5])); ! ! if(testDataMap[6] != "-1" && testDataMap[7] != "-1") { ! l_req->m_change->m_rptTo.ref(new epp_NameWatchRptTo(epp_string(testDataMap[7]), ! returnFreqEnumType(testDataMap[6]))); ! } ! } ! ! if(testDataMap[8] == "add") { ! l_req->m_add.ref(new epp_NameWatchUpdateAddRemove()); ! ! if(testDataMap[9] != "-1") { ! string statuses = testDataMap[9]; ! l_req->m_add->m_status.ref(new epp_nameWatch_status_seq()); ! ! int begin = 0; ! int end = 0; ! ! while(end != string::npos) { ! end = statuses.find(' ', begin); ! string tmp = statuses.substr(begin,end-begin); ! ! epp_NameWatchStatus status; ! status.m_type.ref(new epp_NameWatchStatusType(returnStatusEnumType(tmp))); ! l_req->m_add->m_status->push_back(status); ! ! begin = end+1; ! } ! } ! ! } ! ! if(testDataMap[10] == "rem") { ! l_req->m_remove.ref(new epp_NameWatchUpdateAddRemove()); ! ! if(testDataMap[11] != "-1") { ! string statuses = testDataMap[11]; ! l_req->m_remove->m_status.ref(new epp_nameWatch_status_seq()); ! ! int begin = 0; ! int end = 0; ! ! while(end != string::npos) { ! end = statuses.find(' ', begin); ! string tmp = statuses.substr(begin,end-begin); ! ! epp_NameWatchStatus status; ! status.m_type.ref(new epp_NameWatchStatusType(returnStatusEnumType(tmp))); ! l_req->m_remove->m_status->push_back(status); ! ! begin = end+1; ! } ! } ! ! } ! ! } epp_NameWatchUpdate_ref l_obj(new epp_NameWatchUpdate()); |