ros2/openvehicle-api
3
0
Fork 0
mirror of https://github.com/eclipse-openvehicle-api/openvehicle-api.git synced 2026-08-30 04:15:10 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

connection between 2 systems and bug fixes (#14)

Browse Source
This commit is contained in:
tompzf
2026-07-03 14:53:48 +02:00
committed by GitHub
parent 0fb5660d27
commit 46842200f1
284 changed files with 35200 additions and 8265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual_tests/silkit_can_com_tests/include/can_com_test_helper.h
View File

@@ -27,9 +27,9 @@
class CTestCanSilKit : public CCANSilKit
{
public:
virtual void Initialize(const sdv::u8string& ssObjectConfig) override
virtual void Initialize(const sdv::SObjectInfo& sObjectInfo) override
{
return CCANSilKit::Initialize(ssObjectConfig);
return CCANSilKit::Initialize(sObjectInfo);
}
virtual sdv::EObjectState GetObjectState() const override

28
tests/manual_tests/silkit_can_com_tests/src/can_com_manual_test_silkit.cpp
View File

@@ -31,9 +31,9 @@ class CANSilkitTest : public ::testing::Test
class CTestCANSilkit : public CCANSilKit
{
public:
virtual void Initialize(const sdv::u8string& ssObjectConfig) override
virtual void Initialize(const sdv::SObjectInfo& sObjectInfo) override
{
CCANSilKit::Initialize(ssObjectConfig);
CCANSilKit::Initialize(sObjectInfo);
}
virtual void Shutdown() override
@@ -113,7 +113,9 @@ bool InitializeAppControl(sdv::app::CAppControl* appcontrol, const std::string&
void InitializeCanComObject(CTestCANSilkit& canComObj, const std::string config, MockCANReceiver& mockRcv)
{
ASSERT_NO_THROW(canComObj.Initialize(config.c_str()));
sdv::SObjectInfo sObjectInfo{};
sObjectInfo.ssConfig = config;
ASSERT_NO_THROW(canComObj.Initialize(sObjectInfo));
EXPECT_EQ(canComObj.GetObjectState(), sdv::EObjectState::initialized);
ASSERT_NO_THROW(canComObj.SetOperationMode(sdv::EOperationMode::configuring));
ASSERT_NO_THROW(canComObj.RegisterReceiver(&mockRcv));
@@ -142,7 +144,8 @@ TEST_F(CANSilkitTest, ValidConfigString)
sdv::app::CAppControl appControl;
appControl.Startup("");
sdv::u8string ssObjectConfig =
sdv::SObjectInfo sObjectInfo{};
sObjectInfo.ssConfig =
R"(
DebugInfo = true
SyncMode = true
@@ -156,7 +159,7 @@ TEST_F(CANSilkitTest, ValidConfigString)
}"""
)";
CTestCANSilkit canComObj;
ASSERT_NO_THROW(canComObj.Initialize(ssObjectConfig.c_str()));
ASSERT_NO_THROW(canComObj.Initialize(sObjectInfo));
ASSERT_EQ(canComObj.GetObjectState(), sdv::EObjectState::initialized);
ASSERT_NO_THROW(canComObj.Send(testMsg, 0));
@@ -170,7 +173,8 @@ TEST_F(CANSilkitTest, InvalidConfigIdentifier)
sdv::app::CAppControl appControl;
appControl.Startup("");
sdv::u8string ssObjectConfig =
sdv::SObjectInfo sObjectInfo{};
sObjectInfo.ssConfig =
R"(
DebugInfo = true
SyncMode = true
@@ -185,7 +189,7 @@ TEST_F(CANSilkitTest, InvalidConfigIdentifier)
)";
CTestCANSilkit canComObj;
ASSERT_NO_THROW(canComObj.Initialize(ssObjectConfig.c_str()));
ASSERT_NO_THROW(canComObj.Initialize(sObjectInfo));
EXPECT_EQ(canComObj.GetObjectState(), sdv::EObjectState::initialization_failure);
ASSERT_NO_THROW(canComObj.Shutdown());
@@ -197,7 +201,8 @@ TEST_F(CANSilkitTest, SendReceiveTest)
sdv::app::CAppControl appControl;
appControl.Startup("");
sdv::u8string ssConfig1 =
sdv::SObjectInfo sObjectInfo1{};
sObjectInfo1.ssConfig =
R"(
DebugInfo = true
SyncMode = true
@@ -210,7 +215,8 @@ TEST_F(CANSilkitTest, SendReceiveTest)
},
}"""
)";
sdv::u8string ssConfig2 =
sdv::SObjectInfo sObjectInfo2{};
sObjectInfo2.ssConfig =
R"(
DebugInfo = true
SyncMode = true
@@ -228,9 +234,9 @@ TEST_F(CANSilkitTest, SendReceiveTest)
CTestCANSilkit canComObj2;
MockCANReceiver mockRcv;
canComObj1.Initialize(ssConfig1.c_str());
canComObj1.Initialize(sObjectInfo1);
ASSERT_EQ(canComObj1.GetObjectState(), sdv::EObjectState::initialized);
canComObj2.Initialize(ssConfig2.c_str());
canComObj2.Initialize(sObjectInfo2);
ASSERT_EQ(canComObj2.GetObjectState(), sdv::EObjectState::initialized);
ASSERT_NO_THROW(canComObj1.SetOperationMode(sdv::EOperationMode::running));

8
tests/manual_tests/silkit_can_com_tests/src/can_com_test_silkit.cpp
View File

@@ -53,7 +53,7 @@ public:
virtual bool OnInitialize() override
{
m_StopThread = false;
//m_thSend2DatalinkThread = std::thread(&CDummyCANSockets::Send2DatalinkThread, this);
//m_thSend2DatalinkThread = sdv::core::secure_thread(&CDummyCANSockets::Send2DatalinkThread, this);
return true;
}
@@ -116,7 +116,7 @@ public:
private:
std::atomic_bool m_StopThread = false;
std::thread m_thSend2DatalinkThread;
sdv::core::secure_thread m_thSend2DatalinkThread;
mutable std::mutex m_mtxReceivers;
std::set<sdv::can::IReceive*> m_setReceivers;
};
@@ -304,7 +304,7 @@ Class = "CAN_data_link"
// Create an object of the CDummyCANSilKit class
CDummyCANSilKit canComObj;
canComObj.Initialize("");
canComObj.Initialize(sdv::SObjectInfo());
sdv::can::ISend* pCanSend = &canComObj;
EXPECT_NE(pCanSend, nullptr);
@@ -358,7 +358,7 @@ TEST_F(CANCommunicationTest, ExtractAndCompareSignals)
// Create a normal object of the CDummyCANSilKit class
CDummyCANSilKit canComObj;
canComObj.Initialize("");
canComObj.Initialize(sdv::SObjectInfo());
sdv::can::ISend* pCanSend = &canComObj;
EXPECT_NE(pCanSend, nullptr);

5
tests/manual_tests/silkit_can_com_tests/src/can_reader.cpp
View File

@@ -15,7 +15,8 @@ void ReceiveData()
sdv::app::CAppControl appControl;
appControl.Startup("");
sdv::u8string config = R"(
sdv::SObjectInfo sObjectInfo{};
sObjectInfo.ssConfig = R"(
DebugInfo = true
SyncMode = true
SilKitParticipantName = "can_reader"
@@ -29,7 +30,7 @@ void ReceiveData()
)";
CTestCanSilKit canComObj;
canComObj.Initialize(config.c_str());
canComObj.Initialize(sObjectInfo);
canComObj.SetOperationMode(sdv::EOperationMode::configuring);
CanReceiver mockRcv;

5
tests/manual_tests/silkit_can_com_tests/src/can_writer.cpp
View File

@@ -15,7 +15,8 @@ int main()
sdv::app::CAppControl appControl;
appControl.Startup("");
sdv::u8string config = R"(
sdv::SObjectInfo sObjectInfo{};
sObjectInfo.ssConfig = R"(
DebugInfo = true
SyncMode = true
SilKitParticipantName = "can_writer"
@@ -29,7 +30,7 @@ int main()
)";
CTestCanSilKit canComObj;
canComObj.Initialize(config.c_str());
canComObj.Initialize(sObjectInfo);
canComObj.SetOperationMode(sdv::EOperationMode::running);
uint8_t msgId = 65;