Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-15 09:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Consolidate some device control logic

Browse Source
This commit is contained in:
Dennis Klein
2023-02-28 15:12:40 +01:00
committed by Dennis Klein
parent 435d07eaf9
commit 84de22f80b
6 changed files with 106 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/plugins/_plugin.cxx
View File

@@ -1,17 +1,21 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <gtest/gtest.h>
#include "../helper/ControlDevice.h"
#include <fairmq/Plugin.h>
#include <fairmq/PluginServices.h>
#include <fairmq/tools/Version.h>
#include <fairmq/Device.h>
#include <fairmq/ProgOptions.h>
#include <gtest/gtest.h>
#include <memory>
#include <sstream>
#include <string>
@@ -27,19 +31,7 @@ using namespace fair::mq;
auto control(Device& device) -> void
{
device.SetTransport("zeromq");
device.ChangeState(Transition::InitDevice);
device.WaitForState(State::InitializingDevice);
device.ChangeState(Transition::CompleteInit);
device.WaitForState(State::Initialized);
device.ChangeState(Transition::Bind);
device.WaitForState(State::Bound);
device.ChangeState(Transition::Connect);
device.WaitForState(State::DeviceReady);
device.ChangeState(Transition::ResetDevice);
device.WaitForState(State::Idle);
device.ChangeState(Transition::End);
test::Control(device, test::Cycle::ToDeviceReadyAndBack);
}
TEST(Plugin, Operators)
@@ -52,7 +44,7 @@ TEST(Plugin, Operators)
Plugin p3{"file", {1, 0, 0}, "Foo Bar <foo.bar@test.net>", "https://git.test.net/file.git", &services};
EXPECT_EQ(p1, p2);
EXPECT_NE(p1, p3);
thread t(control, std::ref(device));
thread t([&]() { control(device); });
device.RunStateMachine();
if (t.joinable()) {
t.join();
@@ -68,7 +60,7 @@ TEST(Plugin, OstreamOperators)
stringstream ss;
ss << p1;
EXPECT_EQ(ss.str(), string{"'dds', version '1.0.0', maintainer 'Foo Bar <foo.bar@test.net>', homepage 'https://git.test.net/dds.git'"});
thread t(control, std::ref(device));
thread t([&]() { control(device); });
device.RunStateMachine();
if (t.joinable()) {
t.join();

23
test/plugins/_plugin_manager.cxx
View File

@@ -1,17 +1,22 @@
/********************************************************************************
* Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* Copyright (C) 2017-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH *
* *
* This software is distributed under the terms of the *
* GNU Lesser General Public Licence (LGPL) version 3, *
* copied verbatim in the file "LICENSE" *
********************************************************************************/
#include <gtest/gtest.h>
#include "../helper/ControlDevice.h"
#include <fairmq/PluginManager.h>
#include <fairmq/PluginServices.h>
#include <fairmq/Device.h>
#include <fairmq/ProgOptions.h>
#include <gtest/gtest.h>
#include <fairlogger/Logger.h>
#include <fstream>
#include <memory>
#include <vector>
@@ -28,19 +33,7 @@ using namespace std;
auto control(Device& device) -> void
{
device.SetTransport("zeromq");
device.ChangeState(Transition::InitDevice);
device.WaitForState(State::InitializingDevice);
device.ChangeState(Transition::CompleteInit);
device.WaitForState(State::Initialized);
device.ChangeState(Transition::Bind);
device.WaitForState(State::Bound);
device.ChangeState(Transition::Connect);
device.WaitForState(State::DeviceReady);
device.ChangeState(Transition::ResetDevice);
device.WaitForState(State::Idle);
device.ChangeState(Transition::End);
test::Control(device, test::Cycle::ToDeviceReadyAndBack);
}
TEST(PluginManager, LoadPluginDynamic)