[Testing] migrating tests part2

applications/CableNetApplication/CMakeLists.txt

@@ -23,7 +23,7 @@ file(GLOB_RECURSE KRATOS_CABLE_NET_APPLICATION_CORE
 ## CableNet Testing sources
 if(${KRATOS_BUILD_TESTING} MATCHES ON)
     file(GLOB_RECURSE KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
-    kratos_add_gtests(TARGET KratosCableNetCore SOURCES "${KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN)
+    kratos_add_gtests(TARGET KratosCableNetCore SOURCES "${KRATOS_CABLE_NET_APPLICATION_TESTING_SOURCES}")
 endif(${KRATOS_BUILD_TESTING} MATCHES ON)
 
 ## CableNet python interface sources

applications/ChimeraApplication/CMakeLists.txt

@@ -28,7 +28,7 @@ endif(${KRATOS_BUILD_TESTING} MATCHES ON)
 ## ChimeraApplication Testing sources
 if(${KRATOS_BUILD_TESTING} MATCHES ON)
     file(GLOB_RECURSE KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
-    kratos_add_gtests(TARGET KratosChimeraApplicationCore SOURCES "${KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN)
+    kratos_add_gtests(TARGET KratosChimeraApplicationCore SOURCES "${KRATOS_CHIMERA_APPLICATION_TESTING_SOURCES}")
 endif(${KRATOS_BUILD_TESTING} MATCHES ON)
 
 ## ChimeraApplication python interface sources

applications/CompressiblePotentialFlowApplication/CMakeLists.txt

@@ -30,7 +30,7 @@ file( GLOB_RECURSE KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_PYTHON_INTERFACE
 ## define compressible potential application test sources
 if(${KRATOS_BUILD_TESTING} MATCHES ON)
  	file(GLOB_RECURSE KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/cpp_tests/*.cpp)
-    kratos_add_gtests(TARGET KratosCompressiblePotentialFlowCore SOURCES "${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES}" USE_CUSTOM_MAIN)
+    kratos_add_gtests(TARGET KratosCompressiblePotentialFlowCore SOURCES "${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_TESTING_SOURCES}")
 endif(${KRATOS_BUILD_TESTING} MATCHES ON)
 
 add_library(KratosCompressiblePotentialFlowCore SHARED ${KRATOS_COMPRESSIBLE_POTENTIAL_APPLICATION_CORE})

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.cpp

@@ -8,27 +8,20 @@
 //                   Kratos default license: kratos/license.txt
 //
 //  Main authors:    Richard Faasse
+//                   Carlos A. Roig
 //
 
-// External includes
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
 // Project includes
-#include "testing/testing.h"
-#include "compressible_potential_flow_application.h"
+#include "compressible_potential_flow_fast_suite.h"
 
-int main(int argc, char* argv[]) 
+namespace Kratos::Testing 
 {
-    ::testing::InitGoogleTest(&argc, argv);
-
-    Kratos::Testing::mApplicationInitializerList.push_back([](std::vector<Kratos::KratosApplication::Pointer> & rRegisteredApplications, Kratos::Kernel & rKernel) {
-      if (!rKernel.IsImported("CompressiblePotentialFlowApplication")) {
-        auto pApplication = std::make_shared<Kratos::KratosCompressiblePotentialFlowApplication>();
-        rKernel.ImportApplication(pApplication);
-        rRegisteredApplications.push_back(std::move(pApplication));
-      }
-    });
 
-    return RUN_ALL_TESTS();
+CompressiblePotentialFlowApplicationFastSuite::CompressiblePotentialFlowApplicationFastSuite()
+    : KratosCoreFastSuite() 
+{
+    mpCompressiblePotentialFlowApp = std::make_shared<KratosCompressiblePotentialFlowApplication>();
+    this->ImportApplicationIntoKernel(mpCompressiblePotentialFlowApp);
 }
+
+} // namespace Kratos::Testing

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/compressible_potential_flow_fast_suite.h

@@ -17,9 +17,9 @@
 
 namespace Kratos::Testing {
 
-class KratosCompressiblePotentialFlowFastSuite : public KratosCoreFastSuite {
+class CompressiblePotentialFlowApplicationFastSuite : public KratosCoreFastSuite {
 public:
-  KratosCompressiblePotentialFlowFastSuite();
+  CompressiblePotentialFlowApplicationFastSuite();
 
 private:
   KratosCompressiblePotentialFlowApplication::Pointer mpCompressiblePotentialFlowApp;

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/compressible_perturbation_potential_flow_element.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_perturbation_potential_element_3d.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/compressible_perturbation_potential_flow_element.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_compressible_potential_element.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/compressible_potential_flow_element.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_embedded_transonic_perturbation_potential_element.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/embedded_transonic_perturbation_potential_flow_element.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element.cpp

@@ -12,7 +12,7 @@
 //
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "containers/model.h"
 #include "includes/model_part.h"
 #include "compressible_potential_flow_application_variables.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_perturbation_potential_element_3d.cpp

@@ -12,7 +12,7 @@
 //
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "containers/model.h"
 #include "includes/model_part.h"
 #include "compressible_potential_flow_application_variables.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element.cpp

@@ -12,7 +12,7 @@
 //
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "containers/model.h"
 #include "includes/model_part.h"
 #include "compressible_potential_flow_application_variables.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_incompressible_potential_element_3d.cpp

@@ -12,7 +12,7 @@
 //
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "containers/model.h"
 #include "includes/model_part.h"
 #include "compressible_potential_flow_application_variables.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_operations.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "fluid_dynamics_application_variables.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "custom_operations/potential_to_compressible_navier_stokes_operation.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_potential_flow_utilities.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "custom_utilities/potential_flow_utilities.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_processes.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "custom_processes/move_model_part_process.h"
 #include "custom_processes/compute_embedded_lift_process.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/transonic_perturbation_potential_flow_element.h"

applications/CompressiblePotentialFlowApplication/tests/cpp_tests/test_transonic_perturbation_potential_element_3d.cpp

@@ -13,7 +13,7 @@
 
 // Project includes
 #include "containers/model.h"
-#include "testing/testing.h"
+#include "tests/cpp_tests/compressible_potential_flow_fast_suite.h"
 #include "compressible_potential_flow_application_variables.h"
 #include "fluid_dynamics_application_variables.h"
 #include "custom_elements/transonic_perturbation_potential_flow_element.h"

applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.cpp

@@ -8,27 +8,20 @@
 //                   Kratos default license: kratos/license.txt
 //
 //  Main authors:    Richard Faasse
+//                   Carlos A. Roig
 //
 
-// External includes
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
 // Project includes
-#include "testing/testing.h"
-#include "convection_diffusion_application.h"
+#include "convection_diffusion_fast_suite.h"
 
-int main(int argc, char* argv[]) 
+namespace Kratos::Testing 
 {
-    ::testing::InitGoogleTest(&argc, argv);
 
-    Kratos::Testing::mApplicationInitializerList.push_back([](std::vector<Kratos::KratosApplication::Pointer> & rRegisteredApplications, Kratos::Kernel & rKernel) {
-      if (!rKernel.IsImported("ConvectionDiffusionApplication")) {
-        auto pApplication = std::make_shared<Kratos::KratosConvectionDiffusionApplication>();
-        rKernel.ImportApplication(pApplication);
-        rRegisteredApplications.push_back(std::move(pApplication));
-      }
-    });
+KratosConvectionDiffusionFastSuite::KratosConvectionDiffusionFastSuite()
+    : KratosCoreFastSuite() 
+{
+    mpConvectionDiffusionApp = std::make_shared<KratosConvectionDiffusionApplication>();
+    this->ImportApplicationIntoKernel(mpConvectionDiffusionApp);
+}
 
-    return RUN_ALL_TESTS();
-}
+} // namespace Kratos::Testing

applications/ConvectionDiffusionApplication/tests/cpp_tests/convection_diffusion_fast_suite.h

@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include "convection_diffusion_application.h"
 #include "testing/testing.h"
+#include "convection_diffusion_application.h"
 
 namespace Kratos::Testing {
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_axisymmetric_eulerian_convection_diffusion.cpp

@@ -16,7 +16,7 @@
 
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_d_convection_diffusion_explicit_element.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_laplacian_element.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 #include "includes/variables.h"

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_embedded_mls_constraint_process.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/model_part.h"
 #include "includes/model_part_io.h"

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_conv_diff.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_eulerian_diff.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_laplacian_element.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_mixed_laplacian_element.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_qs_convection_diffusion_explicit_element.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/ConvectionDiffusionApplication/tests/cpp_tests/test_thermal_face.cpp

@@ -14,7 +14,7 @@
 // External includes
 
 // Project includes
-#include "testing/testing.h"
+#include "tests/cpp_tests/convection_diffusion_fast_suite.h"
 #include "containers/model.h"
 #include "includes/convection_diffusion_settings.h"
 

applications/FluidDynamicsApplication/custom_elements/dpg_vms.h

@@ -450,16 +450,19 @@ class DPGVMS : public VMS<TDim, TNumNodes>
 	    ElementBaseType::CalculateLocalVelocityContribution(rDampingMatrix, rRightHandSideVector, rCurrentProcessInfo);
 
 	    //compute boundary term
-	    int boundary_nodes = 0;
+	    // int boundary_nodes = 0;
 	    //unsigned int inside_index = -1;
-	    for (unsigned int i = 0; i < TNumNodes; i++)
-	    {
-	      double nd_flag = this->GetGeometry()[i].FastGetSolutionStepValue(FLAG_VARIABLE);
-	      if (nd_flag == 5.0)
-		boundary_nodes++;
-	      //else
-		//inside_index = i;
-	    }
+
+        // for (unsigned int i = 0; i < TNumNodes; i++)
+	    // {
+	    //   double nd_flag = this->GetGeometry()[i].FastGetSolutionStepValue(FLAG_VARIABLE);
+
+        //   if (nd_flag == 5.0) {
+		//     boundary_nodes++;
+        //   } else {
+		//     inside_index = i;
+        //   }
+	    // }
 
 
 	/*  if(boundary_nodes == TDim)

kratos/tests/test_utilities/test_suite.h

@@ -81,7 +81,6 @@ class KratosCoreStressSuite : public KratosCoreFastSuite {};
 // This classes are temporal and should be changed. Please see: GeoMechanicsApplication, StructuralMechanicsApplication or TrilinosApplication
 // TODO: Remove once every test includes its own suit
 class CompressiblePotentialApplicationFastSuite : public KratosCoreFastSuite {};
-class KratosConvectionDiffusionFastSuite : public KratosCoreFastSuite {};
 class KratosCSharpWrapperApplicationFastSuite : public KratosCoreFastSuite {};
 class ExaquteSandboxApplicationFastSuite : public KratosCoreFastSuite {};
 class FSIApplicationFastSuite : public KratosCoreFastSuite {};

kratos/utilities/enrichment_utilities.h

@@ -1238,7 +1238,7 @@ class EnrichmentUtilities
         BoundedMatrix<double, 3, 2 > coord_subdomain; //used to pass arguments when we must calculate areas, shape functions, etc
         BoundedMatrix<double,3,2> DN_DX_subdomain; //used to retrieve derivatives
 
-        double most_common_sign=0; //the side of the cut in which two nodes are found (same sign) will be the ones that remains unchanged when builing the discontinuity
+        // double most_common_sign=0; //the side of the cut in which two nodes are found (same sign) will be the ones that remains unchanged when builing the discontinuity
         double Area;//area of the complete element
         rGPShapeFunctionValues(0,0)=one_third;
         rGPShapeFunctionValues(0,1)=one_third;
@@ -1392,12 +1392,12 @@ class EnrichmentUtilities
             if (rDistances[i] < 0.0)
             {
                 exact_distance[i] = -abs_distance[i];
-                --most_common_sign;
+                // --most_common_sign;
             }
             else
             {
                 exact_distance[i] = abs_distance[i];
-                ++most_common_sign;
+                // ++most_common_sign;
             }
         }