create a dedicated repository for core/geometry tests

qgis · Aug 19, 2021 · e690c8e · e690c8e
1 parent a25f798
commit e690c8e
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -61,9 +61,7 @@ set(TESTS
  testqgsgdalprovider.cpp
  testqgsgdalutils.cpp
  testqgsgenericspatialindex.cpp
- testqgsgeometry.cpp
  testqgsgeometryimport.cpp
- testqgsgeometryutils.cpp
  testqgsgeonodeconnection.cpp
  testqgsgeopdfexport.cpp
  testqgsgml.cpp
@@ -135,7 +133,6 @@ set(TESTS
  testqgspainteffect.cpp
  testqgspainteffectregistry.cpp
  testqgspallabeling.cpp
- testqgspoint.cpp
  testqgspointcloudattribute.cpp
  testqgspointcloudrendererregistry.cpp
  testqgspointlocator.cpp
@@ -157,7 +154,6 @@ set(TESTS
  testqgsrasterlayertemporalproperties.cpp
  testqgsrastermarker.cpp
  testqgsrastersublayer.cpp
- testqgsrectangle.cpp
  testqgsrelationreferencefieldformatter.cpp
  testqgsrenderers.cpp
  testqgsrulebasedrenderer.cpp
@@ -222,3 +218,5 @@ add_qgis_test(testqgscoordinatereferencesystem.cpp MODULE core LINKEDLIBRARIES q
 if (ENABLE_PGTEST)
   SET_TESTS_PROPERTIES(test_core_vectorlayerjoinbuffer PROPERTIES LABELS "POSTGRES")
 endif()
+
+add_subdirectory(geometry)
diff --git a/tests/src/core/geometry/CMakeLists.txt b/tests/src/core/geometry/CMakeLists.txt
@@ -0,0 +1,25 @@
+#####################################################
+# Don't forget to include output directory, otherwise
+# the UI file won't be wrapped!
+get_filename_component(PARENT_DIR ../ ABSOLUTE)
+
+include_directories(
+  ${PARENT_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src/test
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+#############################################################
+# Tests:
+
+set(TESTS
+  testqgsgeometry.cpp
+  testqgsgeometryutils.cpp
+  testqgspointxy.cpp
+  testqgsrectangle.cpp
+  )
+
+foreach(TESTSRC ${TESTS})
+  add_qgis_test(${TESTSRC} MODULE app LINKEDLIBRARIES qgis_app)
+endforeach(TESTSRC)
diff --git a/tests/src/core/testqgsgeometry.cpp → tests/src/core/geometry/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp → tests/src/core/geometry/testqgsgeometry.cpp
diff --git a/tests/src/core/testqgsgeometryutils.cpp → ...rc/core/geometry/testqgsgeometryutils.cpp b/tests/src/core/testqgsgeometryutils.cpp → ...rc/core/geometry/testqgsgeometryutils.cpp
diff --git a/tests/src/core/testqgspoint.cpp → tests/src/core/geometry/testqgspointxy.cpp b/tests/src/core/testqgspoint.cpp → tests/src/core/geometry/testqgspointxy.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-     test_template.cpp
+     testqgspointxy.cpp
      --------------------------------------
     Date                 : Sun Sep 16 12:22:23 AKDT 2007
     Copyright            : (C) 2007 by Gary E. Sherman
@@ -403,4 +403,4 @@ void TestQgsPointXY::isEmpty()
 }
 
 QGSTEST_MAIN( TestQgsPointXY )
-#include "testqgspoint.moc"
+#include "testqgspointxy.moc"
diff --git a/tests/src/core/testqgsrectangle.cpp → tests/src/core/geometry/testqgsrectangle.cpp b/tests/src/core/testqgsrectangle.cpp → tests/src/core/geometry/testqgsrectangle.cpp