Add python modules tests (#54)

* Add types with modules to api tests Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Update Participant tests to use the right type name Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Add Windows LoadLibrary for moduled types Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Add README.md with the guide to re-generate the types Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Use types from modules in complete type Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Uncomment sequence<boolean> types Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Fix README.md with correct path Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Update generated types Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Regenerate tests types code with Fast DDS Gen v3.0.0 Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Regenerate test data types after rebase Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Do not compile test by default Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Compile tests only for fastdds_python Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Add missing changes in auto-generated data types Signed-off-by: Raul Sanchez-Mateos <[email protected]> * Fix generation of IDL files Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #18687. Fix cmakelists.txt Signed-off-by: Ricardo González <[email protected]> * Fix tests on windows Signed-off-by: Ricardo González <[email protected]> --------- Signed-off-by: Raul Sanchez-Mateos <[email protected]> Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: Ricardo González <[email protected]> Co-authored-by: Ricardo González Moreno <[email protected]> Co-authored-by: Ricardo González <[email protected]>
eProsima · Oct 2, 2023 · bc064cd · bc064cd
1 parent bbb019c
commit bc064cd
Show file tree

Hide file tree

Showing 37 changed files with 15,848 additions and 123 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -140,8 +140,12 @@ jobs:
 
       - name: Build workspace
         run: >
-          colcon build --event-handlers=console_direct+ --metas ./src/fastdds_python/.github/workflows/test.meta \
-            --cmake-args -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+          colcon build \
+            --event-handlers=console_direct+ \
+            --metas ./src/fastdds_python/.github/workflows/test.meta \
+            --cmake-args \
+              -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+              -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Run tests
         run: |

diff --git a/.github/workflows/test.meta b/.github/workflows/test.meta
@@ -1,12 +1,18 @@
 {
     "names":
     {
-        "fastrtps" :
+        "fastrtps":
         {
             "cmake-args": [
                 "-DTHIRDPARTY=ON",
                 "-DSECURITY=ON",
             ]
+        },
+        "fastdds_python":
+        {
+            "cmake-args": [
+                "-DBUILD_TESTING=ON"
+            ]
         }
     }
 }
diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
@@ -26,6 +26,12 @@ endif()
 
 project(fastdds_python VERSION 1.2.2)
 
+# Set BUILD_TESTING to OFF by default.
+if(NOT BUILD_TESTING)
+    message(STATUS "Tests not compiled by default")
+    set(BUILD_TESTING OFF CACHE BOOL "Enable testing" FORCE)
+endif()
+
 ###############################################################################
 # Dependencies
 ###############################################################################
@@ -50,4 +56,7 @@ add_subdirectory(src/swig)
 ###############################################################################
 enable_testing()
 include(CTest)
-add_subdirectory(test)
+
+if (BUILD_TESTING)
+  add_subdirectory(test)
+endif()
diff --git a/fastdds_python/test/README.md b/fastdds_python/test/README.md
@@ -0,0 +1,8 @@
+# How to re-generate data types for python
+
+1.  Navigate to `fastdds_python/test/types`
+2.  Run Fast DDS Gen script
+
+    ```bash
+    fastddsgen -python -replace test_complete.idl test_modules.idl
+    ```
diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py
@@ -4,39 +4,44 @@
 if os.name == 'nt':
     import win32api
     win32api.LoadLibrary('test_complete')
+    win32api.LoadLibrary('test_modules')
 
 import fastdds
 import pytest
-import test_complete
 import time
 
 
 class DataReaderListener (fastdds.DataReaderListener):
     def __init__(self):
         super().__init__()
 
+@pytest.fixture(params=['no_module', 'module'], autouse=True)
+def data_type(request):
+    if request.param == 'no_module':
+        pytest.dds_type = __import__("test_complete")
+    else:
+        pytest.dds_type = __import__("eprosima.test.test_modules",
+                                    fromlist=[None])
 
 @pytest.fixture
 def participant():
     factory = fastdds.DomainParticipantFactory.get_instance()
     return factory.create_participant(
             0, fastdds.PARTICIPANT_QOS_DEFAULT)
 
-
 @pytest.fixture
 def subscriber(participant):
     return participant.create_subscriber(fastdds.SUBSCRIBER_QOS_DEFAULT)
 
 
 @pytest.fixture
 def test_type():
-    return fastdds.TypeSupport(
-            test_complete.CompleteTestTypePubSubType())
+    return fastdds.TypeSupport(pytest.dds_type.CompleteTestTypePubSubType())
 
 
 @pytest.fixture
 def test_keyed_type(test_type):
-    test_type.set(test_complete.KeyedCompleteTestTypePubSubType())
+    test_type.set(pytest.dds_type.KeyedCompleteTestTypePubSubType())
 
 
 @pytest.fixture
@@ -161,7 +166,7 @@ def test_get_first_untaken(transient_datareader_qos, datareader,
     qos = datawriter.get_qos()
     assert(fastdds.TRANSIENT_LOCAL_DURABILITY_QOS == qos.durability().kind)
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
@@ -195,7 +200,7 @@ def test_get_key_value(test_keyed_type, datareader):
     This test checks:
     - DataReader::get_key_value
     """
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(255)
     ih = fastdds.InstanceHandle_t()
     assert(fastdds.ReturnCode_t.RETCODE_UNSUPPORTED ==
@@ -444,7 +449,7 @@ def test_get_unread_count(transient_datareader_qos, datareader,
     """
     assert(0 == datareader.get_unread_count())
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
@@ -459,13 +464,13 @@ def test_is_sample_valid(transient_datareader_qos, datareader,
     This test checks:
     - DataReader::is_sample_valid
     """
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
     assert(datareader.wait_for_unread_message(
         fastdds.Duration_t(5, 0)))
-    data = test_complete.CompleteTestType()
+    data = pytest.dds_type.CompleteTestType()
     info = fastdds.SampleInfo()
     assert(fastdds.ReturnCode_t.RETCODE_OK ==
            datareader.read_next_sample(data, info))
@@ -485,7 +490,7 @@ def test_lookup_instance(transient_datareader_qos, test_keyed_type, datareader,
     assert(fastdds.c_InstanceHandle_Unknown == ih)
 
     # Test when instance is not registered
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(3)
     ih = datareader.lookup_instance(sample)
     assert(fastdds.c_InstanceHandle_Unknown == ih)
@@ -509,7 +514,7 @@ def test_read(transient_datareader_qos, datareader,
     - DataReader::read
     - DataReader::return_loan
     """
-    data_seq = test_complete.CompleteTestTypeSeq()
+    data_seq = pytest.dds_type.CompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
            datareader.read(
@@ -519,7 +524,7 @@ def test_read(transient_datareader_qos, datareader,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
@@ -544,7 +549,7 @@ def test_read_instance(transient_datareader_qos, test_keyed_type,
     - DataReader::read_instance
     - DataReader::return_loan
     """
-    data_seq = test_complete.KeyedCompleteTestTypeSeq()
+    data_seq = pytest.dds_type.KeyedCompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     ih = fastdds.InstanceHandle_t()
     assert(fastdds.ReturnCode_t.RETCODE_BAD_PARAMETER ==
@@ -555,7 +560,7 @@ def test_read_instance(transient_datareader_qos, test_keyed_type,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(255)
     ih = datawriter.register_instance(sample)
     assert(datawriter.write(sample, ih))
@@ -582,7 +587,7 @@ def test_read_next_instance(transient_datareader_qos, test_keyed_type,
     - DataReader::read_next_instance
     - DataReader::return_loan
     """
-    data_seq = test_complete.KeyedCompleteTestTypeSeq()
+    data_seq = pytest.dds_type.KeyedCompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     ih = fastdds.InstanceHandle_t()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
@@ -593,7 +598,7 @@ def test_read_next_instance(transient_datareader_qos, test_keyed_type,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(255)
     assert(datawriter.write(sample))
 
@@ -618,13 +623,13 @@ def test_read_next_sample(transient_datareader_qos, datareader,
     This test checks:
     - DataReader::read_next_sample
     """
-    data = test_complete.CompleteTestType()
+    data = pytest.dds_type.CompleteTestType()
     info = fastdds.SampleInfo()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
            datareader.read_next_sample(
                 data, info))
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
@@ -643,7 +648,7 @@ def test_take(transient_datareader_qos, datareader,
     - DataReader::take
     - DataReader::return_loan
     """
-    data_seq = test_complete.CompleteTestTypeSeq()
+    data_seq = pytest.dds_type.CompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
            datareader.take(
@@ -653,7 +658,7 @@ def test_take(transient_datareader_qos, datareader,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))
 
@@ -678,7 +683,7 @@ def test_take_instance(transient_datareader_qos, test_keyed_type,
     - DataReader::take_instance
     - DataReader::return_loan
     """
-    data_seq = test_complete.KeyedCompleteTestTypeSeq()
+    data_seq = pytest.dds_type.KeyedCompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     ih = fastdds.InstanceHandle_t()
     assert(fastdds.ReturnCode_t.RETCODE_BAD_PARAMETER ==
@@ -689,7 +694,7 @@ def test_take_instance(transient_datareader_qos, test_keyed_type,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(255)
     ih = datawriter.register_instance(sample)
     assert(datawriter.write(sample, ih))
@@ -716,7 +721,7 @@ def test_take_next_instance(transient_datareader_qos, test_keyed_type,
     - DataReader::take_next_instance
     - DataReader::return_loan
     """
-    data_seq = test_complete.KeyedCompleteTestTypeSeq()
+    data_seq = pytest.dds_type.KeyedCompleteTestTypeSeq()
     info_seq = fastdds.SampleInfoSeq()
     ih = fastdds.InstanceHandle_t()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
@@ -727,7 +732,7 @@ def test_take_next_instance(transient_datareader_qos, test_keyed_type,
     assert(0 == len(data_seq))
     assert(0 == len(info_seq))
 
-    sample = test_complete.KeyedCompleteTestType()
+    sample = pytest.dds_type.KeyedCompleteTestType()
     sample.id(255)
     assert(datawriter.write(sample))
 
@@ -752,13 +757,13 @@ def test_take_next_sample(transient_datareader_qos, datareader,
     This test checks:
     - DataReader::take_next_sample
     """
-    data = test_complete.CompleteTestType()
+    data = pytest.dds_type.CompleteTestType()
     info = fastdds.SampleInfo()
     assert(fastdds.ReturnCode_t.RETCODE_NO_DATA ==
            datareader.take_next_sample(
                 data, info))
 
-    sample = test_complete.CompleteTestType()
+    sample = pytest.dds_type.CompleteTestType()
     sample.int16_field(255)
     assert(datawriter.write(sample))