Improved TapeItemWrittenPointerTest.cpp

catalogue/TapeItemWrittenPointerTest.cpp

@@ -66,6 +66,9 @@ TEST_F(cta_catalogue_TapeItemWrittenPointerTest, DISABLED_check_set_order_after_
   auto file1WrittenUP = cta::make_unique<TapeFileWritten>();
   auto file2WrittenUP = cta::make_unique<TapeFileWritten>();
 
+  auto file1WrittenPtr = file1WrittenUP.get();
+  auto file2WrittenPtr = file2WrittenUP.get();
+
   auto & file1Written = *file1WrittenUP;
   filesWrittenSet.insert(file1WrittenUP.release());
   file1Written.fSeq = 1;
@@ -78,6 +81,18 @@ TEST_F(cta_catalogue_TapeItemWrittenPointerTest, DISABLED_check_set_order_after_
 
   ASSERT_EQ(2, filesWrittenSet.size());
 
+  // Check the set contains the original objects
+  for(const auto &event: filesWrittenSet) {
+    ASSERT_TRUE(event.get() == file1WrittenPtr || event.get() == file2WrittenPtr);
+
+    if(event.get() == file1WrittenPtr) {
+      ASSERT_EQ(1, event->fSeq);
+    } else {
+      ASSERT_EQ(2, event->fSeq);
+    }
+  }
+
+  // Check the order of the set
   uint64_t expectedFSeq = 1;
   for(const auto &event: filesWrittenSet) {
     ASSERT_EQ(expectedFSeq, event->fSeq);