Merge pull request #2487 from akohlmey/collected-small-changes

Collected small changes and fixes
This commit is contained in:
Richard Berger
2020-11-30 11:36:23 -05:00
committed by GitHub
67 changed files with 2760 additions and 698683 deletions

View File

@ -32,13 +32,13 @@ bool verbose = false;
using LAMMPS_NS::utils::split_words;
namespace LAMMPS_NS {
using ::testing::StrEq;
using ::testing::MatchesRegex;
using ::testing::StrEq;
class PythonPackageTest : public ::testing::Test {
protected:
LAMMPS *lmp;
Info *info;
Info *info;
void SetUp() override
{
@ -74,7 +74,7 @@ protected:
TEST_F(PythonPackageTest, python_invoke)
{
if (!info->has_style("command","python")) GTEST_SKIP();
if (!info->has_style("command", "python")) GTEST_SKIP();
// execute python function from file
if (!verbose) ::testing::internal::CaptureStdout();
lmp->input->one("python printnum file ${input_dir}/func.py");
@ -107,9 +107,9 @@ TEST_F(PythonPackageTest, python_invoke)
ASSERT_THAT(output, MatchesRegex("python.*2.25.*"));
}
TEST_F(PythonPackageTest, python_variable)
TEST_F(PythonPackageTest, python_variable)
{
if (!info->has_style("command","python")) GTEST_SKIP();
if (!info->has_style("command", "python")) GTEST_SKIP();
if (!verbose) ::testing::internal::CaptureStdout();
lmp->input->one("variable sq python square");
lmp->input->one("variable val index 1.5");