Fix all tests to work with embedded data, no CCD

906f6ac1 · Maarten L. Hekkelman · 8d96e513 · 906f6ac1 · 906f6ac1 · 906f6ac1
Commit 906f6ac1 authored Oct 13, 2021 by Maarten L. Hekkelman
Expand all Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

test/HEM.cif
+0 -0

test/structure-test.cpp
+4 -2

test/unit-test.cpp
+4 -1

No files found.
--- a/test/HEM.cif
+++ b/test/HEM.cif
--- a/test/structure-test.cpp
+++ b/test/structure-test.cpp
@@ -60,8 +60,10 @@ BOOST_AUTO_TEST_CASE(init)
 		gTestDir = boost::unit_test::framework::master_test_suite().argv[1];

 	// initialize CCD location
-	if (std::filesystem::exists(gTestDir / ".."/"data"/"components.cif"))
-		cif::addFileResource("components.cif", gTestDir / ".."/"data"/"components.cif");
+	if (std::filesystem::exists(gTestDir / ".." / "data" / "ccd-subset.cif"))
+		cif::addFileResource("components.cif", gTestDir / ".." / "data" / "ccd-subset.cif");
+
+	mmcif::CompoundFactory::instance().pushDictionary(gTestDir / "HEM.cif");
 }

 // --------------------------------------------------------------------

--- a/test/unit-test.cpp
+++ b/test/unit-test.cpp
@@ -56,9 +56,12 @@ cif::File operator""_cf(const char* text, size_t length)
 BOOST_AUTO_TEST_CASE(init)
 {
 	// not a test, just initialize test dir
-
 	if (boost::unit_test::framework::master_test_suite().argc == 2)
 		gTestDir = boost::unit_test::framework::master_test_suite().argv[1];
+
+	// initialize CCD location
+	if (std::filesystem::exists(gTestDir / ".." / "data" / "ccd-subset.cif"))
+		cif::addFileResource("components.cif", gTestDir / ".." / "data" / "ccd-subset.cif");
 }

 // --------------------------------------------------------------------