This commit is contained in:
Axel Kohlmeyer
2020-09-20 14:06:40 -04:00
parent 4cbf821af3
commit 54b9e60dd0

View File

@ -16,6 +16,7 @@
using ::testing::HasSubstr; using ::testing::HasSubstr;
using ::testing::StartsWith; using ::testing::StartsWith;
using ::testing::StrEq; using ::testing::StrEq;
using ::LAMMPS_NS::tagint;
class LibraryProperties : public ::testing::Test { class LibraryProperties : public ::testing::Test {
protected: protected:
@ -59,7 +60,7 @@ TEST_F(LibraryProperties, version)
TEST_F(LibraryProperties, memory_usage) TEST_F(LibraryProperties, memory_usage)
{ {
double meminfo[3]; double meminfo[3];
lammps_memory_usage(lmp,meminfo); lammps_memory_usage(lmp, meminfo);
EXPECT_GT(meminfo[0], 0.0); EXPECT_GT(meminfo[0], 0.0);
#if defined(__linux__) || defined(_WIN32) #if defined(__linux__) || defined(_WIN32)
EXPECT_GT(meminfo[1], 0.0); EXPECT_GT(meminfo[1], 0.0);
@ -264,8 +265,7 @@ protected:
void SetUp() override void SetUp() override
{ {
const char *args[] = {"LAMMPS_test", "-log", "none", const char *args[] = {"LAMMPS_test", "-log", "none", "-echo", "screen", "-nocite"};
"-echo", "screen", "-nocite"};
char **argv = (char **)args; char **argv = (char **)args;
int argc = sizeof(args) / sizeof(char *); int argc = sizeof(args) / sizeof(char *);
@ -303,7 +303,7 @@ TEST_F(AtomProperties, invalid)
TEST_F(AtomProperties, mass) TEST_F(AtomProperties, mass)
{ {
EXPECT_EQ(lammps_extract_atom_datatype(lmp, "mass"), LAMMPS_DOUBLE); EXPECT_EQ(lammps_extract_atom_datatype(lmp, "mass"), LAMMPS_DOUBLE);
double * mass = (double *)lammps_extract_atom(lmp, "mass"); double *mass = (double *)lammps_extract_atom(lmp, "mass");
ASSERT_NE(mass, nullptr); ASSERT_NE(mass, nullptr);
ASSERT_DOUBLE_EQ(mass[1], 3.0); ASSERT_DOUBLE_EQ(mass[1], 3.0);
} }
@ -311,7 +311,7 @@ TEST_F(AtomProperties, mass)
TEST_F(AtomProperties, id) TEST_F(AtomProperties, id)
{ {
EXPECT_EQ(lammps_extract_atom_datatype(lmp, "id"), LAMMPS_TAGINT); EXPECT_EQ(lammps_extract_atom_datatype(lmp, "id"), LAMMPS_TAGINT);
LAMMPS_NS::tagint * id = (LAMMPS_NS::tagint *)lammps_extract_atom(lmp, "id"); tagint *id = (tagint *)lammps_extract_atom(lmp, "id");
ASSERT_NE(id, nullptr); ASSERT_NE(id, nullptr);
ASSERT_EQ(id[0], 1); ASSERT_EQ(id[0], 1);
ASSERT_EQ(id[1], 2); ASSERT_EQ(id[1], 2);
@ -320,7 +320,7 @@ TEST_F(AtomProperties, id)
TEST_F(AtomProperties, type) TEST_F(AtomProperties, type)
{ {
EXPECT_EQ(lammps_extract_atom_datatype(lmp, "type"), LAMMPS_INT); EXPECT_EQ(lammps_extract_atom_datatype(lmp, "type"), LAMMPS_INT);
int * type = (int *)lammps_extract_atom(lmp, "type"); int *type = (int *)lammps_extract_atom(lmp, "type");
ASSERT_NE(type, nullptr); ASSERT_NE(type, nullptr);
ASSERT_EQ(type[0], 1); ASSERT_EQ(type[0], 1);
ASSERT_EQ(type[1], 1); ASSERT_EQ(type[1], 1);
@ -329,7 +329,7 @@ TEST_F(AtomProperties, type)
TEST_F(AtomProperties, position) TEST_F(AtomProperties, position)
{ {
EXPECT_EQ(lammps_extract_atom_datatype(lmp, "x"), LAMMPS_DOUBLE_2D); EXPECT_EQ(lammps_extract_atom_datatype(lmp, "x"), LAMMPS_DOUBLE_2D);
double ** x = (double **)lammps_extract_atom(lmp, "x"); double **x = (double **)lammps_extract_atom(lmp, "x");
ASSERT_NE(x, nullptr); ASSERT_NE(x, nullptr);
EXPECT_DOUBLE_EQ(x[0][0], 1.0); EXPECT_DOUBLE_EQ(x[0][0], 1.0);
EXPECT_DOUBLE_EQ(x[0][1], 1.0); EXPECT_DOUBLE_EQ(x[0][1], 1.0);