Split testqgsprocessingalgs.cpp into two parts to avoid timeouts on CI

agiudiceandrea · Feb 23, 2022 · a5f63ae · a5f63ae
1 parent 6c66382
commit a5f63ae
Show file tree

Hide file tree

Showing 7 changed files with 1,971 additions and 1,663 deletions.
diff --git a/src/analysis/processing/qgsalgorithmgpsbabeltools.h b/src/analysis/processing/qgsalgorithmgpsbabeltools.h
@@ -78,7 +78,7 @@ class ANALYSIS_EXPORT QgsConvertGpxFeatureTypeAlgorithm : public QgsProcessingAl
       QStringList &logArgs
     );
 
-    friend class TestQgsProcessingAlgs;
+    friend class TestQgsProcessingAlgsPt2;
 
 };
 

diff --git a/src/analysis/processing/qgsalgorithmimportphotos.h b/src/analysis/processing/qgsalgorithmimportphotos.h
@@ -59,7 +59,7 @@ class ANALYSIS_EXPORT QgsImportPhotosAlgorithm : public QgsProcessingAlgorithm
     static QVariant extractOrientationFromMetadata( const QVariantMap &metadata );
     static QVariant extractTimestampFromMetadata( const QVariantMap &metadata );
 
-    friend class TestQgsProcessingAlgs;
+    friend class TestQgsProcessingAlgsPt1;
 };
 
 ///@endcond PRIVATE

diff --git a/src/analysis/processing/qgsalgorithmkmeansclustering.h b/src/analysis/processing/qgsalgorithmkmeansclustering.h
@@ -67,7 +67,7 @@ class ANALYSIS_EXPORT QgsKMeansClusteringAlgorithm : public QgsProcessingAlgorit
     static void findNearest( std::vector< Feature > &points, const std::vector< QgsPointXY > &centers, int k, bool &changed );
     static void updateMeans( const std::vector< Feature > &points, std::vector< QgsPointXY > &centers, std::vector< uint > &weights, int k );
 
-    friend class TestQgsProcessingAlgs;
+    friend class TestQgsProcessingAlgsPt1;
 };
 
 ///@endcond PRIVATE

diff --git a/src/analysis/processing/qgsalgorithmrasterlogicalop.h b/src/analysis/processing/qgsalgorithmrasterlogicalop.h
@@ -62,7 +62,7 @@ class ANALYSIS_EXPORT QgsRasterBooleanLogicAlgorithmBase : public QgsProcessingA
     double mRasterUnitsPerPixelX;
     double mRasterUnitsPerPixelY;
     bool mTreatNodataAsFalse = false;
-    friend class TestQgsProcessingAlgs;
+    friend class TestQgsProcessingAlgsPt1;
 };
 
 /**

diff --git a/tests/src/analysis/CMakeLists.txt b/tests/src/analysis/CMakeLists.txt
@@ -20,7 +20,8 @@ endif()
 set(TESTS
  testqgsgeometrysnapper.cpp
  testqgsinterpolator.cpp
- testqgsprocessingalgs.cpp
+ testqgsprocessingalgspt1.cpp
+ testqgsprocessingalgspt2.cpp
  testqgsprocessingmodelalgorithm.cpp
  testqgszonalstatistics.cpp
  testqgsrastercalculator.cpp
-Original file line number
+Diff line change
@@ Expand Up @@
           QStringList &logArgs
         );
-        friend class TestQgsProcessingAlgs;
+        friend class TestQgsProcessingAlgsPt2;
     };
@@ Expand Down @@