update kim unit tests for recent changes, make variable for extended test an option

This commit is contained in:
Axel Kohlmeyer
2023-03-20 07:11:47 -04:00
parent f4314076ae
commit e317b0eb7e
2 changed files with 9 additions and 9 deletions

View File

@ -19,7 +19,7 @@ if(CURL_FOUND)
target_compile_definitions(lammps PRIVATE -DLMP_NO_SSL_CHECK) target_compile_definitions(lammps PRIVATE -DLMP_NO_SSL_CHECK)
endif() endif()
endif() endif()
set(KIM_EXTRA_UNITTESTS OFF CACHE STRING "Set extra unit tests verbose mode on/off. If on, extra tests are included.") option(KIM_EXTRA_UNITTESTS "Enable extra unit tests for the KIM package." OFF)
mark_as_advanced(KIM_EXTRA_UNITTESTS) mark_as_advanced(KIM_EXTRA_UNITTESTS)
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
set(DOWNLOAD_KIM_DEFAULT ON) set(DOWNLOAD_KIM_DEFAULT ON)

View File

@ -92,14 +92,14 @@ TEST_F(KimCommandsTest, kim_interactions)
{ {
if (!LAMMPS::is_installed_pkg("KIM")) GTEST_SKIP(); if (!LAMMPS::is_installed_pkg("KIM")) GTEST_SKIP();
TEST_FAILURE(".*ERROR: Illegal 'kim interactions' command.*", command("kim interactions");); TEST_FAILURE(".*ERROR: Illegal kim interactions command: missing argument.*",
command("kim interactions"););
BEGIN_HIDE_OUTPUT(); BEGIN_HIDE_OUTPUT();
command("kim init LennardJones_Ar real"); command("kim init LennardJones_Ar real");
END_HIDE_OUTPUT(); END_HIDE_OUTPUT();
TEST_FAILURE(".*ERROR: Must use 'kim interactions' command " TEST_FAILURE(".*ERROR: Use of 'kim interactions' before simulation box is defined.*",
"after simulation box is defined.*",
command("kim interactions Ar");); command("kim interactions Ar"););
BEGIN_HIDE_OUTPUT(); BEGIN_HIDE_OUTPUT();
@ -410,11 +410,11 @@ TEST_F(KimCommandsTest, kim_property)
"3 >= 3.6 support.*", "3 >= 3.6 support.*",
command("kim property");); command("kim property"););
} else { } else {
TEST_FAILURE(".*ERROR: Invalid 'kim property' command.*", command("kim property");); TEST_FAILURE(".*ERROR: Illegal kim property command: missing argument.*",
TEST_FAILURE(".*ERROR: Invalid 'kim property' command.*", command("kim property create");); command("kim property"););
TEST_FAILURE(".*ERROR: Incorrect arguments in 'kim property' command." TEST_FAILURE(".*ERROR: Illegal kim property command: missing argument.*",
"\n'kim property create/destroy/modify/remove/dump' " command("kim property create"););
"is mandatory.*", TEST_FAILURE(".*ERROR: Incorrect first argument unknown to 'kim property' command.*",
command("kim property unknown 1 atomic-mass");); command("kim property unknown 1 atomic-mass"););
} }
#if defined(KIM_EXTRA_UNITTESTS) #if defined(KIM_EXTRA_UNITTESTS)