mirror of
https://github.com/akuker/RASCSI.git
synced 2026-04-20 11:17:58 +00:00
Issues 1179 and 1182 (#1232)
* Update logging * Remove duplicate code * Update unit tests * Clean up includes * Merge ProtobufSerializer into protobuf_util namespace * Precompile regex * Add const * Add Split() convenience method, update log level/ID parsing * Move log.h to legacy folder * Elimininate gotos * Fixes for gcc 13 * Update compiler flags * Update default folder handling * Use references instead of pointers * Move code for better encapsulation * Move code * Remove unused method argument * Move device logger * Remove redundant to_string * Rename for consistency * Update handling of protobuf pointers * Simplify protobuf usage * Memory handling update * Add hasher
This commit is contained in:
+19
-12
@@ -3,12 +3,11 @@
|
||||
// SCSI Target Emulator PiSCSI
|
||||
// for Raspberry Pi
|
||||
//
|
||||
// Copyright (C) 2022 Uwe Seimet
|
||||
// Copyright (C) 2022-2023 Uwe Seimet
|
||||
//
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#include "mocks.h"
|
||||
#include "shared/piscsi_exceptions.h"
|
||||
#include "devices/device.h"
|
||||
|
||||
TEST(DeviceTest, Properties)
|
||||
@@ -118,28 +117,36 @@ TEST(DeviceTest, Properties)
|
||||
TEST(DeviceTest, GetTypeString)
|
||||
{
|
||||
MockDevice schd(SCHD);
|
||||
EXPECT_STREQ("SCHD", schd.GetTypeString());
|
||||
EXPECT_EQ("SCHD", schd.GetTypeString());
|
||||
|
||||
MockDevice scrm(SCRM);
|
||||
EXPECT_STREQ("SCRM", scrm.GetTypeString());
|
||||
EXPECT_EQ("SCRM", scrm.GetTypeString());
|
||||
|
||||
MockDevice scmo(SCMO);
|
||||
EXPECT_STREQ("SCMO", scmo.GetTypeString());
|
||||
EXPECT_EQ("SCMO", scmo.GetTypeString());
|
||||
|
||||
MockDevice sccd(SCCD);
|
||||
EXPECT_STREQ("SCCD", sccd.GetTypeString());
|
||||
EXPECT_EQ("SCCD", sccd.GetTypeString());
|
||||
|
||||
MockDevice schs(SCHS);
|
||||
EXPECT_STREQ("SCHS", schs.GetTypeString());
|
||||
EXPECT_EQ("SCHS", schs.GetTypeString());
|
||||
|
||||
MockDevice scbr(SCBR);
|
||||
EXPECT_STREQ("SCBR", scbr.GetTypeString());
|
||||
EXPECT_EQ("SCBR", scbr.GetTypeString());
|
||||
|
||||
MockDevice scdp(SCDP);
|
||||
EXPECT_STREQ("SCDP", scdp.GetTypeString());
|
||||
EXPECT_EQ("SCDP", scdp.GetTypeString());
|
||||
|
||||
MockDevice sclp(SCLP);
|
||||
EXPECT_STREQ("SCLP", sclp.GetTypeString());
|
||||
EXPECT_EQ("SCLP", sclp.GetTypeString());
|
||||
}
|
||||
|
||||
TEST(DeviceTest, GetIdentifier)
|
||||
{
|
||||
MockDevice device(1);
|
||||
|
||||
EXPECT_CALL(device, GetId());
|
||||
EXPECT_EQ("UNDEFINED 0:1", device.GetIdentifier());
|
||||
}
|
||||
|
||||
TEST(DeviceTest, Vendor)
|
||||
@@ -188,7 +195,7 @@ TEST(DeviceTest, GetPaddedName)
|
||||
TEST(DeviceTest, Params)
|
||||
{
|
||||
MockDevice device(0);
|
||||
unordered_map<string, string> params;
|
||||
param_map params;
|
||||
params["key"] = "value";
|
||||
|
||||
EXPECT_EQ("", device.GetParam("key"));
|
||||
@@ -196,7 +203,7 @@ TEST(DeviceTest, Params)
|
||||
device.SetParams(params);
|
||||
EXPECT_EQ("", device.GetParam("key"));
|
||||
|
||||
unordered_map<string, string> default_params;
|
||||
param_map default_params;
|
||||
default_params["key"] = "value";
|
||||
device.SetDefaultParams(default_params);
|
||||
EXPECT_EQ("", device.GetParam("key"));
|
||||
|
||||
Reference in New Issue
Block a user