erp5_wendelin: fix script query states and tests

See merge request nexedi/wendelin!92

bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataSet_getDataStreamList.py

@@ -10,7 +10,7 @@ if data_ingestion_line_list:
   data_ingestion_uid_list = [x.uid for x in data_ingestion_line_list]
   catalog_kw = {'portal_type': 'Data Stream',
                 'aggregate__related__uid': data_ingestion_uid_list,
-                'validation_state':'validated',
+                'validation_state':['validated','published'],
                 'select_list': ['reference', 'relative_url', 'versioning.size', 'versioning.version'],
                 }
   return context.getPortalObject().portal_catalog(**catalog_kw)

bt5/erp5_wendelin_data_lake_ingestion/TestTemplateItem/portal_components/test.erp5.testDataLakeIngestion.py

@@ -227,7 +227,7 @@ class TestDataIngestion(SecurityTestCase):
     self.tic()
 
     # check data relation between Data Set and Data Streams work
-    self.assertSameSet(data_stream_list, data_set.DataSet_getDataStreamList())
+    self.assertSameSet(data_stream_list, [x.getObject() for x in data_set.DataSet_getDataStreamList()])
 
     # check data set and all Data Streams states
     self.assertEqual('validated', data_set.getValidationState())
@@ -340,15 +340,18 @@ class TestDataIngestion(SecurityTestCase):
     """
     # ingest a couple of files
     reference = self.getRandomReference()
-    self.ingest("some-data-1", reference, self.CSV, self.SINGLE_INGESTION_END)
+    data_set_reference = "test-relation-dataset"
+    self.ingest("some-data-1", reference, self.CSV, self.SINGLE_INGESTION_END,
+                randomize_ingestion_reference=False, data_set_reference=data_set_reference)
     time.sleep(1)
     self.tic()
     reference += "-2"
-    self.ingest("some-data-2", reference, self.CSV, self.SINGLE_INGESTION_END)
+    self.ingest("some-data-2", reference, self.CSV, self.SINGLE_INGESTION_END,
+                randomize_ingestion_reference=False, data_set_reference=data_set_reference)
     time.sleep(1)
     self.tic()
     # get corresponding Data Streams by searching via Data Ingestion Lines of the Data Set
-    data_set = self.portal.data_set_module.get(self.REF_DATASET)
+    data_set = self.portal.data_set_module.get(data_set_reference)
     data_ingestion_line_list = self.portal.portal_catalog(
                     portal_type = 'Data Ingestion Line',
                     aggregate_uid = data_set.getUid())
@@ -356,9 +359,10 @@ class TestDataIngestion(SecurityTestCase):
     data_stream_list = self.portal.portal_catalog(
                     portal_type = 'Data Stream',
                     aggregate__related__uid = data_ingestion_uid_list,
+                    validation_state = ['validated','published'],
                     select_list = ['reference', 'relative_url', 'versioning.size', 'versioning.version'])
     data_stream_list = [x.getObject() for x in data_stream_list]
     # assert that the list from the search is the same as DataSet_getDataStreamList
-    self.assertSameSet(data_stream_list, data_set.DataSet_getDataStreamList())
+    self.assertSameSet(data_stream_list, [x.getObject() for x in data_set.DataSet_getDataStreamList()])
 
   # XXX: new test which simulates download / upload of Data Set and increase DS version
\ No newline at end of file

bt5/erp5_wendelin_data_lake_ingestion/WorkflowTemplateItem/portal_workflow/data_set_interaction_workflow/scripts/DataSet_invalidateDataStreamList.py

 """
-  Publish all Data Streams for a Data Set.
+  Invalidate all Data Streams for a Data Set.
 """
 data_set = state_change['object']
 for data_stream in data_set.DataSet_getDataStreamList():