bt2: Adapt test_message.py and make it pass

[babeltrace.git] / bindings / python / bt2 / bt2 / message_iterator.py

diff --git a/bindings/python/bt2/bt2/message_iterator.py b/bindings/python/bt2/bt2/message_iterator.py
index 781c876d86e9ae3081b9e6bbbd3cd906ae09de2f..4cf362ad490d9b4fe002214b329a1fbfcb3dc0c8 100644 (file)
--- a/bindings/python/bt2/bt2/message_iterator.py
+++ b/bindings/python/bt2/bt2/message_iterator.py
@@ -156,6 +156,16 @@ class _UserMessageIterator(_MessageIterator):
 
         return bt2.message._EventMessage(ptr)
 
+    def _create_message_iterator_inactivity_message(self, clock_class, clock_snapshot):
+        utils._check_type(clock_class, bt2.clock_class._ClockClass)
+        ptr = native_bt.message_message_iterator_inactivity_create(
+            self._ptr, clock_class._ptr, clock_snapshot)
+
+        if ptr is None:
+            raise bt2.CreationError('cannot create inactivity message object')
+
+        return bt2.message._MessageIteratorInactivityMessage(ptr)
+
     def _create_stream_beginning_message(self, stream):
         utils._check_type(stream, bt2.stream._Stream)
 
@@ -165,6 +175,40 @@ class _UserMessageIterator(_MessageIterator):
 
         return bt2.message._StreamBeginningMessage(ptr)
 
+    def _create_stream_activity_beginning_message(self, stream, default_clock_snapshot=None):
+        utils._check_type(stream, bt2.stream._Stream)
+        self._validate_default_clock_snapshot(stream.stream_class, default_clock_snapshot)
+
+        ptr = native_bt.message_stream_activity_beginning_create(self._ptr, stream._ptr)
+
+        if ptr is None:
+            raise bt2.CreationError(
+                'cannot create stream activity beginning message object')
+
+        msg = bt2.message._StreamActivityBeginningMessage(ptr)
+
+        if default_clock_snapshot is not None:
+            msg._default_clock_snapshot = default_clock_snapshot
+
+        return msg
+
+    def _create_stream_activity_end_message(self, stream, default_clock_snapshot=None):
+        utils._check_type(stream, bt2.stream._Stream)
+        self._validate_default_clock_snapshot(stream.stream_class, default_clock_snapshot)
+
+        ptr = native_bt.message_stream_activity_end_create(self._ptr, stream._ptr)
+
+        if ptr is None:
+            raise bt2.CreationError(
+                'cannot create stream activity end message object')
+
+        msg = bt2.message._StreamActivityEndMessage(ptr)
+
+        if default_clock_snapshot is not None:
+            msg._default_clock_snapshot = default_clock_snapshot
+
+        return msg
+
     def _create_stream_end_message(self, stream):
         utils._check_type(stream, bt2.stream._Stream)
 
@@ -179,14 +223,14 @@ class _UserMessageIterator(_MessageIterator):
 
         if packet.stream.stream_class.packets_have_default_beginning_clock_snapshot:
             if default_clock_snapshot is None:
-                raise bt2.CreationError("packet beginning messages in this stream must have a default clock snapshots")
+                raise ValueError("packet beginning messages in this stream must have a default clock snapshots")
 
             utils._check_uint64(default_clock_snapshot)
             ptr = native_bt.message_packet_beginning_create_with_default_clock_snapshot(
                 self._ptr, packet._ptr, default_clock_snapshot)
         else:
             if default_clock_snapshot is not None:
-                raise bt2.CreationError("packet beginning messages in this stream must not have a default clock snapshots")
+                raise ValueError("packet beginning messages in this stream must not have a default clock snapshots")
 
             ptr = native_bt.message_packet_beginning_create(self._ptr, packet._ptr)
 
@@ -197,16 +241,70 @@ class _UserMessageIterator(_MessageIterator):
 
     def _create_packet_end_message(self, packet, default_clock_snapshot=None):
         utils._check_type(packet, bt2.packet._Packet)
-        self._validate_default_clock_snapshot(packet.stream.stream_class, default_clock_snapshot)
 
-        if default_clock_snapshot is not None:
+        if packet.stream.stream_class.packets_have_default_end_clock_snapshot:
+            if default_clock_snapshot is None:
+                raise ValueError("packet end messages in this stream must have a default clock snapshots")
+
             utils._check_uint64(default_clock_snapshot)
             ptr = native_bt.message_packet_end_create_with_default_clock_snapshot(
                 self._ptr, packet._ptr, default_clock_snapshot)
         else:
+            if default_clock_snapshot is not None:
+                raise ValueError("packet end messages in this stream must not have a default clock snapshots")
+
             ptr = native_bt.message_packet_end_create(self._ptr, packet._ptr)
 
         if ptr is None:
             raise bt2.CreationError('cannot create packet end message object')
 
         return bt2.message._PacketEndMessage(ptr)
+
+    def _create_discarded_events_message(self, stream, count=None,
+                                         beg_clock_snapshot=None,
+                                         end_clock_snapshot=None):
+        utils._check_type(stream, bt2.stream._Stream)
+
+        if beg_clock_snapshot is None and end_clock_snapshot is None:
+            ptr = native_bt.message_discarded_events_create(self._ptr, stream._ptr)
+        elif beg_clock_snapshot is not None and end_clock_snapshot is not None:
+            utils._check_uint64(beg_clock_snapshot)
+            utils._check_uint64(end_clock_snapshot)
+            ptr = native_bt.message_discarded_events_create_with_default_clock_snapshots(
+                self._ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot)
+        else:
+            raise ValueError('begin and end clock snapshots must be both provided or both omitted')
+
+        if ptr is None:
+            raise bt2.CreationError('cannot discarded events message object')
+
+        msg = bt2.message._DiscardedEventsMessage(ptr)
+
+        if count is not None:
+            msg._count = count
+
+        return msg
+
+    def _create_discarded_packets_message(self, stream, count=None, beg_clock_snapshot=None, end_clock_snapshot=None):
+        utils._check_type(stream, bt2.stream._Stream)
+
+        if beg_clock_snapshot is None and end_clock_snapshot is None:
+            ptr = native_bt.message_discarded_packets_create(self._ptr, stream._ptr)
+        elif beg_clock_snapshot is not None and end_clock_snapshot is not None:
+            utils._check_uint64(beg_clock_snapshot)
+            utils._check_uint64(end_clock_snapshot)
+            ptr = native_bt.message_discarded_packets_create_with_default_clock_snapshots(
+                self._ptr, stream._ptr, beg_clock_snapshot, end_clock_snapshot)
+        else:
+            raise ValueError('begin and end clock snapshots must be both provided or both omitted')
+
+        if ptr is None:
+            raise bt2.CreationError('cannot discarded packets message object')
+
+        msg = bt2.message._DiscardedPacketsMessage(ptr)
+
+        if count is not None:
+            msg._count = count
+
+        return msg
+