From 58c83dcd140137cf5c5808a95e7b0711fa556933 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Wed, 24 May 2017 23:12:23 -0500 Subject: COMMON: Make SpanOwner copy assignment make a copy of the owned Span To move data from one SpanOwner to another, use `moveFrom`. Thanks @waltervn for pointing out the problem. --- test/common/span.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'test/common') diff --git a/test/common/span.h b/test/common/span.h index aa3ee9d22f..1c1a0adcda 100644 --- a/test/common/span.h +++ b/test/common/span.h @@ -267,11 +267,28 @@ public: TS_ASSERT_EQUALS((bool)owner2, false); } + { + Common::SpanOwner > owner2; + TS_ASSERT(owner2->data() == nullptr); + owner2 = owner; + TS_ASSERT(owner2->data() != nullptr); + TS_ASSERT_DIFFERS(owner->data(), owner2->data()); + + for (int i = 0; i < 3; ++i) { + TS_ASSERT_EQUALS(owner2->getUint8At(i), 'a' + i); + TS_ASSERT_EQUALS((*owner2)[i], 'a' + i); + } + + TS_ASSERT_EQUALS((bool)owner2, true); + owner2.release(); + TS_ASSERT_EQUALS((bool)owner2, false); + } + { Common::SpanOwner > owner2; TS_ASSERT_EQUALS((bool)owner, true); void *dataPtr = owner->data(); - owner2 = owner; + owner2.moveFrom(owner); TS_ASSERT_EQUALS((bool)owner, false); TS_ASSERT(owner->data() == nullptr); TS_ASSERT_EQUALS(owner2->data(), dataPtr); @@ -350,7 +367,7 @@ public: Common::SpanOwner > owner2; TS_ASSERT_EQUALS((bool)owner, true); void *dataPtr = owner->data(); - owner2 = owner; + owner2.moveFrom(owner); TS_ASSERT_EQUALS((bool)owner, false); TS_ASSERT(owner->data() == nullptr); TS_ASSERT_EQUALS(owner2->data(), dataPtr); -- cgit v1.2.3