Python support: test for an unknown local and remote file (#2178).

opencor · Dec 9, 2019 · f882ec7 · f882ec7
1 parent e79887a
commit f882ec7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/src/plugins/support/PythonSupport/tests/data/tests.out b/src/plugins/support/PythonSupport/tests/data/tests.out
@@ -1,3 +1,15 @@
+---------------------------------------
+          Unknown local file
+---------------------------------------
+ - Open file...
+OSError("'src/plugins/support/PythonSupport/tests/data/../../../../../../models/tests/unknown' could not be opened.")
+
+---------------------------------------
+          Unknown remote file
+---------------------------------------
+ - Open file...
+OSError("'https://unknown' could not be opened (host unknown not found).")
+
 ---------------------------------------
            Local CellML file
 ---------------------------------------

diff --git a/src/plugins/support/PythonSupport/tests/data/tests.py b/src/plugins/support/PythonSupport/tests/data/tests.py
@@ -40,7 +40,18 @@ def run_simulation(title, file_name_or_url, first=True):
     oc.close_simulation(simulation)
 
 
-run_simulation('Local CellML file', 'cellml/lorenz.cellml')
+try:
+    run_simulation('Unknown local file', 'unknown')
+except Exception as e:
+    print(repr(e))
+
+try:
+    run_simulation('Unknown remote file',
+                   'https://unknown', False)
+except Exception as e:
+    print(repr(e))
+
+run_simulation('Local CellML file', 'cellml/lorenz.cellml', False)
 run_simulation('Remote CellML file',
                'https://raw.githubusercontent.com/opencor/opencor/master/models/tests/cellml/lorenz.cellml', False)
 

diff --git a/src/tests/src/testsutils.cpp b/src/tests/src/testsutils.cpp
@@ -162,7 +162,7 @@ int runCli(const QStringList &pArguments, QStringList &pOutput)
     QDir::setCurrent(origPath);
 #endif
 
-    pOutput = output.remove('\r').split('\n');
+    pOutput = output.remove(dirName()).remove('\r').split('\n');
 
     return process.exitCode();
 }

diff --git a/src/tests/src/testsutils.h b/src/tests/src/testsutils.h
@@ -33,7 +33,7 @@ namespace OpenCOR {
 
 //==============================================================================
 
-QString dirName(const QString &pDirName);
+QString dirName(const QString &pDirName = QString());
 QString fileName(const QString &pFileName);
 
 QByteArray rawFileContents(const QString &pFileName);