diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1d2c403..7989122 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Build run: cd build && make -j - name: Perform unit tests - run: cd build && OMP_NUM_THREADS=1 make test # suppress parallel sections for tests + run: cd build && make test - name: Perform code coverage run: | cd build diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 07dcbfe..f92c3cf 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -51,7 +51,7 @@ endif() # add unpacking of dataset to the test suite add_test(NAME DatasetSetup COMMAND tar -xvjf dataset.tar.bz2) -add_test(NAME DatasetCleanup COMMAND rm -rvf CHGCAR_* PARCHG_*) +add_test(NAME DatasetCleanup COMMAND rm -rvf CHGCAR_* PARCHG_* *.d2o *.cub) set_tests_properties(DatasetSetup PROPERTIES FIXTURES_SETUP Dataset) set_tests_properties(DatasetCleanup PROPERTIES FIXTURES_CLEANUP Dataset) diff --git a/src/test/test_scalarfield.cpp b/src/test/test_scalarfield.cpp index 8a76299..0cf2d82 100644 --- a/src/test/test_scalarfield.cpp +++ b/src/test/test_scalarfield.cpp @@ -28,7 +28,7 @@ void TestScalarField::setUp() { void TestScalarField::tearDown() { } -void TestScalarField::testReading() { +void TestScalarField::testReadingCHGCAR() { // create scalar field ScalarField sf("CHGCAR_CH4", ScalarFieldInputFileType::SFF_CHGCAR); CPPUNIT_ASSERT_EQUAL( (uint)0, sf.get_size() ); @@ -90,3 +90,8 @@ void TestScalarField::testReading() { sf.get_value_interp(0.0,0.0,10.0), 1e-12); } + +void TestScalarField::testReadingCUB() { + // test reading sf file + ScalarField sf("co_2pi_x.cub", ScalarFieldInputFileType::SFF_CUB); +} diff --git a/src/test/test_scalarfield.h b/src/test/test_scalarfield.h index d6bf7e9..0444dc8 100644 --- a/src/test/test_scalarfield.h +++ b/src/test/test_scalarfield.h @@ -28,15 +28,16 @@ class TestScalarField : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE( TestScalarField ); - CPPUNIT_TEST( testReading ); + CPPUNIT_TEST( testReadingCHGCAR ); + CPPUNIT_TEST( testReadingCUB ); CPPUNIT_TEST_SUITE_END(); public: void setUp(); void tearDown(); - void testReading(); - void testD2OFileFormat(); + void testReadingCHGCAR(); + void testReadingCUB(); private: }; diff --git a/src/test/testinput/ch4.d2o b/src/test/testinput/ch4.d2o deleted file mode 100644 index 5c5295d..0000000 Binary files a/src/test/testinput/ch4.d2o and /dev/null differ diff --git a/src/test/testinput/dataset.tar.bz2 b/src/test/testinput/dataset.tar.bz2 index db64312..d3ac2de 100644 Binary files a/src/test/testinput/dataset.tar.bz2 and b/src/test/testinput/dataset.tar.bz2 differ