update the test file, make it more make sense

Author: zhihali

opentelemetry-sdk/src/opentelemetry/sdk/trace/id_generator.py

@@ -15,7 +15,7 @@
 import abc
 import random
 
-from opentelemetry.trace.span import INVALID_SPAN_ID, INVALID_TRACE_ID
+from opentelemetry import trace
 
 
 class IdGenerator(abc.ABC):
@@ -49,12 +49,12 @@ class RandomIdGenerator(IdGenerator):
 
     def generate_span_id(self) -> int:
         span_id = random.getrandbits(64)
-        while span_id == INVALID_SPAN_ID:
+        while span_id == trace.INVALID_SPAN_ID:
             span_id = random.getrandbits(64)
         return span_id
 
     def generate_trace_id(self) -> int:
         trace_id = random.getrandbits(128)
-        while trace_id == INVALID_TRACE_ID:
+        while trace_id == trace.INVALID_TRACE_ID:
             trace_id = random.getrandbits(128)
         return trace_id

opentelemetry-sdk/tests/trace/test_trace.py

@@ -2075,11 +2075,9 @@ def test_generate_span_id_avoids_invalid(self, mock_getrandbits):
         generator = RandomIdGenerator()
         span_id = generator.generate_span_id()
 
-        self.assertGreater(span_id, trace_api.INVALID_SPAN_ID)
-        self.assertLessEqual(span_id, self._SPAN_ID_MAX_VALUE)
-        self.assertEqual(
-            mock_getrandbits.call_count, 2
-        )  # Ensure exactly two calls
+        self.assertNotEqual(span_id, trace_api.INVALID_SPAN_ID)
+        mock_getrandbits.assert_any_call(64)
+        self.assertEqual(mock_getrandbits.call_count, 2)
 
     @patch(
         "random.getrandbits",
@@ -2092,8 +2090,6 @@ def test_generate_trace_id_avoids_invalid(self, mock_getrandbits):
         generator = RandomIdGenerator()
         trace_id = generator.generate_trace_id()
 
-        self.assertGreater(trace_id, trace_api.INVALID_TRACE_ID)
-        self.assertLessEqual(trace_id, self._TRACE_ID_MAX_VALUE)
-        self.assertEqual(
-            mock_getrandbits.call_count, 2
-        )  # Ensure exactly two calls
+        self.assertNotEqual(trace_id, trace_api.INVALID_TRACE_ID)
+        mock_getrandbits.assert_any_call(128)
+        self.assertEqual(mock_getrandbits.call_count, 2)