HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1333:f1b0e148bd5a

Added fuzzy tests and small fixes on meson files...

jeandet -

r1333:f1b0e148bd5a

parent child

Context file:

r1333:f1b0e148bd5a

core/meson.build +2 -2

             qxorm_dep = dependency('QxOrm', required : true, fallback:['QxOrm','qxorm_dep'])
             catalogueapi_dep = dependency('CatalogueAPI', required : true, fallback:['CatalogueAPI','CatalogueAPI_dep'])
             core_moc_headers = [
               'include/Catalogue/CatalogueController.h',
               'include/Common/SignalWaiter.h',
               'include/Data/IDataProvider.h',
               'include/DataSource/DataSourceController.h',
               'include/DataSource/DataSourceItemAction.h',
               'include/Network/NetworkController.h',
               'include/Time/TimeController.h',
               'include/Variable/Variable.h',
               'include/Variable/VariableCacheController.h',
               'include/Variable/VariableController.h',
               'include/Variable/VariableAcquisitionWorker.h',
               'include/Variable/VariableSynchronizationGroup.h',
               'include/Variable/VariableModel.h',
               'include/Visualization/VisualizationController.h'
             ]
             core_moc_files = qt5.preprocess(moc_headers : core_moc_headers)
             core_sources = [
               'src/Common/DateUtils.cpp',
               'src/Common/SignalWaiter.cpp',
               'src/Common/StringUtils.cpp',
               'src/Common/MimeTypesDef.cpp',
               'src/Catalogue/CatalogueController.cpp',
               'src/Data/ScalarSeries.cpp',
               'src/Data/SpectrogramSeries.cpp',
               'src/Data/DataSeriesIterator.cpp',
               'src/Data/ArrayDataIterator.cpp',
               'src/Data/VectorSeries.cpp',
               'src/Data/OptionalAxis.cpp',
               'src/Data/DataSeriesUtils.cpp',
               'src/DataSource/DataSourceController.cpp',
               'src/DataSource/DataSourceItem.cpp',
               'src/DataSource/DataSourceItemAction.cpp',
               'src/DataSource/DataSourceItemMergeHelper.cpp',
               'src/Network/NetworkController.cpp',
-              'src/Plugin/PluginManager.cpp',
+              'src/PluginManager/PluginManager.cpp',
               'src/Settings/SqpSettingsDefs.cpp',
               'src/Time/TimeController.cpp',
               'src/Variable/Variable.cpp',
               'src/Variable/VariableCacheController.cpp',
               'src/Variable/VariableController.cpp',
               'src/Variable/VariableAcquisitionWorker.cpp',
               'src/Variable/VariableSynchronizationGroup.cpp',
               'src/Variable/VariableModel.cpp',
               'src/Visualization/VisualizationController.cpp'
             ]
-            core_inc = include_directories(['include', '../plugin/include'])
+            core_inc = include_directories(['include', 'include/Plugin'])
             sciqlop_core_lib = library('sciqlopcore',
                                    core_sources,
                                    core_moc_files,
                                    cpp_args : '-DCORE_LIB',
                                    include_directories : core_inc,
                                    dependencies : [qt5core, qt5network, catalogueapi_dep],
                                    install : true
                                    )
             sciqlop_core = declare_dependency(link_with : sciqlop_core_lib,
                                             include_directories : core_inc,
                                             dependencies : [qt5core, qt5network, catalogueapi_dep])
             subdir('tests')

