Add unit tests for RangeDataVector::FindEntryIndexesThatContain

[unnar]

Summary

This adds unit tests for FindEntryIndexesThatContain, this is done in preparation for changing the logic of the function.

[labath]

Thanks for doing this. Are you able to commit this yourself ?

lldb/unittests/Utility/RangeMapTest.cpp

23

This doesn't look right. Could you run clang-format over this?

[unnar]

No, I can't. If you could submit this for me it would be great.

lldb/unittests/Utility/RangeMapTest.cpp

23

I'm not sure what happened there while splitting up the patch but it's fixed. (I will also set up a pre-commit hook for clang-format so that it should stop this from happening going forward)

[labath]

lldb/unittests/Utility/RangeMapTest.cpp

23

That's ok. Don't worry about it.

lldb/unittests/Utility/RangeMapTest.cpp

 
 using RangeDataVectorT = RangeDataVector<uint32_t, uint32_t, uint32_t>;
 using EntryT = RangeDataVectorT::Entry;
 
 static testing::Matcher<const EntryT *> EntryIs(uint32_t ID) {
   return testing::Pointee(testing::Field(&EntryT::data, ID));
 }
 
+std::vector<uint32_t> FindEntryIndexes(uint32_t address, RangeDataVectorT map) {
+  std::vector<uint32_t> result;
+  map.FindEntryIndexesThatContain(address, result);
+  return result;
+}
+
 TEST(RangeDataVector, FindEntryThatContains) {
   RangeDataVectorT Map;
   uint32_t NextID = 0;
   Map.Append(EntryT(0, 10, NextID++));
   Map.Append(EntryT(10, 10, NextID++));
   Map.Append(EntryT(20, 10, NextID++));
   Map.Sort();
 
TEST(RangeDataVector, CustomSort) {
   MapC.Sort();
 
   EXPECT_THAT(MapC.GetSize(), 4);
   EXPECT_THAT(MapC.GetEntryRef(0).data, 53);
   EXPECT_THAT(MapC.GetEntryRef(1).data, 52);
   EXPECT_THAT(MapC.GetEntryRef(2).data, 51);
   EXPECT_THAT(MapC.GetEntryRef(3).data, 50);
 }
+
+TEST(RangeDataVector, FindEntryIndexesThatContain) {
+  RangeDataVectorT Map;
+  Map.Append(EntryT(0, 10, 10));
+  Map.Append(EntryT(10, 10, 11));
+  Map.Append(EntryT(20, 10, 12));
+  Map.Sort();
+
+  EXPECT_THAT(FindEntryIndexes(0, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(9, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(10, Map), testing::ElementsAre(11));
+  EXPECT_THAT(FindEntryIndexes(19, Map), testing::ElementsAre(11));
+  EXPECT_THAT(FindEntryIndexes(20, Map), testing::ElementsAre(12));
+  EXPECT_THAT(FindEntryIndexes(29, Map), testing::ElementsAre(12));
+  EXPECT_THAT(FindEntryIndexes(30, Map), testing::ElementsAre());
+}
+
+TEST(RangeDataVector, FindEntryIndexesThatContain_Overlap) {
+  RangeDataVectorT Map;
+  Map.Append(EntryT(0, 40, 10));
+  Map.Append(EntryT(10, 20, 11));
+  Map.Append(EntryT(20, 10, 12));
+  Map.Sort();
+
+  EXPECT_THAT(FindEntryIndexes(0, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(9, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(10, Map), testing::ElementsAre(10, 11));
+  EXPECT_THAT(FindEntryIndexes(19, Map), testing::ElementsAre(10, 11));
+  EXPECT_THAT(FindEntryIndexes(20, Map), testing::ElementsAre(10, 11, 12));
+  EXPECT_THAT(FindEntryIndexes(29, Map), testing::ElementsAre(10, 11, 12));
+  EXPECT_THAT(FindEntryIndexes(30, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(39, Map), testing::ElementsAre(10));
+  EXPECT_THAT(FindEntryIndexes(40, Map), testing::ElementsAre());
+}