From f1b0e148bd5a9fec6d1a989b8bec973139d65e8c 2018-01-19 21:52:17
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2018-01-19 21:52:17
Subject: [PATCH] Added fuzzy tests and small fixes on meson files

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/core/meson.build b/core/meson.build
index 8ce78de..3bb7dfd 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -41,7 +41,7 @@ core_sources = [
   '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',
@@ -53,7 +53,7 @@ core_sources = [
   '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,
diff --git a/plugins/amda/CMakeLists.txt b/plugins/amda/CMakeLists.txt
index 1e8a238..721c242 100644
--- a/plugins/amda/CMakeLists.txt
+++ b/plugins/amda/CMakeLists.txt
@@ -5,6 +5,15 @@ FILE (GLOB_RECURSE amdaplugin_SRCS
         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)
@@ -28,4 +37,4 @@ add_definitions(-DAMDA_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-reso
 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")
diff --git a/plugins/amda/meson.build b/plugins/amda/meson.build
index 6c4e483..d45f874 100644
--- a/plugins/amda/meson.build
+++ b/plugins/amda/meson.build
@@ -20,14 +20,14 @@ 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,
diff --git a/plugins/mockplugin/meson.build b/plugins/mockplugin/meson.build
index fb1070b..3404ed3 100644
--- a/plugins/mockplugin/meson.build
+++ b/plugins/mockplugin/meson.build
@@ -9,7 +9,7 @@ mockplugin_sources = [
   'src/MockPlugin.cpp'
 ]
 
-mockplugin_inc = include_directories(['include', '../../plugin/include'])
+mockplugin_inc = include_directories(['include'])
 
 
 gen = generator(moc,
@@ -17,7 +17,7 @@ gen = generator(moc,
                 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)
@@ -43,4 +43,4 @@ foreach unit_test : tests
                           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