plugins/amda/CMakeLists.txt +10 -1

             include_directories(include)
             FILE (GLOB_RECURSE amdaplugin_SRCS
                     include/*.h
                     src/*.cpp
                     resources/*.qrc
                     )
+            set(AMDA_server_type hybrid CACHE STRING "AMDA server type selected at CMake configure time")
+            set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
+              "List of possible for AMDA server type")
+            set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
+            add_definitions(-DSCIQLOP_AMDA_SERVER="{AMDA_server_type}")
             add_definitions(-DQT_PLUGIN)
             add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
             if(NOT BUILD_SHARED_LIBS)
                 add_definitions(-DQT_STATICPLUGIN)
             endif()
             add_library(amdaplugin ${amdaplugin_SRCS})
             SET_TARGET_PROPERTIES(amdaplugin PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
             target_link_libraries(amdaplugin PUBLIC sciqlopgui)
             install(TARGETS amdaplugin
                 ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
                 LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}/SciQlop
                 RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR})
             include(sciqlop_tests)
             add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
             declare_test(TestAmdaParser TestAmdaParser tests/TestAmdaParser.cpp "amdaplugin;Qt5::Test")
             declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParser.cpp "amdaplugin;Qt5::Test")
             declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
+            declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")

plugins/amda/meson.build +2 -2

             amdaplugin_moc_headers = [
               'include/AmdaPlugin.h',
               'include/AmdaProvider.h'
             ]
             amdaplugin_sources = [
               'src/AmdaDefs.cpp',
               'src/AmdaParser.cpp',
               'src/AmdaPlugin.cpp',
               'src/AmdaProvider.cpp',
               'src/AmdaResultParser.cpp',
               'src/AmdaResultParserDefs.cpp',
               'src/AmdaResultParserHelper.cpp',
               'src/AmdaServer.cpp'
             ]
             amdaplugin_ui_files = []
             amdaplugin_resources_files = [
               'resources/amdaresources.qrc'
             ]
-            amdaplugin_inc = include_directories(['include', '../../plugin/include'])
+            amdaplugin_inc = include_directories(['include'])
             moc_gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
                              '-I', meson.current_source_dir()+'/include',
-                             '-I', meson.current_source_dir()+'/../../plugin/include',
+                             '-I', meson.current_source_dir()+'/../../core/include/',
                              '-o', '@OUTPUT@'])
             rcc_gen = generator(rcc,
                             output  : 'qrc_@BASENAME@.cpp',
                             arguments : ['--name=@BASENAME@"',
                              '--output',
                              '@OUTPUT@',
                              '@INPUT@'])
             amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers)
             amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files)
             #amdaplugin_rcc_plugin_files = qt5.preprocess(
             #                               qresources : amdaplugin_resources_files)
             amdaplugin_moc_files = qt5.preprocess(
                                            ui_files : amdaplugin_ui_files)
             sciqlop_amdaplugin = library('amdaplugin',
                                    amdaplugin_sources,
                                    amdaplugin_moc_files,
                                    amdaplugin_rcc_plugin_files,
                                    amdaplugin_moc_plugin_files,
                                    cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'],
                                    include_directories : [amdaplugin_inc],
                                    dependencies : [sciqlop_core, sciqlop_gui],
                                    install : true
                                    )
             tests = [
               [['tests/TestAmdaParser.cpp'],'test_amda_parser','AMDA parser test'],
               [['tests/TestAmdaResultParser.cpp'],'test_amda_result_parser','AMDA result parser test'],
               [['tests/TestAmdaAcquisition.cpp'],'test_amda_acquisition','AMDA Acquisition test'],
               [['tests/TestAmdaFuzzing.cpp'],'test_amda_fuzzing','AMDA fuzzing test']
             ]
             tests_sources = [
               'tests/FuzzingDefs.h',
               'tests/FuzzingDefs.cpp',
               'tests/FuzzingOperations.h',
               'tests/FuzzingOperations.cpp',
               'tests/FuzzingUtils.h',
               'tests/FuzzingUtils.cpp',
               'tests/FuzzingValidators.h',
               'tests/FuzzingValidators.cpp'
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : [sciqlop_amdaplugin],
                                       include_directories : [amdaplugin_inc],
                                       cpp_args : ['-DAMDA_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
             						  sources : [tests_sources],
                                       dependencies : [sciqlop_core, sciqlop_gui, qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
             endforeach

plugins/mockplugin/meson.build +3 -3

             mockplugin_moc_headers = [
               'include/MockPlugin.h'
             ]
             mockplugin_sources = [
               'src/MockDefs.cpp',
               'src/CosinusProvider.cpp',
               'src/MockPlugin.cpp'
             ]
-            mockplugin_inc = include_directories(['include', '../../plugin/include'])
+            mockplugin_inc = include_directories(['include'])
             gen = generator(moc,
                             output  : 'moc_@BASENAME@.cpp',
                             arguments : ['@INPUT@',
                              '-DPLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/mockplugin/resources/mockplugin.json"',
                              '-I', meson.current_source_dir()+'/include',
-                             '-I', meson.current_source_dir()+'/../../plugin/include',
+                             '-I', meson.current_source_dir()+'/../../core/include/',
                              '-o', '@OUTPUT@'])
             mockplugin_moc_files = gen.process(mockplugin_moc_headers)
             sciqlop_mockplugin = library('mockplugin',
                                    mockplugin_sources,
                                    mockplugin_moc_files,
                                    cpp_args : '-DMOCKPLUGIN_LIB',
                                    include_directories : [mockplugin_inc],
                                    dependencies : [sciqlop_core, sciqlop_gui],
                                    install : true
                                    )
             tests = [
               [['tests/TestCosinusAcquisition.cpp'],'test_cosinus_acquisition','Cosinus Acquisition test']
             ]
             foreach unit_test : tests
               test_moc_files = qt5.preprocess(moc_sources : unit_test[0])
               test_exe = executable(unit_test[1],unit_test[0] , test_moc_files,
                                       link_with : [sciqlop_mockplugin],
                                       include_directories : [mockplugin_inc],
                                       cpp_args : ['-DMOCKPLUGIN_TESTS_RESOURCES_DIR="'+meson.current_source_dir()+'/tests-resources"'],
                                       dependencies : [sciqlop_core, sciqlop_gui, qt5test])
               test(unit_test[2], test_exe, args: ['-teamcity', '-o', '@0@.teamcity.txt'.format(unit_test[1])], timeout: 3 * 60)
-            endforeach
  No newline at end of file
+            endforeach

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages