From 5198ad01cf53ec30930a006a0aef2600ef5712b3 Mon Sep 17 00:00:00 2001 From: Timofey Date: Thu, 29 Sep 2016 18:24:42 +0300 Subject: [PATCH 1/2] Moved osm server api test to Intergraion tests --- editor/editor_tests/editor_tests.pro | 1 - editor/osm_auth_tests/osm_auth_tests.pro | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/editor/editor_tests/editor_tests.pro b/editor/editor_tests/editor_tests.pro index 4ca787853a..dad85af705 100644 --- a/editor/editor_tests/editor_tests.pro +++ b/editor/editor_tests/editor_tests.pro @@ -20,7 +20,6 @@ SOURCES += \ editor_notes_test.cpp \ opening_hours_ui_test.cpp \ osm_feature_matcher_test.cpp \ - server_api_test.cpp \ ui2oh_test.cpp \ user_stats_test.cpp \ xml_feature_test.cpp \ diff --git a/editor/osm_auth_tests/osm_auth_tests.pro b/editor/osm_auth_tests/osm_auth_tests.pro index aad9e466e1..abad2cda56 100644 --- a/editor/osm_auth_tests/osm_auth_tests.pro +++ b/editor/osm_auth_tests/osm_auth_tests.pro @@ -16,3 +16,4 @@ HEADERS += \ SOURCES += \ $$ROOT_DIR/testing/testingmain.cpp \ osm_auth_tests.cpp \ + server_api_test.cpp \ From 69a1c2bd2c96e665ac2553210a61c3539a7d3154 Mon Sep 17 00:00:00 2001 From: Timofey Date: Thu, 29 Sep 2016 19:08:07 +0300 Subject: [PATCH 2/2] Moved the file as well. --- editor/{editor_tests => osm_auth_tests}/server_api_test.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename editor/{editor_tests => osm_auth_tests}/server_api_test.cpp (100%) diff --git a/editor/editor_tests/server_api_test.cpp b/editor/osm_auth_tests/server_api_test.cpp similarity index 100% rename from editor/editor_tests/server_api_test.cpp rename to editor/osm_auth_tests/server_api_test.cpp