HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r446:f2dd25b3cc0a

Handles "Not found" error for AMDA result parser

Alexandre Leroux -

r446:f2dd25b3cc0a

parent child

Context file:

r446:f2dd25b3cc0a

plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt created 644 +3 0

@@ -0,0 +1,3
	1	Not Found
	2
	3	The requested URL /AMDA/data/WSRESULT/imf(0)-1343153090-1343153092-60.txt was not found on this server. No newline at end of file

plugins/amda/src/AmdaResultParser.cpp +13 -2

             namespace {
+            /// Message in result file when the file was not found on server
+            const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
             /// Format for dates in result files
             const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
                 QTextStream stream{&file};
-                // Ignore first two lines (comments lines)
+                // Checks if the file was found on the server
-                stream.readLine();
+                auto firstLine = stream.readLine();
+                if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
+                    qCCritical(LOG_AmdaResultParser())
+                        << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
+                               .arg(filePath);
+                    return nullptr;
+                }
+                // Ignore comments lines
                 stream.readLine();
                 // Reads x-axis unit

plugins/amda/tests/TestAmdaResultParser.cpp +6 -3

                            QVector<QDateTime>{dateTime(2013, 9, 23, 9, 1, 30), dateTime(2013, 9, 23, 9, 2, 30)},
                            QVector<double>{-2.71850, -2.52150}};
-                // Invalid file
+                // Invalid files
-                QTest::newRow("Invalid file (unexisting file)") << QStringLiteral("UnexistingFile.txt")
+                QTest::newRow("Invalid file (unexisting file)")
-                                                                << ExpectedResults{};
+                    << QStringLiteral("UnexistingFile.txt") << ExpectedResults{};
+                QTest::newRow("Invalid file (file not found on server)")
+                    << QStringLiteral("FileNotFound.txt") << ExpectedResults{};
             }
             void TestAmdaResultParser::testReadTxt()

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages