Skip to content

Commit

Permalink
move tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry committed Apr 5, 2020
1 parent 9011ef6 commit 36eb362
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 49 deletions.
21 changes: 1 addition & 20 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,20 +1 @@
test/** export-ignore
*/test/** export-ignore
/doc/* export-ignore
/resources/i18n/*.ts export-ignore
/.github/** export-ignore
/.tx/* export-ignore
.flake8 export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.gitlab-ci.yml export-ignore
.gitmodules export-ignore
.travis.yml export-ignore
Makefile export-ignore
README.md export-ignore
run-env-linux.sh export-ignore
requirements_dev.txt export-ignore
resources.qrc export-ignore
release.sh export-ignore
test_suite.py export-ignore
update_strings.sh export-ignore
QuickOSM/test export-ignore
2 changes: 0 additions & 2 deletions .gitlab-ci.yml

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
start_tests:
@echo 'Start docker-compose'
@cd docker && ./start.sh
@cd .docker && ./start.sh

run_tests:
@echo 'Running tests, containers must be running'
@cd docker && ./exec.sh
@cd .docker && ./exec.sh

stop_tests:
@echo 'Stopping/killing containers'
@cd docker && ./stop.sh
@cd .docker && ./stop.sh

tests: start_tests run_tests stop_tests
Empty file removed QuickOSM/core/api/test/__init__.py
Empty file.
4 changes: 0 additions & 4 deletions QuickOSM/core/test/__init__.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from qgis.testing import unittest, start_app
from qgis.testing.mocked import get_iface

from ..dialog import Dialog
from ...core.utilities.tools import (
from QuickOSM.ui.dialog import Dialog
from QuickOSM.core.utilities.tools import (
get_setting,
)
from ...definitions.overpass import OVERPASS_SERVERS
from QuickOSM.definitions.overpass import OVERPASS_SERVERS


start_app()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from qgis.testing import unittest
from qgis.PyQt.QtCore import QUrl, QUrlQuery

from ..connexion_oapi import ConnexionOAPI
from ...exceptions import (
from QuickOSM.core.api.connexion_oapi import ConnexionOAPI
from QuickOSM.core.exceptions import (
OverpassBadRequestException,
OverpassTimeoutException,
OverpassMemoryException,
OverpassRuntimeError,
)
from ....definitions.overpass import OVERPASS_SERVERS
from ....qgis_plugin_tools.tools.resources import plugin_test_data_path
from QuickOSM.definitions.overpass import OVERPASS_SERVERS
from QuickOSM.qgis_plugin_tools.tools.resources import plugin_test_data_path

__copyright__ = 'Copyright 2019, 3Liz'
__license__ = 'GPL version 3'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from qgis.testing import unittest, start_app
from qgis.testing.mocked import get_iface

from ...definitions.gui import Panels
from ..dialog import Dialog
from QuickOSM.definitions.gui import Panels
from QuickOSM.ui.dialog import Dialog


start_app()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from qgis.testing import unittest, start_app
from qgis.testing.mocked import get_iface

from ...definitions.gui import Panels
from ..dialog import Dialog
from QuickOSM.definitions.gui import Panels
from QuickOSM.ui.dialog import Dialog

start_app()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from qgis.testing import unittest

from ..exceptions import QueryFactoryException
from ..query_factory import QueryFactory
from ...definitions.osm import QueryType, OsmType
from QuickOSM.core.exceptions import QueryFactoryException
from QuickOSM.core.query_factory import QueryFactory
from QuickOSM.definitions.osm import QueryType, OsmType

__copyright__ = 'Copyright 2019, 3Liz'
__license__ = 'GPL version 3'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

from qgis.core import QgsRectangle

from ..query_preparation import QueryPreparation
from ..api.nominatim import Nominatim
from QuickOSM.core.query_preparation import QueryPreparation
from QuickOSM.core.api.nominatim import Nominatim

__copyright__ = 'Copyright 2019, 3Liz'
__license__ = 'GPL version 3'
Expand Down
4 changes: 0 additions & 4 deletions QuickOSM/ui/test/__init__.py

This file was deleted.

0 comments on commit 36eb362

Please sign in to comment.