Commit c0f01be45e5b10599a393c386ee2da1728174f71
1 parent
37b0bbac
Exists in
master
Teste do logger incrementado para cobrir diversas descrições de caminho.
Showing
2 changed files
with
56 additions
and
15 deletions
Show diff stats
cacic-teste/testcacic.cpp
... | ... | @@ -266,25 +266,67 @@ void CTestCacic::testColeta() |
266 | 266 | void CTestCacic::testLogger() |
267 | 267 | { |
268 | 268 | QLogger::QLoggerManager *logManager = QLogger::QLoggerManager::getInstance(); |
269 | - logManager->addDestination("log.txt","teste",QLogger::DebugLevel); | |
270 | - | |
271 | - QLogger::QLog_Debug("teste", "Teste do modulo logger."); | |
272 | - | |
273 | - QFile logFile("log.txt"); | |
274 | - if(logFile.exists()) logFile.open(QIODevice::ReadOnly); | |
269 | + logManager->addDestination("log01.txt","teste01",QLogger::DebugLevel); | |
270 | + logManager->addDestination("./log02.txt","teste02",QLogger::DebugLevel); | |
271 | + logManager->addDestination("../log03.txt","teste03",QLogger::DebugLevel); | |
272 | + logManager->addDestination("logs/log04.txt","teste04",QLogger::DebugLevel); | |
273 | + logManager->addDestination("./logs/log05.txt","teste05",QLogger::DebugLevel); | |
274 | + logManager->addDestination("../logs/log06.txt","teste06",QLogger::DebugLevel); | |
275 | + | |
276 | + QLogger::QLog_Debug("teste01", "Teste do modulo logger."); | |
277 | + QLogger::QLog_Debug("teste02", "Teste do modulo logger."); | |
278 | + QLogger::QLog_Debug("teste03", "Teste do modulo logger."); | |
279 | + QLogger::QLog_Debug("teste04", "Teste do modulo logger."); | |
280 | + QLogger::QLog_Debug("teste05", "Teste do modulo logger."); | |
281 | + QLogger::QLog_Debug("teste06", "Teste do modulo logger."); | |
282 | + | |
283 | + QFile logFile01("log01.txt"); | |
284 | + if(logFile01.exists()) logFile01.open(QIODevice::ReadOnly); | |
285 | + QFile logFile02("./log02.txt"); | |
286 | + if(logFile02.exists()) logFile02.open(QIODevice::ReadOnly); | |
287 | + QFile logFile03("../log03.txt"); | |
288 | + if(logFile03.exists()) logFile03.open(QIODevice::ReadOnly); | |
289 | + QFile logFile04("logs/log04.txt"); | |
290 | + if(logFile04.exists()) logFile04.open(QIODevice::ReadOnly); | |
291 | + QFile logFile05("./logs/log05.txt"); | |
292 | + if(logFile05.exists()) logFile05.open(QIODevice::ReadOnly); | |
293 | + QFile logFile06("../logs/log06.txt"); | |
294 | + if(logFile06.exists()) logFile06.open(QIODevice::ReadOnly); | |
275 | 295 | |
276 | 296 | QVERIFY(logManager && |
277 | - logFile.exists() && | |
278 | - logFile.readLine().contains("Teste do modulo logger.") | |
297 | + logFile01.exists() && | |
298 | + logFile01.readLine().contains("Teste do modulo logger.") && | |
299 | + logFile02.exists() && | |
300 | + logFile02.readLine().contains("Teste do modulo logger.") && | |
301 | + logFile03.exists() && | |
302 | + logFile03.readLine().contains("Teste do modulo logger.") && | |
303 | + logFile04.exists() && | |
304 | + logFile04.readLine().contains("Teste do modulo logger.") && | |
305 | + logFile05.exists() && | |
306 | + logFile05.readLine().contains("Teste do modulo logger.") && | |
307 | + logFile06.exists() && | |
308 | + logFile06.readLine().contains("Teste do modulo logger.") | |
279 | 309 | ); |
280 | 310 | |
281 | 311 | logManager->closeLogger(); |
282 | - logFile.close(); | |
312 | + logFile01.close(); | |
313 | + logFile02.close(); | |
314 | + logFile03.close(); | |
315 | + logFile04.close(); | |
316 | + logFile05.close(); | |
317 | + logFile06.close(); | |
283 | 318 | } |
284 | 319 | |
285 | 320 | void CTestCacic::cleanupTestCase() |
286 | 321 | { |
287 | - OCacic.deleteFile("log.txt"); | |
322 | + OCacic.deleteFile("log01.txt"); | |
323 | + OCacic.deleteFile("./log02.txt"); | |
324 | + OCacic.deleteFile("../log03.txt"); | |
325 | + OCacic.deleteFile("logs/log04.txt"); | |
326 | + OCacic.deleteFile("./logs/log05.txt"); | |
327 | + OCacic.deleteFolder("./logs"); | |
328 | + OCacic.deleteFile("../logs/log06.txt"); | |
329 | + OCacic.deleteFolder("../logs"); | |
288 | 330 | OCacic.deleteFile("configRequest.json"); |
289 | 331 | OCacic.deleteFile("teste.json"); |
290 | 332 | OCacic.deleteFile("configReq.json"); | ... | ... |
src/QLogger.cpp
... | ... | @@ -140,14 +140,14 @@ namespace QLogger |
140 | 140 | |
141 | 141 | void QLoggerWriter::write(const QString &module, const QString &message) |
142 | 142 | { |
143 | - QString originalDir = QDir::currentPath(); | |
143 | + | |
144 | 144 | QString _fileName = m_fileDestination; |
145 | + QStringList fileDestSplit; | |
146 | + QString dirDest; | |
145 | 147 | |
146 | 148 | int MAX_SIZE = 1024 * 1024; |
147 | 149 | |
148 | - | |
149 | - QStringList fileDestSplit = _fileName.split("/"); | |
150 | - QString dirDest; | |
150 | + fileDestSplit = _fileName.split("/"); | |
151 | 151 | |
152 | 152 | for(int i = 0 ; i < fileDestSplit.size() ; ++i ) |
153 | 153 | { |
... | ... | @@ -162,7 +162,6 @@ namespace QLogger |
162 | 162 | if (!dir.exists(dirDest)) |
163 | 163 | dir.mkdir(dirDest); |
164 | 164 | |
165 | -// dir.cd(dirDest); | |
166 | 165 | |
167 | 166 | QFile file(_fileName); |
168 | 167 | QString toRemove = _fileName.section('.',-1); | ... | ... |