Skip to content

Commit 47781e5

Browse files
committed
Update tests
1 parent a7959b7 commit 47781e5

File tree

1 file changed

+30
-32
lines changed

1 file changed

+30
-32
lines changed

tests/src/python/test_qgsproject.py

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
QgsMapCanvas)
2929

3030
from qgis.PyQt.QtTest import QSignalSpy
31-
from qgis.PyQt.QtCore import QT_VERSION_STR, QTemporaryFile
31+
from qgis.PyQt.QtCore import QT_VERSION_STR, QTemporaryFile, QTemporaryDir
3232
import sip
3333

3434
from qgis.testing import start_app, unittest
@@ -685,73 +685,71 @@ def testTakeLayer(self):
685685
self.assertTrue(l1.isValid())
686686

687687
def test_zip_new_project(self):
688-
tmpFile = QTemporaryFile()
689-
tmpFile.open()
690-
tmpFile.close()
688+
tmpDir = QTemporaryDir()
689+
tmpFile = "{}/project.qgz".format(tmpDir.path())
691690

692691
# zip with existing file
692+
open(tmpFile, 'a').close()
693+
693694
project = QgsProject()
694-
self.assertTrue(project.zip(tmpFile.fileName()))
695+
self.assertTrue(project.write(tmpFile))
695696

696697
# zip with non existing file
697-
os.remove(tmpFile.fileName())
698+
os.remove(tmpFile)
698699

699700
project = QgsProject()
700-
self.assertTrue(project.zip(tmpFile.fileName()))
701-
self.assertTrue(os.path.isfile(tmpFile.fileName()))
701+
self.assertTrue(project.write(tmpFile))
702+
self.assertTrue(os.path.isfile(tmpFile))
702703

703704
def test_zip_invalid_path(self):
704705
project = QgsProject()
705-
self.assertFalse(project.zip())
706-
self.assertFalse(project.zip("/fake/test.zip"))
707-
self.assertFalse(project.zip(""))
706+
self.assertFalse(project.write())
707+
self.assertFalse(project.write(""))
708+
self.assertFalse(project.write("/fake/test.zip"))
708709

709710
def test_zip_filename(self):
710-
tmpFile = QTemporaryFile()
711-
tmpFile.open()
712-
tmpFile.close()
713-
os.remove(tmpFile.fileName())
711+
tmpDir = QTemporaryDir()
712+
tmpFile = "{}/project.qgz".format(tmpDir.path())
714713

715714
project = QgsProject()
716-
self.assertFalse(project.zip())
715+
self.assertFalse(project.write())
717716

718-
project.setZipFileName(tmpFile.fileName())
719-
self.assertTrue(project.zip())
720-
self.assertTrue(os.path.isfile(tmpFile.fileName()))
717+
project.setFileName(tmpFile)
718+
self.assertTrue(project.write())
719+
self.assertTrue(os.path.isfile(tmpFile))
721720

722721
def test_unzip_invalid_path(self):
723722
project = QgsProject()
724-
self.assertFalse(project.unzip())
725-
self.assertFalse(project.unzip(""))
726-
self.assertFalse(project.unzip("/fake/test.zip"))
723+
self.assertFalse(project.read())
724+
self.assertFalse(project.read(""))
725+
self.assertFalse(project.read("/fake/test.zip"))
727726

728727
def test_zip_unzip(self):
729-
tmpFile = QTemporaryFile()
730-
tmpFile.open()
731-
tmpFile.close()
728+
tmpDir = QTemporaryDir()
729+
tmpFile = "{}/project.qgz".format(tmpDir.path())
732730

733731
project = QgsProject()
734732

735733
l0 = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "points.shp"), "points", "ogr")
736734
l1 = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "lines.shp"), "lines", "ogr")
737735
project.addMapLayers([l0, l1])
738736

739-
self.assertTrue(project.zip(tmpFile.fileName()))
737+
self.assertTrue(project.write(tmpFile))
740738

741739
project2 = QgsProject()
742-
self.assertFalse(project2.unzipped())
743-
self.assertTrue(project2.zipFileName() == "")
744-
self.assertTrue(project2.unzip(tmpFile.fileName()))
745-
self.assertTrue(project2.unzipped())
746-
self.assertTrue(project2.zipFileName() == tmpFile.fileName())
740+
self.assertFalse(project2.isZipped())
741+
self.assertTrue(project2.fileName() == "")
742+
self.assertTrue(project2.read(tmpFile))
743+
self.assertTrue(project2.isZipped())
744+
self.assertTrue(project2.fileName() == tmpFile)
747745
layers = project2.mapLayers()
748746

749747
self.assertEqual(len(layers.keys()), 2)
750748
self.assertTrue(layers[l0.id()].isValid(), True)
751749
self.assertTrue(layers[l1.id()].isValid(), True)
752750

753751
project2.clear()
754-
self.assertFalse(project2.unzipped())
752+
self.assertFalse(project2.isZipped())
755753

756754

757755
if __name__ == '__main__':

0 commit comments

Comments
 (0)