Include `array` and `optional` in strconvert.cpp test.
Fixes #3657
#ifndef GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
#define GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
#ifndef GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
#define GMX_APPLIED_FORCES_DENSITYFITTINGPARAMETERS_H
#include <vector>
#include "gromacs/math/densityfit.h"
#include <vector>
#include "gromacs/math/densityfit.h"
#define GMX_UTILITY_STRCONVERT_H
#include <algorithm>
#define GMX_UTILITY_STRCONVERT_H
#include <algorithm>
#include <optional>
#include <string>
#include <optional>
#include <string>
TEST(StringConvert, NoResultFromEptyString)
{
TEST(StringConvert, NoResultFromEptyString)
{
- const std::optional<std::array<float, 3>> parsedArray =
- parsedArrayFromInputString<float, 3>("");
+ const auto parsedArray = parsedArrayFromInputString<float, 3>("");
EXPECT_FALSE(parsedArray);
}
TEST(StringConvert, ThreeFloatsSuccessfully)
{
EXPECT_FALSE(parsedArray);
}
TEST(StringConvert, ThreeFloatsSuccessfully)
{
- const std::optional<std::array<float, 3>> parsedArray =
- parsedArrayFromInputString<float, 3>("1.2 .5 -6e5");
+ const auto parsedArray = parsedArrayFromInputString<float, 3>("1.2 .5 -6e5");
EXPECT_FLOAT_EQ((*parsedArray)[0], 1.2);
EXPECT_FLOAT_EQ((*parsedArray)[1], .5);
EXPECT_FLOAT_EQ((*parsedArray)[2], -6e5);
EXPECT_FLOAT_EQ((*parsedArray)[0], 1.2);
EXPECT_FLOAT_EQ((*parsedArray)[1], .5);
EXPECT_FLOAT_EQ((*parsedArray)[2], -6e5);
TEST(StringConvert, OneIntSucessfully)
{
TEST(StringConvert, OneIntSucessfully)
{
- const std::optional<std::array<int, 1>> parsedArray =
- parsedArrayFromInputString<int, 1>(" 1 \t ");
+ const auto parsedArray = parsedArrayFromInputString<int, 1>(" 1 \t ");
EXPECT_FLOAT_EQ((*parsedArray)[0], 1);
}
EXPECT_FLOAT_EQ((*parsedArray)[0], 1);
}