Skip to content

Commit 7745315

Browse files
committed
Add functions to unit test framework
Signed-off-by: Emelia Lei <[email protected]>
1 parent 0c740d0 commit 7745315

File tree

3 files changed

+39
-20
lines changed

3 files changed

+39
-20
lines changed

src/groups/bmq/bmqimp/bmqimp_brokersession.t.cpp

+20
Original file line numberDiff line numberDiff line change
@@ -2834,6 +2834,26 @@ class DTTestTracer : public bmqpi::DTTracer {
28342834
d_allocator_p);
28352835
return result;
28362836
}
2837+
2838+
int
2839+
serializeSpan(BSLS_ANNOTATION_UNUSED bsl::vector<unsigned char>* buffer,
2840+
BSLS_ANNOTATION_UNUSED const bsl::shared_ptr<bmqpi::DTSpan>&
2841+
dtSpan) const BSLS_KEYWORD_OVERRIDE
2842+
{
2843+
// NOT IMPLEMENTED
2844+
return 0;
2845+
}
2846+
2847+
int deserializeAndCreateChildSpan(
2848+
BSLS_ANNOTATION_UNUSED bsl::shared_ptr<bmqpi::DTSpan>* child,
2849+
BSLS_ANNOTATION_UNUSED const bsl::vector<unsigned char>& buffer,
2850+
BSLS_ANNOTATION_UNUSED const bsl::string_view& operation,
2851+
BSLS_ANNOTATION_UNUSED const bmqpi::DTSpan::Baggage& baggage) const
2852+
BSLS_KEYWORD_OVERRIDE
2853+
{
2854+
// NOT IMPLEMENTED
2855+
return 0;
2856+
}
28372857
};
28382858

28392859
} // close unnamed namespace

src/groups/bmq/bmqpi/bmqpi_dttracer.h

+10-11
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,19 @@ class DTTracer {
5858
const bsl::string_view& operation,
5959
const DTSpan::Baggage& baggage = DTSpan::Baggage()) const = 0;
6060

61-
/// Serialize the underlying context for a specified `DTSpan` and return
62-
/// the bit stream as `out`. Return 0 on success, or a non-zero error code
63-
/// on error.
64-
virtual int serializeSpan(bsl::vector<unsigned char>* out,
61+
/// Serialize the specified `dtSpan` into the specified `buffer`.
62+
/// Return 0 on success, or a non-zero error code on error with `buffer`
63+
/// being valid-but-unspecified.
64+
virtual int serializeSpan(bsl::vector<unsigned char>* buffer,
6565
const bsl::shared_ptr<DTSpan>& dtSpan) const = 0;
6666

67-
/// Deserialize the specified bit stream `in` into a span context.
68-
/// Create a child span and pass into `out` based on the deserialized
69-
/// parent span context, the given `operation`, and an optional key-value
70-
/// tags `baggage`. Return 0 on success, or a non-zero error code on
71-
/// error.
67+
/// Deserialize the specified `buffer` as a span, and then construct a
68+
/// new `DTSpan` in `child`, representing `operation` as a child of the
69+
/// deserialized span and having the key-value tags defined by `baggage`.
70+
/// Return 0 on success, or a non-zero error code on error.
7271
virtual int deserializeAndCreateChildSpan(
73-
bsl::shared_ptr<DTSpan>* out,
74-
const bsl::vector<unsigned char>& in,
72+
bsl::shared_ptr<DTSpan>* child,
73+
const bsl::vector<unsigned char>& buffer,
7574
const bsl::string_view& operation,
7675
const DTSpan::Baggage& baggage = DTSpan::Baggage()) const = 0;
7776
};

src/groups/bmq/bmqpi/bmqpi_dttracer.t.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ using namespace BloombergLP;
3131

3232
/// A test implementation of the `bmqpi::DTTracer` protocol.
3333
struct DTTracerTestImp : public bsls::ProtocolTestImp<bmqpi::DTTracer> {
34-
virtual bsl::shared_ptr<bmqpi::DTSpan> createChildSpan(
34+
bsl::shared_ptr<bmqpi::DTSpan> createChildSpan(
3535
const bsl::shared_ptr<bmqpi::DTSpan>& parent,
3636
const bsl::string_view& operation,
3737
const bmqpi::DTSpan::Baggage& baggage) const BSLS_KEYWORD_OVERRIDE;
3838

39-
virtual int serializeSpan(bsl::vector<unsigned char>* out,
40-
const bsl::shared_ptr<bmqpi::DTSpan>& dtSpan)
41-
const BSLS_KEYWORD_OVERRIDE;
39+
int serializeSpan(bsl::vector<unsigned char>* buffer,
40+
const bsl::shared_ptr<bmqpi::DTSpan>& dtSpan) const
41+
BSLS_KEYWORD_OVERRIDE;
4242

43-
virtual int deserializeAndCreateChildSpan(
44-
bsl::shared_ptr<bmqpi::DTSpan>* out,
45-
const bsl::vector<unsigned char>& in,
43+
int deserializeAndCreateChildSpan(
44+
bsl::shared_ptr<bmqpi::DTSpan>* child,
45+
const bsl::vector<unsigned char>& buffer,
4646
const bsl::string_view& operation,
4747
const bmqpi::DTSpan::Baggage& baggage = bmqpi::DTSpan::Baggage()) const
4848
BSLS_KEYWORD_OVERRIDE;
@@ -126,8 +126,8 @@ static void test1_breathingTest()
126126
BMQTST_ASSERT(tracer.testVirtualDestructor());
127127

128128
PV("Verify that all methods are public and virtual");
129-
bmqpi::DTSpan::Baggage empty;
130-
bsl::vector<unsigned char> emptyVec;
129+
bmqpi::DTSpan::Baggage empty(bmqtst::TestHelperUtil::allocator());
130+
bsl::vector<unsigned char> emptyVec(bmqtst::TestHelperUtil::allocator());
131131
BSLS_PROTOCOLTEST_ASSERT(tracer, createChildSpan(NULL, "", empty));
132132
BSLS_PROTOCOLTEST_ASSERT(tracer, serializeSpan(NULL, NULL));
133133
BSLS_PROTOCOLTEST_ASSERT(

0 commit comments

Comments
 (0)