commit be47c8fe9272715c12a8bbe346778cdd742f80e6
author John Wedig <johnwedig@google.com> Fri Sep 30 16:40:08 2022 -0700
committer John Wedig <johnwedig@google.com> Fri Sep 30 16:47:59 2022 -0700
tree 425ebee79b8df3b3f73c5a04f2ec96edfa54d2cc
parent da5e96a7e322d4a6bfef21438266114e55682161

Fix zero_test and pattern_test

The zero_test and pattern_test are failing to compile because some mocks
are returning vectors instead of spans.

Signed-off-by: John Wedig <johnwedig@google.com>
Change-Id: Iaf8166f265ef6a67d96e1507abeaca47459e24d3

src/test/erase/zero_test.cpp

diff --git a/src/test/erase/zero_test.cpp b/src/test/erase/zero_test.cpp
index b14d546..8570154 100644
--- a/src/test/erase/zero_test.cpp
+++ b/src/test/erase/zero_test.cpp
@@ -128,23 +128,25 @@
     auto shortData = std::vector<std::byte>(shortSize, std::byte{0});
     auto restOfData =
         std::vector<std::byte>(size - shortSize * 3, std::byte{0});
+    std::span shortDataSpan{shortData};
+    std::span restOfDataSpan{restOfData};
     stdplus::fd::FdMock mock;
 
     // test write zeros with short blocks
     EXPECT_CALL(mock, write(_))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(restOfData))
-        .WillOnce(Return(shortData));
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(restOfDataSpan))
+        .WillOnce(Return(shortDataSpan));
 
     EXPECT_NO_THROW(pass.writeZero(size, mock));
 
     // test read zeros with short blocks
     EXPECT_CALL(mock, read(_))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(restOfData))
-        .WillOnce(Return(shortData));
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(restOfDataSpan))
+        .WillOnce(Return(shortDataSpan));
 
     EXPECT_NO_THROW(pass.verifyZero(size, mock));
 }
@@ -159,25 +161,27 @@
     auto shortData = std::vector<std::byte>(shortSize, std::byte{0});
     auto restOfData =
         std::vector<std::byte>(size - shortSize * 3, std::byte{0});
+    std::span shortDataSpan{shortData};
+    std::span restOfDataSpan{restOfData};
     // open the file and write none zero to it
 
     stdplus::fd::FdMock mock;
 
     // test writes
     EXPECT_CALL(mock, write(_))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(restOfData))
-        .WillOnce(Return(restOfData)); // return too much data!
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(restOfDataSpan))
+        .WillOnce(Return(restOfDataSpan)); // return too much data!
 
     EXPECT_THROW(tryZero.writeZero(size, mock), InternalFailure);
 
     // test reads
     EXPECT_CALL(mock, read(_))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(shortData))
-        .WillOnce(Return(restOfData))
-        .WillOnce(Return(restOfData)); // return too much data!
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(shortDataSpan))
+        .WillOnce(Return(restOfDataSpan))
+        .WillOnce(Return(restOfDataSpan)); // return too much data!
 
     EXPECT_THROW(tryZero.verifyZero(size, mock), InternalFailure);
 }
@@ -195,13 +199,13 @@
     // test writes
     EXPECT_CALL(mocks, write(_))
         .Times(33)
-        .WillRepeatedly(Return(std::vector<std::byte>{}))
+        .WillRepeatedly(Return(std::span<std::byte>{}))
         .RetiresOnSaturation();
     EXPECT_THROW(tryZero.writeZero(size, mocks), InternalFailure);
     // test reads
     EXPECT_CALL(mocks, read(_))
         .Times(33)
-        .WillRepeatedly(Return(std::vector<std::byte>{}))
+        .WillRepeatedly(Return(std::span<std::byte>{}))
         .RetiresOnSaturation();
     EXPECT_THROW(tryZero.verifyZero(size, mocks), InternalFailure);
 }