Git commit 884933c0df0b078db9d9dd40b2109cd5a9ad4a14 by Stephane Mankowski. Committed on 31/05/2013 at 22:30. Pushed by smankowski into branch 'master'. More test M +314 -309 plugins/import/skrooge_import_skg/skgimportpluginskg.cpp M +2 -2 skgbankmodeler/skgunitobject.cpp M +2 -1 skgbankmodeler/skgunitobject.h M +2 -0 tests/skgbankmodelertest/skgtestbankandaccount.cpp M +13 -0 tests/skgbankmodelertest/skgtestbudget.cpp M +9 -0 tests/skgbankmodelertest/skgtestimportafb120.cpp M +4 -0 tests/skgbankmodelertest/skgtestimportcsv.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportgnucash.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportgsb.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportkmy.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportmmb.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportmt940.cpp M +3 -0 tests/skgbankmodelertest/skgtestimportofx.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportqif.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportskg.cpp M +2 -0 tests/skgbankmodelertest/skgtestimportxhb.cpp M +8 -0 tests/skgbankmodelertest/skgtestunit.cpp http://commits.kde.org/skrooge/884933c0df0b078db9d9dd40b2109cd5a9ad4a14 diff --git a/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp b/plu= gins/import/skrooge_import_skg/skgimportpluginskg.cpp index 7e4a8de..755e877 100644 --- a/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp +++ b/plugins/import/skrooge_import_skg/skgimportpluginskg.cpp @@ -67,381 +67,386 @@ SKGError SKGImportPluginSkg::importFile() if (!m_importer) return SKGError(ERR_ABORT, i18nc("Error message", "In= valid parameters")); SKGError err; SKGTRACEINRC(2, "SKGImportPluginSkg::importFile", err); - - SKGDocumentBank docOrigin; - err =3D docOrigin.load(m_importer->getLocalFileName(), m_parameters["p= assword"]); - if (!err) { - QMap mapOriginNew; - err =3D m_importer->getDocument()->beginTransaction("#INTERNAL#" %= i18nc("Import step", "Import %1 file", "SKG"), 10); - - //Step 1 - units + QString lfile =3D m_importer->getLocalFileName(); + if (lfile.isEmpty()) { + err.setReturnCode(ERR_INVALIDARG); + err.setMessage(i18nc("Error message", "Open file '%1' failed", m_= importer->getFileName().prettyUrl())); + } else { + SKGDocumentBank docOrigin; + err =3D docOrigin.load(lfile, m_parameters["password"]); if (!err) { - SKGObjectBase::SKGListSKGObjectBase listUnits; - err =3D docOrigin.getObjects("v_unit", "1=3D1 order by t_type"= , listUnits); + QMap mapOriginNew; + err =3D m_importer->getDocument()->beginTransaction("#INTERNAL= #" % i18nc("Import step", "Import %1 file", "SKG"), 10); + + //Step 1 - units if (!err) { - int nb =3D listUnits.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import units"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGUnitObject unitOrigin(listUnits.at(i)); - SKGUnitObject unit(unitOrigin.cloneInto(m_importer->ge= tDocument())); - if (unit.load().isFailed()) { - //This unit does not exist yet - if (!err) { - SKGUnitObject::UnitType unitType =3D unitOrigi= n.getType(); - if (unitType =3D=3D SKGUnitObject::PRIMARY || = unitType =3D=3D SKGUnitObject::SECONDARY) unitType =3D SKGUnitObject::CURRE= NCY; - err =3D unit.setType(unitType); + SKGObjectBase::SKGListSKGObjectBase listUnits; + err =3D docOrigin.getObjects("v_unit", "1=3D1 order by t_t= ype", listUnits); + if (!err) { + int nb =3D listUnits.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import units"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGUnitObject unitOrigin(listUnits.at(i)); + SKGUnitObject unit(unitOrigin.cloneInto(m_importer= ->getDocument())); + if (unit.load().isFailed()) { + //This unit does not exist yet + if (!err) { + SKGUnitObject::UnitType unitType =3D unitO= rigin.getType(); + if (unitType =3D=3D SKGUnitObject::PRIMARY= || unitType =3D=3D SKGUnitObject::SECONDARY) unitType =3D SKGUnitObject::C= URRENCY; + err =3D unit.setType(unitType); + } + if (!err) { + SKGUnitObject parentUnitOrigin; + unitOrigin.getUnit(parentUnitOrigin); + + SKGUnitObject parentUnit(mapOriginNew[pare= ntUnitOrigin.getUniqueID()]); + if (parentUnit !=3D unit) err =3D unit.set= Unit(parentUnit); + } + if (!err) err =3D unit.save(false); //Save = only } - if (!err) { - SKGUnitObject parentUnitOrigin; - unitOrigin.getUnit(parentUnitOrigin); + mapOriginNew[unitOrigin.getUniqueID()] =3D unit; = - SKGUnitObject parentUnit(mapOriginNew[parentUn= itOrigin.getUniqueID()]); - if (parentUnit !=3D unit) err =3D unit.setUnit= (parentUnit); + //Duplicate properties + if (!err) err =3D copyParameters(unitOrigin, unit); + + //Unit values + SKGObjectBase::SKGListSKGObjectBase listUnitsValue= s; + if (!err) err =3D unitOrigin.getUnitValues(listUni= tsValues); + int nb2 =3D listUnitsValues.count(); + for (int j =3D 0; !err && j < nb2; ++j) { + SKGUnitValueObject unitValueOrigin(listUnitsVa= lues.at(j)); + + SKGUnitValueObject unitval; + err =3D unit.addUnitValue(unitval); + if (!err) err =3D unitval.setDate(unitValueOri= gin.getDate()); + if (!err) err =3D unitval.setQuantity(unitValu= eOrigin.getQuantity()); + if (!err) err =3D unitval.save(true); //Sav= e or update + + //Duplicate properties + if (!err) err =3D copyParameters(unitValueOrig= in, unitval); } - if (!err) err =3D unit.save(false); //Save only + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); } - mapOriginNew[unitOrigin.getUniqueID()] =3D unit; - - //Duplicate properties - if (!err) err =3D copyParameters(unitOrigin, unit); - - //Unit values - SKGObjectBase::SKGListSKGObjectBase listUnitsValues; - if (!err) err =3D unitOrigin.getUnitValues(listUnitsVa= lues); - int nb2 =3D listUnitsValues.count(); - for (int j =3D 0; !err && j < nb2; ++j) { - SKGUnitValueObject unitValueOrigin(listUnitsValues= .at(j)); - - SKGUnitValueObject unitval; - err =3D unit.addUnitValue(unitval); - if (!err) err =3D unitval.setDate(unitValueOrigin.= getDate()); - if (!err) err =3D unitval.setQuantity(unitValueOri= gin.getQuantity()); - if (!err) err =3D unitval.save(true); //Save or= update = - //Duplicate properties - if (!err) err =3D copyParameters(unitValueOrigin, = unitval); - } - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); } - - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); } - } - if (!err) err =3D m_importer->getDocument()->stepForward(1); + if (!err) err =3D m_importer->getDocument()->stepForward(1); = - //Step 2 - bank and accounts - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listBanks; - err =3D docOrigin.getObjects("v_bank", "", listBanks); + //Step 2 - bank and accounts if (!err) { - int nb =3D listBanks.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import banks and accounts"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGBankObject bankOrigin(listBanks.at(i)); - SKGBankObject bank(bankOrigin.cloneInto(m_importer->ge= tDocument())); - if (bank.load().isFailed()) { - //This bank does not exist yet - if (!err) err =3D bank.save(false); //Save only - } - - //Duplicate properties - if (!err) err =3D copyParameters(bankOrigin, bank); - - //Accounts - SKGObjectBase::SKGListSKGObjectBase listAccounts; - if (!err) err =3D bankOrigin.getAccounts(listAccounts); - int nb2 =3D listAccounts.count(); - for (int j =3D 0; !err && j < nb2; ++j) { - SKGAccountObject accountOrigin(listAccounts.at(j)); - SKGAccountObject account(accountOrigin.cloneInto(m= _importer->getDocument())); - if (account.load().isFailed()) { - //This account does not exist yet - if (!err) err =3D account.setBank(bank); - //Initial balance will be set on operation cre= ation - if (!err) err =3D account.save(false); //Sa= ve only + SKGObjectBase::SKGListSKGObjectBase listBanks; + err =3D docOrigin.getObjects("v_bank", "", listBanks); + if (!err) { + int nb =3D listBanks.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import banks and accounts"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGBankObject bankOrigin(listBanks.at(i)); + SKGBankObject bank(bankOrigin.cloneInto(m_importer= ->getDocument())); + if (bank.load().isFailed()) { + //This bank does not exist yet + if (!err) err =3D bank.save(false); //Save = only } = //Duplicate properties - if (!err) err =3D copyParameters(accountOrigin, ac= count); - - mapOriginNew[accountOrigin.getUniqueID()] =3D acco= unt; + if (!err) err =3D copyParameters(bankOrigin, bank); + + //Accounts + SKGObjectBase::SKGListSKGObjectBase listAccounts; + if (!err) err =3D bankOrigin.getAccounts(listAccou= nts); + int nb2 =3D listAccounts.count(); + for (int j =3D 0; !err && j < nb2; ++j) { + SKGAccountObject accountOrigin(listAccounts.at= (j)); + SKGAccountObject account(accountOrigin.cloneIn= to(m_importer->getDocument())); + if (account.load().isFailed()) { + //This account does not exist yet + if (!err) err =3D account.setBank(bank); + //Initial balance will be set on operation= creation + if (!err) err =3D account.save(false); = //Save only + } + + //Duplicate properties + if (!err) err =3D copyParameters(accountOrigin= , account); + + mapOriginNew[accountOrigin.getUniqueID()] =3D = account; + } + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); } - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(2); + if (!err) err =3D m_importer->getDocument()->stepForward(2); = - //Step 3 - categories - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listCategories; - err =3D docOrigin.getObjects("v_category", "", listCategories); + //Step 3 - categories if (!err) { - int nb =3D listCategories.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import categories"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGCategoryObject catOrigin(listCategories.at(i)); - - SKGCategoryObject cat; - err =3D SKGCategoryObject::createPathCategory(m_import= er->getDocument(), catOrigin.getFullName(), cat); - //Duplicate properties - if (!err) err =3D copyParameters(catOrigin, cat); - mapOriginNew[catOrigin.getUniqueID()] =3D cat; - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } + SKGObjectBase::SKGListSKGObjectBase listCategories; + err =3D docOrigin.getObjects("v_category", "", listCategor= ies); + if (!err) { + int nb =3D listCategories.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import categories"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGCategoryObject catOrigin(listCategories.at(i)); + + SKGCategoryObject cat; + err =3D SKGCategoryObject::createPathCategory(m_im= porter->getDocument(), catOrigin.getFullName(), cat); + //Duplicate properties + if (!err) err =3D copyParameters(catOrigin, cat); + mapOriginNew[catOrigin.getUniqueID()] =3D cat; + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(3); + if (!err) err =3D m_importer->getDocument()->stepForward(3); = - //Step 4 - trackers - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listRefund; - err =3D docOrigin.getObjects("v_refund", "", listRefund); + //Step 4 - trackers if (!err) { - int nb =3D listRefund.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import trackers"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGTrackerObject tracOrigin(listRefund.at(i)); - SKGTrackerObject trac(tracOrigin.cloneInto(m_importer-= >getDocument())); - err =3D trac.save(); - //Duplicate properties - if (!err) err =3D copyParameters(tracOrigin, trac); - mapOriginNew[tracOrigin.getUniqueID()] =3D trac; - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } + SKGObjectBase::SKGListSKGObjectBase listRefund; + err =3D docOrigin.getObjects("v_refund", "", listRefund); + if (!err) { + int nb =3D listRefund.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import trackers"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGTrackerObject tracOrigin(listRefund.at(i)); + SKGTrackerObject trac(tracOrigin.cloneInto(m_impor= ter->getDocument())); + err =3D trac.save(); + //Duplicate properties + if (!err) err =3D copyParameters(tracOrigin, trac); + mapOriginNew[tracOrigin.getUniqueID()] =3D trac; + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(4); + if (!err) err =3D m_importer->getDocument()->stepForward(4); = - //Step 5 - rules - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listRules; - err =3D docOrigin.getObjects("v_rule", "", listRules); + //Step 5 - rules if (!err) { - int nb =3D listRules.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import rules"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGRuleObject rulOrigin(listRules.at(i)); - SKGRuleObject rul(rulOrigin.cloneInto(m_importer->getD= ocument())); - err =3D rul.save(false); //Save only - //Duplicate properties - if (!err) err =3D copyParameters(rulOrigin, rul); - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } + SKGObjectBase::SKGListSKGObjectBase listRules; + err =3D docOrigin.getObjects("v_rule", "", listRules); + if (!err) { + int nb =3D listRules.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import rules"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGRuleObject rulOrigin(listRules.at(i)); + SKGRuleObject rul(rulOrigin.cloneInto(m_importer->= getDocument())); + err =3D rul.save(false); //Save only + //Duplicate properties + if (!err) err =3D copyParameters(rulOrigin, rul); + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(5); + if (!err) err =3D m_importer->getDocument()->stepForward(5); = - //Step 6 - payee - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listPayee; - err =3D docOrigin.getObjects("v_payee", "", listPayee); + //Step 6 - payee if (!err) { - int nb =3D listPayee.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import payees"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGPayeeObject paylOrigin(listPayee.at(i)); - - SKGPayeeObject pay; - err =3D SKGPayeeObject::createPayee(m_importer->getDoc= ument(), paylOrigin.getName(), pay); - if (!err) err =3D pay.setAddress(paylOrigin.getAddress= ()); - if (!err) err =3D pay.save(); - //Duplicate properties - if (!err) err =3D copyParameters(paylOrigin, pay); - mapOriginNew[paylOrigin.getUniqueID()] =3D pay; - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } + SKGObjectBase::SKGListSKGObjectBase listPayee; + err =3D docOrigin.getObjects("v_payee", "", listPayee); + if (!err) { + int nb =3D listPayee.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import payees"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGPayeeObject paylOrigin(listPayee.at(i)); + + SKGPayeeObject pay; + err =3D SKGPayeeObject::createPayee(m_importer->ge= tDocument(), paylOrigin.getName(), pay); + if (!err) err =3D pay.setAddress(paylOrigin.getAdd= ress()); + if (!err) err =3D pay.save(); + //Duplicate properties + if (!err) err =3D copyParameters(paylOrigin, pay); + mapOriginNew[paylOrigin.getUniqueID()] =3D pay; + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(6); + if (!err) err =3D m_importer->getDocument()->stepForward(6); = - //Step 7 - operations and suboperation - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listOperations; - err =3D docOrigin.getObjects("v_operation", "", listOperations= ); + //Step 7 - operations and suboperation if (!err) { - int nb =3D listOperations.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import operations"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGOperationObject operationOrigin(listOperations.at(i= )); - SKGOperationObject operation(operationOrigin.cloneInto= (m_importer->getDocument())); - if (!err) err =3D operation.setAttribute("r_recurrento= peration_id", ""); - if (!err) err =3D operation.setImported(true); - if (!err) { - QString importID =3D operationOrigin.getImportID(); - if (importID.isEmpty()) importID =3D "SKG-" % SKGS= ervices::intToString(operationOrigin.getID()); - err =3D operation.setImportID(importID); - } - if (!err) { - SKGAccountObject actOrig; - err =3D operationOrigin.getParentAccount(actOrig); + SKGObjectBase::SKGListSKGObjectBase listOperations; + err =3D docOrigin.getObjects("v_operation", "", listOperat= ions); + if (!err) { + int nb =3D listOperations.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import operations"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGOperationObject operationOrigin(listOperations.= at(i)); + SKGOperationObject operation(operationOrigin.clone= Into(m_importer->getDocument())); + if (!err) err =3D operation.setAttribute("r_recurr= entoperation_id", ""); + if (!err) err =3D operation.setImported(true); if (!err) { - SKGAccountObject act(mapOriginNew[actOrig.getU= niqueID()]); - act.setClosed(false); //To be sure that the mo= dification is possible. NOT SAVED - if (!err) err =3D operation.setParentAccount(a= ct); + QString importID =3D operationOrigin.getImport= ID(); + if (importID.isEmpty()) importID =3D "SKG-" % = SKGServices::intToString(operationOrigin.getID()); + err =3D operation.setImportID(importID); } - } - if (!err) { - SKGPayeeObject payeeOrig; - operationOrigin.getPayee(payeeOrig); //Error n= ot managed - if (!err) err =3D operation.setPayee(SKGPayeeObjec= t(mapOriginNew[payeeOrig.getUniqueID()])); - } - if (!err) { - SKGUnitObject unitOrig; - err =3D operationOrigin.getUnit(unitOrig); - if (!err) err =3D operation.setUnit(SKGUnitObject(= mapOriginNew[unitOrig.getUniqueID()])); - } - if (!err) { - SKGOperationObject groupOrig; - operationOrigin.getGroupOperation(groupOrig); - err =3D operation.setGroupOperation(SKGOperationOb= ject(mapOriginNew[groupOrig.getUniqueID()])); - } - if (!err) err =3D operation.save(false); //Save only - - mapOriginNew[operationOrigin.getUniqueID()] =3D operat= ion; - - //Duplicate properties - if (!err) err =3D copyParameters(operationOrigin, oper= ation); - - //Sub operation - SKGObjectBase::SKGListSKGObjectBase listSuboperations; - if (!err) err =3D operationOrigin.getSubOperations(lis= tSuboperations); - int nb2 =3D listSuboperations.count(); - for (int j =3D 0; !err && j < nb2; ++j) { - SKGSubOperationObject subopOrigin(listSuboperation= s.at(j)); - - SKGSubOperationObject subop(subopOrigin.cloneInto(= m_importer->getDocument())); - err =3D subop.setParentOperation(operation); if (!err) { - SKGCategoryObject catOrig; - subopOrigin.getCategory(catOrig); //Error n= ot managed - err =3D subop.setCategory(SKGCategoryObject(ma= pOriginNew[catOrig.getUniqueID()])); + SKGAccountObject actOrig; + err =3D operationOrigin.getParentAccount(actOr= ig); + if (!err) { + SKGAccountObject act(mapOriginNew[actOrig.= getUniqueID()]); + act.setClosed(false); //To be sure that th= e modification is possible. NOT SAVED + if (!err) err =3D operation.setParentAccou= nt(act); + } } if (!err) { - SKGTrackerObject tracOrig; - subopOrigin.getTracker(tracOrig); //Error n= ot managed - if (!err) err =3D subop.setTracker(SKGTrackerO= bject(mapOriginNew[tracOrig.getUniqueID()]), true); + SKGPayeeObject payeeOrig; + operationOrigin.getPayee(payeeOrig); //Err= or not managed + if (!err) err =3D operation.setPayee(SKGPayeeO= bject(mapOriginNew[payeeOrig.getUniqueID()])); } - if (!err) err =3D subop.save(false); //Save only + if (!err) { + SKGUnitObject unitOrig; + err =3D operationOrigin.getUnit(unitOrig); + if (!err) err =3D operation.setUnit(SKGUnitObj= ect(mapOriginNew[unitOrig.getUniqueID()])); + } + if (!err) { + SKGOperationObject groupOrig; + operationOrigin.getGroupOperation(groupOrig); + err =3D operation.setGroupOperation(SKGOperati= onObject(mapOriginNew[groupOrig.getUniqueID()])); + } + if (!err) err =3D operation.save(false); //Save= only + + mapOriginNew[operationOrigin.getUniqueID()] =3D op= eration; = //Duplicate properties - if (!err) err =3D copyParameters(subopOrigin, subo= p); + if (!err) err =3D copyParameters(operationOrigin, = operation); + + //Sub operation + SKGObjectBase::SKGListSKGObjectBase listSuboperati= ons; + if (!err) err =3D operationOrigin.getSubOperations= (listSuboperations); + int nb2 =3D listSuboperations.count(); + for (int j =3D 0; !err && j < nb2; ++j) { + SKGSubOperationObject subopOrigin(listSubopera= tions.at(j)); + + SKGSubOperationObject subop(subopOrigin.cloneI= nto(m_importer->getDocument())); + err =3D subop.setParentOperation(operation); + if (!err) { + SKGCategoryObject catOrig; + subopOrigin.getCategory(catOrig); //Err= or not managed + err =3D subop.setCategory(SKGCategoryObjec= t(mapOriginNew[catOrig.getUniqueID()])); + } + if (!err) { + SKGTrackerObject tracOrig; + subopOrigin.getTracker(tracOrig); //Err= or not managed + if (!err) err =3D subop.setTracker(SKGTrac= kerObject(mapOriginNew[tracOrig.getUniqueID()]), true); + } + if (!err) err =3D subop.save(false); //Save= only + + //Duplicate properties + if (!err) err =3D copyParameters(subopOrigin, = subop); + } + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + + if (!err && i % 500 =3D=3D 0) err =3D m_importer->= getDocument()->executeSqliteOrder("ANALYZE"); } - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); = - if (!err && i % 500 =3D=3D 0) err =3D m_importer->getD= ocument()->executeSqliteOrder("ANALYZE"); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); } - - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); } - } - if (!err) err =3D m_importer->getDocument()->stepForward(7); - /* SKGObjectBase opWithThisHa= sh; - if ( SKGObjectBase::getObject = ( m_importer->getDocument(), "operation", "t_imported IN ('Y','P') AND t_im= port_id=3D'"+QString ( hash.toHex() ) +'\'', opWithThisHash ).isSucceeded()= )*/ + if (!err) err =3D m_importer->getDocument()->stepForward(7); + /* SKGObjectBase opWithTh= isHash; + if ( SKGObjectBase::getObj= ect ( m_importer->getDocument(), "operation", "t_imported IN ('Y','P') AND = t_import_id=3D'"+QString ( hash.toHex() ) +'\'', opWithThisHash ).isSucceed= ed() )*/ = - //Step 8 - recurrent - if (!err) { - SKGObjectBase::SKGListSKGObjectBase ListRecurrentOperations; - err =3D docOrigin.getObjects("v_recurrentoperation", "", ListR= ecurrentOperations); + //Step 8 - recurrent if (!err) { - int nb =3D ListRecurrentOperations.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import scheduled operations"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGRecurrentOperationObject recuOrigin(ListRecurrentOp= erations.at(i)); - SKGRecurrentOperationObject recu(recuOrigin.cloneInto(= m_importer->getDocument())); + SKGObjectBase::SKGListSKGObjectBase ListRecurrentOperation= s; + err =3D docOrigin.getObjects("v_recurrentoperation", "", L= istRecurrentOperations); + if (!err) { + int nb =3D ListRecurrentOperations.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import scheduled operations"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGRecurrentOperationObject recuOrigin(ListRecurre= ntOperations.at(i)); + SKGRecurrentOperationObject recu(recuOrigin.cloneI= nto(m_importer->getDocument())); + + SKGOperationObject opOrig; + err =3D recuOrigin.getParentOperation(opOrig); + if (!err) err =3D recu.setParentOperation(SKGOpera= tionObject(mapOriginNew[opOrig.getUniqueID()])); + if (!err) err =3D recu.save(false); //Save only = - SKGOperationObject opOrig; - err =3D recuOrigin.getParentOperation(opOrig); - if (!err) err =3D recu.setParentOperation(SKGOperation= Object(mapOriginNew[opOrig.getUniqueID()])); - if (!err) err =3D recu.save(false); //Save only + //Duplicate properties + if (!err) err =3D copyParameters(recuOrigin, recu); = - //Duplicate properties - if (!err) err =3D copyParameters(recuOrigin, recu); + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); } - - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); } - } - if (!err) err =3D m_importer->getDocument()->stepForward(8); + if (!err) err =3D m_importer->getDocument()->stepForward(8); = - //Step 9 - nodes - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listNodes; - err =3D docOrigin.getObjects("v_node", "", listNodes); + //Step 9 - nodes if (!err) { - int nb =3D listNodes.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import bookmarks"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGNodeObject nodeOrigin(listNodes.at(i)); - - SKGNodeObject node; - err =3D SKGNodeObject::createPathNode(m_importer->getD= ocument(), i18n("Imported bookmarks") % OBJECTSEPARATOR % nodeOrigin.getFul= lName(), node); - if (!err) err =3D node.setData(nodeOrigin.getData()); - if (!err) err =3D node.setOrder(nodeOrigin.getOrder()); - if (!err) err =3D node.setAutoStart(nodeOrigin.isAutoS= tart()); - if (!err) err =3D node.save(true, false); - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); - } + SKGObjectBase::SKGListSKGObjectBase listNodes; + err =3D docOrigin.getObjects("v_node", "", listNodes); + if (!err) { + int nb =3D listNodes.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import bookmarks"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGNodeObject nodeOrigin(listNodes.at(i)); + + SKGNodeObject node; + err =3D SKGNodeObject::createPathNode(m_importer->= getDocument(), i18n("Imported bookmarks") % OBJECTSEPARATOR % nodeOrigin.ge= tFullName(), node); + if (!err) err =3D node.setData(nodeOrigin.getData(= )); + if (!err) err =3D node.setOrder(nodeOrigin.getOrde= r()); + if (!err) err =3D node.setAutoStart(nodeOrigin.isA= utoStart()); + if (!err) err =3D node.save(true, false); + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); + } } - } - if (!err) err =3D m_importer->getDocument()->stepForward(9); + if (!err) err =3D m_importer->getDocument()->stepForward(9); = - //Step 10 - interest - if (!err) { - SKGObjectBase::SKGListSKGObjectBase listInterests; - err =3D docOrigin.getObjects("v_interest", "", listInterests); + //Step 10 - interest if (!err) { - int nb =3D listInterests.count(); - err =3D m_importer->getDocument()->beginTransaction("#INTE= RNAL#" % i18nc("Import step", "Import interests"), nb); - for (int i =3D 0; !err && i < nb; ++i) { - SKGInterestObject interestOrigin(listInterests.at(i)); - SKGInterestObject interest(interestOrigin.cloneInto(m_= importer->getDocument())); - if (!err) { - SKGAccountObject actOrig; - err =3D interestOrigin.getAccount(actOrig); - if (!err) err =3D interest.setAccount(SKGAccountOb= ject(mapOriginNew[actOrig.getUniqueID()])); - } - if (!err) err =3D interest.save(); + SKGObjectBase::SKGListSKGObjectBase listInterests; + err =3D docOrigin.getObjects("v_interest", "", listInteres= ts); + if (!err) { + int nb =3D listInterests.count(); + err =3D m_importer->getDocument()->beginTransaction("#= INTERNAL#" % i18nc("Import step", "Import interests"), nb); + for (int i =3D 0; !err && i < nb; ++i) { + SKGInterestObject interestOrigin(listInterests.at(= i)); + SKGInterestObject interest(interestOrigin.cloneInt= o(m_importer->getDocument())); + if (!err) { + SKGAccountObject actOrig; + err =3D interestOrigin.getAccount(actOrig); + if (!err) err =3D interest.setAccount(SKGAccou= ntObject(mapOriginNew[actOrig.getUniqueID()])); + } + if (!err) err =3D interest.save(); + + //Duplicate properties + if (!err) err =3D copyParameters(interestOrigin, i= nterest); = - //Duplicate properties - if (!err) err =3D copyParameters(interestOrigin, inter= est); + if (!err) err =3D m_importer->getDocument()->stepF= orward(i + 1); + } = - if (!err) err =3D m_importer->getDocument()->stepForwa= rd(i + 1); + if (!err) err =3D m_importer->getDocument()->endTransa= ction(true); + else m_importer->getDocument()->endTransaction(false); } - - if (!err) err =3D m_importer->getDocument()->endTransactio= n(true); - else m_importer->getDocument()->endTransaction(false); } - } - if (!err) err =3D m_importer->getDocument()->stepForward(10); + if (!err) err =3D m_importer->getDocument()->stepForward(10); = - if (!err) err =3D m_importer->getDocument()->endTransaction(true); - else m_importer->getDocument()->endTransaction(false); + if (!err) err =3D m_importer->getDocument()->endTransaction(tr= ue); + else m_importer->getDocument()->endTransaction(false); = - if (!err) err =3D m_importer->getDocument()->executeSqliteOrder("A= NALYZE"); + if (!err) err =3D m_importer->getDocument()->executeSqliteOrde= r("ANALYZE"); + } } return err; } diff --git a/skgbankmodeler/skgunitobject.cpp b/skgbankmodeler/skgunitobjec= t.cpp index 2b14d3b..1a732dd 100644 --- a/skgbankmodeler/skgunitobject.cpp +++ b/skgbankmodeler/skgunitobject.cpp @@ -650,7 +650,7 @@ QStringList SKGUnitObject::downloadSources() return sources; } = -SKGError SKGUnitObject::addSource(const QString& iNewSource) +SKGError SKGUnitObject::addSource(const QString& iNewSource, bool iOpenSou= rce) { SKGError err; = @@ -694,7 +694,7 @@ SKGError SKGUnitObject::addSource(const QString& iNewSo= urce) } = //Open the created or already existing file - QDesktopServices::openUrl(KUrl(newfile)); + if (iOpenSource) QDesktopServices::openUrl(KUrl(newfile)); return err; } = diff --git a/skgbankmodeler/skgunitobject.h b/skgbankmodeler/skgunitobject.h index 277051f..50a7233 100644 --- a/skgbankmodeler/skgunitobject.h +++ b/skgbankmodeler/skgunitobject.h @@ -294,10 +294,11 @@ public: /** * Create a new source * @param iNewSource the name of the new source + * @param iOpenSource to open the created source with the appropriate = editor * @return an object managing the error * @see SKGError */ - static SKGError addSource(const QString& iNewSource); + static SKGError addSource(const QString& iNewSource, bool iOpenSource = =3D true); = /** * To know if a source can be modified or deleted diff --git a/tests/skgbankmodelertest/skgtestbankandaccount.cpp b/tests/skg= bankmodelertest/skgtestbankandaccount.cpp index 56be3bb..6308ef4 100644 --- a/tests/skgbankmodelertest/skgtestbankandaccount.cpp +++ b/tests/skgbankmodelertest/skgtestbankandaccount.cpp @@ -73,6 +73,8 @@ int main(int argc, char** argv) SKGTEST("BANK:comparison", (bank12 =3D=3D bank1), true); SKGBankObject bank13(SKGNamedObject(bank1)); //For coverage SKGTEST("BANK:comparison", (bank12 =3D=3D SKGNamedObject(bank1= )), true); + SKGNamedObject bank1n(bank1); + SKGBankObject bank14(bank1n); //For coverage = //Creation account1 SKGAccountObject account1; diff --git a/tests/skgbankmodelertest/skgtestbudget.cpp b/tests/skgbankmode= lertest/skgtestbudget.cpp index 82d3797..fc3ad7b 100644 --- a/tests/skgbankmodelertest/skgtestbudget.cpp +++ b/tests/skgbankmodelertest/skgtestbudget.cpp @@ -76,6 +76,7 @@ int main(int argc, char** argv) SKGTESTERROR("BUDGETRULE.createPathCategory", SKGCategoryObjec= t::createPathCategory(&document1, "category_55 > category_57", cat), true); SKGTESTERROR("BUDGETRULE.setBudgetCategory", br.setBudgetCateg= ory(cat), true); = + SKGTESTERROR("BUDGETRULE.setCondition", br.setCondition(SKGBud= getRuleObject::NEGATIVE), true); SKGTEST("BUDGETRULE.getCondition", br.getCondition(), SKGBudge= tRuleObject::NEGATIVE); SKGTESTERROR("BUDGETRULE.setCondition", br.setCondition(SKGBud= getRuleObject::POSITIVE), true); @@ -125,6 +126,18 @@ int main(int argc, char** argv) = document1.existObjects("v_budget_display", "t_PERIOD=3D'2013-02' A= ND t_CATEGORY=3D'Loisirs' AND f_budgeted_modified=3D2100", check); SKGTEST("BUDGETRULE.Loisirs 2013-02 2100", check, true); + + SKGObjectBase bo; + SKGTESTERROR("document1.getObject()", document1.getObject("v_budge= t_display", "t_PERIOD=3D'2013-02' AND t_CATEGORY=3D'Loisirs' AND f_budgeted= _modified=3D2100", bo), true); + SKGBudgetObject b(bo); + SKGTEST("BUDGET.getBudgetedAmount", b.getBudgetedAmount(), 300); + SKGCategoryObject cat; + SKGTESTERROR("BUDGET.getCategory", b.getCategory(cat), true); + SKGTESTERROR("BUDGET.removeCategory", b.removeCategory(), true); + SKGTESTERROR("BUDGET.enableSubCategoriesInclusion", b.enableSubCat= egoriesInclusion(true), true); + SKGTEST("BUDGET.isSubCategoriesInclusionEnabled", b.isSubCategorie= sInclusionEnabled(), true); + SKGTESTERROR("BUDGET.enableSubCategoriesInclusion", b.enableSubCat= egoriesInclusion(false), true); + SKGTEST("BUDGET.isSubCategoriesInclusionEnabled", b.isSubCategorie= sInclusionEnabled(), false); } = //End test diff --git a/tests/skgbankmodelertest/skgtestimportafb120.cpp b/tests/skgba= nkmodelertest/skgtestimportafb120.cpp index c251dad..7b7cdb6 100644 --- a/tests/skgbankmodelertest/skgtestimportafb120.cpp +++ b/tests/skgbankmodelertest/skgtestimportafb120.cpp @@ -45,6 +45,9 @@ int main(int argc, char** argv) //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_AFB120", err); = + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.cfo")); + SKGTESTERROR("AFB120.importFile", impmissing.importFile(), fal= se); + SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportafb120/gs_01139_021239S.cfo")); SKGTESTERROR("AFB120.importFile", imp1.importFile(), true); = @@ -72,6 +75,12 @@ int main(int argc, char** argv) SKGTESTERROR("AFB120.load", account.load(), true); SKGTEST("AFB120:getCurrentAmount", SKGServices::doubleToString= (account.getCurrentAmount()), "2555.48"); } + + { + SKGTESTERROR("AFB120.saveAs", document1.saveAs(getTestPath("OU= T") % QString::fromUtf8("/anonymize.skg")), true); + SKGImportExportManager imp1(&document1); + SKGTESTERROR("AFB120:anonymize", imp1.anonymize(), true); + } } //End test SKGENDTEST(); diff --git a/tests/skgbankmodelertest/skgtestimportcsv.cpp b/tests/skgbankm= odelertest/skgtestimportcsv.cpp index 896e26e..98f1136 100644 --- a/tests/skgbankmodelertest/skgtestimportcsv.cpp +++ b/tests/skgbankmodelertest/skgtestimportcsv.cpp @@ -47,6 +47,10 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_CSV", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.csv")); + impmissing.setAutomaticApplyRules(true); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); + SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportcsv/skrooge_partial.csv")); imp1.getImportMimeTypeFilter(); imp1.getExportMimeTypeFilter(); diff --git a/tests/skgbankmodelertest/skgtestimportgnucash.cpp b/tests/skgb= ankmodelertest/skgtestimportgnucash.cpp index 43e7c6d..431f006 100644 --- a/tests/skgbankmodelertest/skgtestimportgnucash.cpp +++ b/tests/skgbankmodelertest/skgtestimportgnucash.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_GNUCASH", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.uncompressed")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportgnucash/test_data.uncompressed")); SKGTESTERROR("GNUCASH.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportgsb.cpp b/tests/skgbankm= odelertest/skgtestimportgsb.cpp index 243fe4b..56f7d9c 100644 --- a/tests/skgbankmodelertest/skgtestimportgsb.cpp +++ b/tests/skgbankmodelertest/skgtestimportgsb.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_GSB", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.gsb")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportgsb/test-obfuscated.gsb")); SKGTESTERROR("GSB.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportkmy.cpp b/tests/skgbankm= odelertest/skgtestimportkmy.cpp index 043c780..d188738 100644 --- a/tests/skgbankmodelertest/skgtestimportkmy.cpp +++ b/tests/skgbankmodelertest/skgtestimportkmy.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_KMY", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.kmy")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportkmy/rapprochement-incorrect.kmy")); SKGTESTERROR("KMY.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportmmb.cpp b/tests/skgbankm= odelertest/skgtestimportmmb.cpp index 6fe0301..c864832 100644 --- a/tests/skgbankmodelertest/skgtestimportmmb.cpp +++ b/tests/skgbankmodelertest/skgtestimportmmb.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_MMB", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.mmb")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportmmb/test.mmb")); SKGTESTERROR("MMB.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportmt940.cpp b/tests/skgban= kmodelertest/skgtestimportmt940.cpp index 96bbe2d..9c528e9 100644 --- a/tests/skgbankmodelertest/skgtestimportmt940.cpp +++ b/tests/skgbankmodelertest/skgtestimportmt940.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_MT940", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.mt940")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportmt940/test1.mt940")); SKGTESTERROR("MT940.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportofx.cpp b/tests/skgbankm= odelertest/skgtestimportofx.cpp index 1e81434..c07c8ad 100644 --- a/tests/skgbankmodelertest/skgtestimportofx.cpp +++ b/tests/skgbankmodelertest/skgtestimportofx.cpp @@ -44,6 +44,9 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_OFX", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.ofx")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); + SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportofx/ofx_spec160_stmtrs_example.ofx")); SKGTESTERROR("imp1.importFile", imp1.importFile(), true); //document1.dump ( DUMPOPERATION|DUMPACCOUNT ); diff --git a/tests/skgbankmodelertest/skgtestimportqif.cpp b/tests/skgbankm= odelertest/skgtestimportqif.cpp index 7c2f7f0..adee7c3 100644 --- a/tests/skgbankmodelertest/skgtestimportqif.cpp +++ b/tests/skgbankmodelertest/skgtestimportqif.cpp @@ -49,6 +49,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_INIT", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.qif")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = //Creation bank SKGTESTERROR("BANK:setName", bank.setName("CREDIT COOP"), true= ); diff --git a/tests/skgbankmodelertest/skgtestimportskg.cpp b/tests/skgbankm= odelertest/skgtestimportskg.cpp index 73def6e..d47e91a 100644 --- a/tests/skgbankmodelertest/skgtestimportskg.cpp +++ b/tests/skgbankmodelertest/skgtestimportskg.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_SKG", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.skg")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportskg/all_types.skg")); SKGTESTERROR("SKG.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestimportxhb.cpp b/tests/skgbankm= odelertest/skgtestimportxhb.cpp index 5cc929f..7c47a11 100644 --- a/tests/skgbankmodelertest/skgtestimportxhb.cpp +++ b/tests/skgbankmodelertest/skgtestimportxhb.cpp @@ -44,6 +44,8 @@ int main(int argc, char** argv) { //Scope of the transaction SKGBEGINTRANSACTION(document1, "IMPORT_XHB", err); + SKGImportExportManager impmissing(&document1, KUrl("missingfil= e.xhb")); + SKGTESTERROR("imp1.importFile", impmissing.importFile(), false= ); = SKGImportExportManager imp1(&document1, KUrl::fromLocalFile(ge= tTestPath("IN") % "/skgtestimportxhb/test.xhb")); SKGTESTERROR("XHB.importFile", imp1.importFile(), true); diff --git a/tests/skgbankmodelertest/skgtestunit.cpp b/tests/skgbankmodele= rtest/skgtestunit.cpp index 49b6ecf..a9c716c 100644 --- a/tests/skgbankmodelertest/skgtestunit.cpp +++ b/tests/skgbankmodelertest/skgtestunit.cpp @@ -24,6 +24,7 @@ = #include #include +#include = /** * The main function of the unit test @@ -191,6 +192,7 @@ int main(int argc, char** argv) SKGBEGINTRANSACTION(document1, "UNIT_1", err); SKGUnitObject unitObj; SKGTESTERROR("UNIT:createCurrencyUnit", SKGUnitObject::cre= ateCurrencyUnit(&document1, unit, unitObj), true); + unitObj.getUnitInfo(); } SKGBEGINTRANSACTION(document1, "UNIT_1", err); SKGUnitObject unitObj; @@ -357,6 +359,12 @@ int main(int argc, char** argv) SKGTESTERROR("UNIT:getUnitValues", unit1.getUnitValues(oUnitValueL= ist), true); SKGTEST("UNIT:oUnitValueList", oUnitValueList.count(), 2); } + + { + SKGTESTERROR("UNIT:addSource", SKGUnitObject::addSource("test", fa= lse), true); + SKGTEST("UNIT:isWritable", SKGUnitObject::isWritable("test"), true= ); + SKGTESTERROR("UNIT:deleteSource", SKGUnitObject::deleteSource("tes= t"), true); + } //End test SKGENDTEST(); }