Eliminate method

uweseimet · Oct 19, 2024 · 795e672 · 795e672
1 parent 23ec9fa
commit 795e672
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 24 deletions.
diff --git a/cpp/base/device.cpp b/cpp/base/device.cpp
@@ -18,13 +18,6 @@ Device::Device(PbDeviceType type, int lun) : type(type), lun(lun)
     revision = fmt::format("{0:02}{1:1}{2:1}", s2p_major_version, s2p_minor_version, s2p_revision);
 }
 
-void Device::Reset()
-{
-    locked = false;
-    attn = false;
-    reset = false;
-}
-
 void Device::SetProtected(bool b)
 {
     if (protectable && !read_only) {

diff --git a/cpp/base/device.h b/cpp/base/device.h
@@ -32,7 +32,6 @@ class Device // NOSONAR The number of fields and methods is justified, the compl
     {
         return ready;
     }
-    virtual void Reset();
 
     void SetReset(bool b)
     {

diff --git a/cpp/base/primary_device.cpp b/cpp/base/primary_device.cpp
@@ -75,7 +75,9 @@ void PrimaryDevice::Reset()
 {
     DiscardReservation();
 
-    Device::Reset();
+    SetReset(false);
+    SetAttn(false);
+    SetLocked(false);
 }
 
 int PrimaryDevice::GetId() const

diff --git a/cpp/base/primary_device.h b/cpp/base/primary_device.h
@@ -72,7 +72,7 @@ class PrimaryDevice : public ScsiPrimaryCommands, public Device
     bool CheckReservation(int) const;
     void DiscardReservation();
 
-    void Reset() override;
+    void Reset();
 
     virtual int ReadData(span<uint8_t>)
     {

diff --git a/cpp/test/device_test.cpp b/cpp/test/device_test.cpp
@@ -159,19 +159,6 @@ TEST(DeviceTest, GetPaddedName)
     EXPECT_EQ("V       P               R   ", device.GetPaddedName());
 }
 
-TEST(DeviceTest, Reset)
-{
-    MockDevice device(0);
-
-    device.SetLocked(true);
-    device.SetAttn(true);
-    device.SetReset(true);
-    device.Reset();
-    EXPECT_FALSE(device.IsLocked());
-    EXPECT_FALSE(device.IsAttn());
-    EXPECT_FALSE(device.IsReset());
-}
-
 TEST(DeviceTest, Start)
 {
     MockDevice device(0);

diff --git a/cpp/test/mocks.h b/cpp/test/mocks.h
@@ -230,7 +230,6 @@ class MockDevice : public Device
     FRIEND_TEST(DeviceTest, Properties);
     FRIEND_TEST(DeviceTest, Params);
     FRIEND_TEST(DeviceTest, StatusCode);
-    FRIEND_TEST(DeviceTest, Reset);
     FRIEND_TEST(DeviceTest, Start);
     FRIEND_TEST(DeviceTest, Stop);
     FRIEND_TEST(DeviceTest, Eject);
@@ -250,6 +249,7 @@ class MockDevice : public Device
 
 class MockPrimaryDevice : public PrimaryDevice
 {
+    FRIEND_TEST(PrimaryDeviceTest, Reset);
     FRIEND_TEST(PrimaryDeviceTest, StatusPhase);
     FRIEND_TEST(PrimaryDeviceTest, DataInPhase);
     FRIEND_TEST(PrimaryDeviceTest, DataOutPhase);

diff --git a/cpp/test/primary_device_test.cpp b/cpp/test/primary_device_test.cpp
@@ -85,9 +85,15 @@ TEST(PrimaryDeviceTest, Reset)
 {
     auto [controller, device] = CreatePrimaryDevice();
 
+    device->SetLocked(true);
+    device->SetAttn(true);
+    device->SetReset(true);
     EXPECT_NO_THROW(device->Dispatch(scsi_command::cmd_reserve6));
     EXPECT_FALSE(device->CheckReservation(1)) << "Device must be reserved for initiator ID 1";
     device->Reset();
+    EXPECT_FALSE(device->IsLocked());
+    EXPECT_FALSE(device->IsAttn());
+    EXPECT_FALSE(device->IsReset());
     EXPECT_TRUE(device->CheckReservation(1)) << "Device must not be reserved anymore for initiator ID 1";
 }