|
28 | 28 | QgsMapCanvas)
|
29 | 29 |
|
30 | 30 | 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 |
32 | 32 | import sip
|
33 | 33 |
|
34 | 34 | from qgis.testing import start_app, unittest
|
@@ -685,73 +685,71 @@ def testTakeLayer(self):
|
685 | 685 | self.assertTrue(l1.isValid())
|
686 | 686 |
|
687 | 687 | 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()) |
691 | 690 |
|
692 | 691 | # zip with existing file
|
| 692 | + open(tmpFile, 'a').close() |
| 693 | + |
693 | 694 | project = QgsProject()
|
694 |
| - self.assertTrue(project.zip(tmpFile.fileName())) |
| 695 | + self.assertTrue(project.write(tmpFile)) |
695 | 696 |
|
696 | 697 | # zip with non existing file
|
697 |
| - os.remove(tmpFile.fileName()) |
| 698 | + os.remove(tmpFile) |
698 | 699 |
|
699 | 700 | 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)) |
702 | 703 |
|
703 | 704 | def test_zip_invalid_path(self):
|
704 | 705 | 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")) |
708 | 709 |
|
709 | 710 | 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()) |
714 | 713 |
|
715 | 714 | project = QgsProject()
|
716 |
| - self.assertFalse(project.zip()) |
| 715 | + self.assertFalse(project.write()) |
717 | 716 |
|
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)) |
721 | 720 |
|
722 | 721 | def test_unzip_invalid_path(self):
|
723 | 722 | 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")) |
727 | 726 |
|
728 | 727 | def test_zip_unzip(self):
|
729 |
| - tmpFile = QTemporaryFile() |
730 |
| - tmpFile.open() |
731 |
| - tmpFile.close() |
| 728 | + tmpDir = QTemporaryDir() |
| 729 | + tmpFile = "{}/project.qgz".format(tmpDir.path()) |
732 | 730 |
|
733 | 731 | project = QgsProject()
|
734 | 732 |
|
735 | 733 | l0 = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "points.shp"), "points", "ogr")
|
736 | 734 | l1 = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "lines.shp"), "lines", "ogr")
|
737 | 735 | project.addMapLayers([l0, l1])
|
738 | 736 |
|
739 |
| - self.assertTrue(project.zip(tmpFile.fileName())) |
| 737 | + self.assertTrue(project.write(tmpFile)) |
740 | 738 |
|
741 | 739 | 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) |
747 | 745 | layers = project2.mapLayers()
|
748 | 746 |
|
749 | 747 | self.assertEqual(len(layers.keys()), 2)
|
750 | 748 | self.assertTrue(layers[l0.id()].isValid(), True)
|
751 | 749 | self.assertTrue(layers[l1.id()].isValid(), True)
|
752 | 750 |
|
753 | 751 | project2.clear()
|
754 |
| - self.assertFalse(project2.unzipped()) |
| 752 | + self.assertFalse(project2.isZipped()) |
755 | 753 |
|
756 | 754 |
|
757 | 755 | if __name__ == '__main__':
|
|
0 commit comments