detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-17 17:37:45 +01:00
Code Issues Actions Packages Releases Activity

Revert "tests add to namespace sls (#464)" (#465)

Browse Source 
This reverts commit f5745fcf18.
This commit is contained in:
Dhanya Thattil
2022-05-20 15:43:48 +02:00
committed by GitHub
parent f5745fcf18
commit 8656eeec25
44 changed files with 228 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/include/tests/config.h
View File

@@ -4,8 +4,6 @@
#include "sls/sls_detector_defs.h"
#include <string>
namespace sls {
struct SingleDetectorConfig {
slsDetectorDefs::detectorType type_enum =
slsDetectorDefs::detectorType::EIGER;
@@ -13,5 +11,3 @@ struct SingleDetectorConfig {
const std::string type_string = "Eiger";
const std::string my_ip = "129.129.205.171";
};
} // namespace sls

5
tests/include/tests/globals.h
View File

@@ -2,9 +2,6 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once
#include "sls/sls_detector_defs.h"
namespace sls {
using dt = slsDetectorDefs::detectorType;
using di = slsDetectorDefs::dacIndex;
using defs = slsDetectorDefs;
@@ -18,5 +15,3 @@ extern decltype(defs::GET_ACTION) GET;
extern decltype(defs::PUT_ACTION) PUT;
} // namespace test
} // namespace sls

7
tests/include/tests/testenum.h
View File

@@ -2,11 +2,6 @@
// Copyright (C) 2021 Contributors to the SLS Detector Package
#pragma once
#include <cstdint>
namespace sls {
enum class func_id { read_data, read_int, read_half_data, combined };
constexpr size_t MB = 1048576;
constexpr size_t DATA_SIZE = 50 * MB;
} // namespace sls
constexpr size_t DATA_SIZE = 50 * MB;

20
tests/src/testclient.cpp
View File

@@ -32,13 +32,13 @@ int main(int argc, char **argv) {
std::cout << "Sending to: " << hostname << ":" << port << "\n";
auto data = sls::make_unique<char[]>(sls::DATA_SIZE);
auto data = sls::make_unique<char[]>(DATA_SIZE);
// Many connections sending small amounts
for (int i = 0; i != 100; ++i) {
std::cout << "Sending: " << i << "\n";
auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_int) << " bytes\n";
std::cout << "Sent: " << socket.Send(func_id::read_int) << " bytes\n";
std::cout << "Sent: " << socket.Send(i) << " bytes\n";
}
@@ -46,24 +46,24 @@ int main(int argc, char **argv) {
for (int i = 0; i != 5; ++i) {
std::cout << "Sending data\n";
auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_data) << " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE)
std::cout << "Sent: " << socket.Send(func_id::read_data) << " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), DATA_SIZE)
<< " bytes\n";
}
// Send too little data
{
auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_data) << " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE / 2)
std::cout << "Sent: " << socket.Send(func_id::read_data) << " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), DATA_SIZE / 2)
<< " bytes\n";
}
// Send too much data
try {
auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_half_data)
std::cout << "Sent: " << socket.Send(func_id::read_half_data)
<< " bytes\n";
std::cout << "Sent: " << socket.Send(data.get(), sls::DATA_SIZE)
std::cout << "Sent: " << socket.Send(data.get(), DATA_SIZE)
<< " bytes\n";
} catch (const sls::SocketError &e) {
}
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
for (int i = 0; i != 10; ++i) {
std::cout << "Sending: " << i << "\n";
auto socket = sls::ClientSocket("test", hostname, port);
std::cout << "Sent: " << socket.Send(sls::func_id::read_int) << " bytes\n";
std::cout << "Sent: " << socket.Send(func_id::read_int) << " bytes\n";
std::cout << "Sent: " << socket.Send(i) << " bytes\n";
}
@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
double b = 18.3;
float c = -1.2;
auto socket = sls::ClientSocket("test", hostname, port);
int s = socket.SendAll(sls::func_id::combined, a, b, c);
int s = socket.SendAll(func_id::combined, a, b, c);
std::cout << "send all: " << s << "\n";
}
}

20
tests/src/testserver.cpp
View File

@@ -25,14 +25,14 @@ using func_ptr = void (*)(Interface &);
********************************************/
void read_data(Interface &socket) {
auto data = sls::make_unique<char[]>(sls::DATA_SIZE);
std::cout << "Read: " << socket.Receive(data.get(), sls::DATA_SIZE)
auto data = sls::make_unique<char[]>(DATA_SIZE);
std::cout << "Read: " << socket.Receive(data.get(), DATA_SIZE)
<< " bytes into buffer\n";
}
void read_half_data(Interface &socket) {
auto data = sls::make_unique<char[]>(sls::DATA_SIZE);
std::cout << "Read: " << socket.Receive(data.get(), sls::DATA_SIZE / 2)
auto data = sls::make_unique<char[]>(DATA_SIZE);
std::cout << "Read: " << socket.Receive(data.get(), DATA_SIZE / 2)
<< " bytes into buffer\n";
}
@@ -49,11 +49,11 @@ void read_combined(Interface &socket) {
}
// Map from int to function pointer, in this case probably a map would be faster
std::unordered_map<sls::func_id, func_ptr, EnumClassHash> fmap{
{sls::func_id::read_data, &read_data},
{sls::func_id::read_int, &read_int},
{sls::func_id::read_half_data, &read_half_data},
{sls::func_id::combined, &read_combined}};
std::unordered_map<func_id, func_ptr, EnumClassHash> fmap{
{func_id::read_data, &read_data},
{func_id::read_int, &read_int},
{func_id::read_half_data, &read_half_data},
{func_id::combined, &read_combined}};
int main(int argc, char **argv) {
std::cout << "Starting test server...\n";
@@ -73,7 +73,7 @@ int main(int argc, char **argv) {
while (true) {
try {
auto socket = server.accept();
auto fnum = socket.Receive<sls::func_id>();
auto fnum = socket.Receive<func_id>();
std::cout << "Calling func: " << (int)fnum << "\n";
(*fmap[fnum])(socket); // call mapped function

8
tests/test.cpp
View File

@@ -11,8 +11,6 @@
#include "tests/config.h"
#include <string>
namespace sls {
// using namespace Catch::clara;
using Opt = Catch::clara::Opt;
using dt = slsDetectorDefs::detectorType;
@@ -48,10 +46,8 @@ int main(int argc, char *argv[]) {
test::type = slsDetectorDefs::GENERIC;
if (!test::detector_type.empty()) {
test::type =
StringTo<slsDetectorDefs::detectorType>(test::detector_type);
sls::StringTo<slsDetectorDefs::detectorType>(test::detector_type);
}
return session.run();
}
} // namespace sls
}