From aa9814eaf5a6ad0da7983f156dc652a338991ba6 Mon Sep 17 00:00:00 2001 From: ericmenezesn@gmail.com Date: Fri, 18 Jul 2014 14:50:40 -0300 Subject: [PATCH] Melhorias no teste --- cacic-teste/cacic-teste.pro.user | 2 +- cacic-teste/testcacic.cpp | 18 ++++++++++++------ install-cacic/install-cacic.pro.user | 2 +- src/ccacic.h | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/cacic-teste/cacic-teste.pro.user b/cacic-teste/cacic-teste.pro.user index 33b8bc0..517c967 100644 --- a/cacic-teste/cacic-teste.pro.user +++ b/cacic-teste/cacic-teste.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index c31a4d5..834255d 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -14,8 +14,8 @@ CTestCacic::CTestCacic(QObject *parent) : "1", "0", "0", - /*QDir::currentPath(), */"YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__", - /*QTest::currentAppName(), */"8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__", + "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__", + "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__", "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__", "E9aKtVz/OSmGv7v1xW4FwaFukOob3qQ/HFDIz916K3ys82qfX9vBDz[[MAIS]]M2cdoYedhNkXt[[MAIS]]UVb10nD[[MAIS]]tOfbn7mlOlTDoGzUl9CgdPCsb[[MAIS]]Qa4wzuCrMw0BcCuaKfr62E3b8vh6Ug4JJbOgBo3ohG3x5O7Ap0D94GKtAWjMuTXRBbhGxPrRS4M6AhzvaN5P8pWd9FikrCLWuMs4ebnRlftef3RmVKScBDQ5zmK6sKxYNmX[[MAIS]]kKn/Gi2[[MAIS]]HftZ7HD9JLvZBpYhp4yjqShblQ67d6PlWgrRWXxwDseIiJe3NlF70zrCPBBelkeAhVDXMXnsYtLms3ElsLzxa3c5vpWzTfgyE[[MAIS]]hvALy4ivew7zaxEwrg2KY1T7GOSWZ7vljIvbhVZJgtzbnYiulFjJTtm5W4uJMKLuUJNzB0rxMkzToIE9/kDmeO2OKiwFbIfbe2Wdq0VpllOkjKtj9WM676iBSpYAXG0MsmLMj9CZ/sNi06hGF[[MAIS]]rXxiOSk66M0Hq[[MAIS]]OeUBh4z3Ra6f9yPJn0K9hIQyT[[MAIS]]Dr/QW/QdJIOkLTW8ZyyAF4DW9ojiTlUdySvB5EB1jyZ5nNTpzyE38qIdg7uM1tdWdm9FZGYxMdHwi1tS2dBeIWkDfWEjih01xiVt2dmdRgo0zIZvmmYDJ9LhCU3XPDlwdeQ8[[MAIS]]F7fnxDfxGqZQjZJ[[MAIS]]Y/Q8bdLpgbhcd3gt3SzjMLE0M[[MAIS]]hTmHG1KP2CzCibZ7grFAN3Y3jSPjmEj5Fzs26tdhdjNzSIt1FCueea8P2c4NmxPYkJCg0D1mgNrkH3L5svsO[[MAIS]]6YYrl3df4s[[MAIS]]fcK/to9s/pnkKfBKrAPF6Z4s2WPsALUPBDS5ty7RC2vqXRvH6hPR4o7xhXzQOQ/1xytr/RoEWEVeZ2wgHVVbbtFsALul/IDc7B45wmwxBx9iZHVwpQJVlNZZUBtwKqKhnXz5pM[[MAIS]]7yUAkfhMcO09pPd5kB2MBdRJs[[MAIS]]2FIk0GRUw05IHkc1rZEX5Ow==__CRYPTED__", "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__", @@ -52,18 +52,24 @@ void CTestCacic::testCommStatus() void CTestCacic::testComm() { - if (OCacicComm.commStatus()){ + if (OCacicComm.commStatus()) QVERIFY(OCacic.getValueFromTags(OCacicComm.comm("/ws/get/test"), "Comm_Status", "<>") == QString("OK")); - } else + else QSKIP("Teste de comunicação negativo!"); } void CTestCacic::testDeleteFile() { - QVERIFY(OCacic.deleteFile(testIniPath)); + QDir file(testIniPath); + OCacic.deleteFile(testIniPath); + QVERIFY(!file.exists()); } void CTestCacic::testDeleteFolder() { - QVERIFY(OCacic.deleteFolder(testPath)); + QDir folder(testPath); + OCacic.deleteFolder(testPath); + QVERIFY(!folder.exists()); } + + diff --git a/install-cacic/install-cacic.pro.user b/install-cacic/install-cacic.pro.user index 548b997..e7ec8a8 100644 --- a/install-cacic/install-cacic.pro.user +++ b/install-cacic/install-cacic.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/ccacic.h b/src/ccacic.h index 6fed412..b7e98c2 100644 --- a/src/ccacic.h +++ b/src/ccacic.h @@ -7,6 +7,7 @@ #include #include #include +#include "crypt/aes.h" class CCacic : public QObject { -- libgit2 0.21.2