ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update unit tests for changed error messages

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-08-17 23:56:22 -04:00
parent 5a10b09005
commit 5ff56753da
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lattice.cpp
View File

@ -188,7 +188,7 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
if (iarg+4 > narg) utils::missing_cmd_args(FLERR, "lattice a1", error); if (iarg+4 > narg) utils::missing_cmd_args(FLERR, "lattice a1", error);
if (style != CUSTOM) if (style != CUSTOM)
error->all(FLERR, error->all(FLERR,
"Invalid a1 in lattice command for non-custom style"); "Invalid a1 option in lattice command for non-custom style");
a1[0] = utils::numeric(FLERR,arg[iarg+1],false,lmp); a1[0] = utils::numeric(FLERR,arg[iarg+1],false,lmp);
a1[1] = utils::numeric(FLERR,arg[iarg+2],false,lmp); a1[1] = utils::numeric(FLERR,arg[iarg+2],false,lmp);
a1[2] = utils::numeric(FLERR,arg[iarg+3],false,lmp); a1[2] = utils::numeric(FLERR,arg[iarg+3],false,lmp);

28
unittest/commands/test_lattice_region.cpp
View File

@ -45,7 +45,9 @@ protected:
{ {
testbinary = "LatticeRegionTest"; testbinary = "LatticeRegionTest";
LAMMPSTest::SetUp(); LAMMPSTest::SetUp();
command("units metal"); HIDE_OUTPUT([&] {
command("units metal");
});
} }
}; };
@ -63,7 +65,7 @@ TEST_F(LatticeRegionTest, lattice_none)
ASSERT_EQ(lattice->basis, nullptr); ASSERT_EQ(lattice->basis, nullptr);
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice");); TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice"););
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice xxx");); TEST_FAILURE(".*ERROR: Unknown lattice keyword: xxx.*", command("lattice xxx"););
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice none 1.0 origin");); TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice none 1.0 origin"););
TEST_FAILURE(".*ERROR: Expected floating point.*", command("lattice none xxx");); TEST_FAILURE(".*ERROR: Expected floating point.*", command("lattice none xxx"););
@ -114,10 +116,11 @@ TEST_F(LatticeRegionTest, lattice_sc)
ASSERT_EQ(lattice->basis[0][1], 0.0); ASSERT_EQ(lattice->basis[0][1], 0.0);
ASSERT_EQ(lattice->basis[0][2], 0.0); ASSERT_EQ(lattice->basis[0][2], 0.0);
TEST_FAILURE(".*ERROR: Illegal lattice command.*", TEST_FAILURE(".*ERROR: Invalid lattice origin argument: 1.*",
command("lattice sc 1.0 origin 1.0 1.0 1.0");); command("lattice sc 1.0 origin 1.0 1.0 1.0"););
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice sc 1.0 origin 1.0");); TEST_FAILURE(".*ERROR: Illegal lattice origin command: missing argument.*",
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice sc 1.0 origin 1.0"););
TEST_FAILURE(".*ERROR: Unknown lattice keyword: xxx.*",
command("lattice sc 1.0 origin 0.0 0.0 0.0 xxx");); command("lattice sc 1.0 origin 0.0 0.0 0.0 xxx"););
TEST_FAILURE(".*ERROR: Expected floating point.*", TEST_FAILURE(".*ERROR: Expected floating point.*",
command("lattice sc 1.0 origin xxx 1.0 1.0");); command("lattice sc 1.0 origin xxx 1.0 1.0"););
@ -195,11 +198,12 @@ TEST_F(LatticeRegionTest, lattice_fcc)
ASSERT_EQ(lattice->basis[3][1], 0.5); ASSERT_EQ(lattice->basis[3][1], 0.5);
ASSERT_EQ(lattice->basis[3][2], 0.5); ASSERT_EQ(lattice->basis[3][2], 0.5);
TEST_FAILURE(".*ERROR: Invalid option in lattice command for non-custom style.*", TEST_FAILURE(".*ERROR: Invalid basis option in lattice command for non-custom style.*",
command("lattice fcc 1.0 basis 0.0 0.0 0.0");); command("lattice fcc 1.0 basis 0.0 0.0 0.0"););
TEST_FAILURE(".*ERROR: Invalid option in lattice command for non-custom style.*", TEST_FAILURE(".*ERROR: Invalid a1 option in lattice command for non-custom style.*",
command("lattice fcc 1.0 a1 0.0 1.0 0.0");); command("lattice fcc 1.0 a1 0.0 1.0 0.0"););
TEST_FAILURE(".*ERROR: Illegal lattice command.*", command("lattice fcc 1.0 orient w 1 0 0");); TEST_FAILURE(".*ERROR: Unknown lattice orient argument: w.*",
command("lattice fcc 1.0 orient w 1 0 0"););
BEGIN_HIDE_OUTPUT(); BEGIN_HIDE_OUTPUT();
command("dimension 2"); command("dimension 2");
@ -241,9 +245,9 @@ TEST_F(LatticeRegionTest, lattice_hcp)
ASSERT_EQ(lattice->a3[1], 0.0); ASSERT_EQ(lattice->a3[1], 0.0);
ASSERT_DOUBLE_EQ(lattice->a3[2], sqrt(8.0 / 3.0)); ASSERT_DOUBLE_EQ(lattice->a3[2], sqrt(8.0 / 3.0));
TEST_FAILURE(".*ERROR: Invalid option in lattice command for non-custom style.*", TEST_FAILURE(".*ERROR: Invalid a2 option in lattice command for non-custom style.*",
command("lattice hcp 1.0 a2 0.0 1.0 0.0");); command("lattice hcp 1.0 a2 0.0 1.0 0.0"););
TEST_FAILURE(".*ERROR: Invalid option in lattice command for non-custom style.*", TEST_FAILURE(".*ERROR: Invalid a3 option in lattice command for non-custom style.*",
command("lattice hcp 1.0 a3 0.0 1.0 0.0");); command("lattice hcp 1.0 a3 0.0 1.0 0.0"););
BEGIN_HIDE_OUTPUT(); BEGIN_HIDE_OUTPUT();
command("dimension 2"); command("dimension 2");
@ -452,9 +456,9 @@ TEST_F(LatticeRegionTest, lattice_custom)
ASSERT_DOUBLE_EQ(lattice->a3[1], 0.0); ASSERT_DOUBLE_EQ(lattice->a3[1], 0.0);
ASSERT_DOUBLE_EQ(lattice->a3[2], 4.34 * sqrt(8.0 / 3.0)); ASSERT_DOUBLE_EQ(lattice->a3[2], 4.34 * sqrt(8.0 / 3.0));
TEST_FAILURE(".*ERROR: Illegal lattice command.*", TEST_FAILURE(".*ERROR: Invalid lattice basis argument: -0.1.*",
command("lattice custom 1.0 basis -0.1 0 0");); command("lattice custom 1.0 basis -0.1 0 0"););
TEST_FAILURE(".*ERROR: Illegal lattice command.*", TEST_FAILURE(".*ERROR: Invalid lattice basis argument: 1.*",
command("lattice custom 1.0 basis 0.0 1.0 0");); command("lattice custom 1.0 basis 0.0 1.0 0"););
BEGIN_HIDE_OUTPUT(); BEGIN_HIDE_OUTPUT();