diff --git a/CHANGELOG.md b/CHANGELOG.md index 1699dc60b30a8de52988539596fecd079f4f62e4..879769d6597823f7b49d5f5106cbc837d6ac0196 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ release. - Adds support for Smart1 [#16](https://github.com/DOI-USGS/SpiceQL/issues/16) - Adds support for Hayabusa2 ONC [#12](https://github.com/DOI-USGS/SpiceQL/issues/12) - Adds support for Voyager [#13](https://github.com/DOI-USGS/SpiceQL/issues/13) +- Adds support for LROC MiniRF [#10](https://github.com/DOI-USGS/SpiceQL/issues/10) - Adds support for MSL [#15](https://github.com/DOI-USGS/SpiceQL/issues/15) ### Fixed diff --git a/SpiceQL/db/lro.json b/SpiceQL/db/lro.json index 3398314989590d7b1bd7083141b33cc85203bae2..1570bdcabbbf46453bdfdd46ed5a519bdb3e6cda 100644 --- a/SpiceQL/db/lro.json +++ b/SpiceQL/db/lro.json @@ -45,5 +45,11 @@ "kernels" : ["lro_lroc_v[0-9]{2}.ti$"] }, "deps" : ["/moc"] + }, + "minirf" : { + "iak" : { + "kernels" : "mrflroAddendum[0-9]{3}.ti$" + }, + "deps" : ["/lroc"] } } \ No newline at end of file diff --git a/SpiceQL/tests/FunctionalTestsConfig.cpp b/SpiceQL/tests/FunctionalTestsConfig.cpp index d4e6a0300a469e9f50a786669d95a098825efe02..da246716444f12727b652ffce52072023de47a8d 100644 --- a/SpiceQL/tests/FunctionalTestsConfig.cpp +++ b/SpiceQL/tests/FunctionalTestsConfig.cpp @@ -16,7 +16,7 @@ using namespace SpiceQL; TEST_F(TestConfig, FunctionalTestConfigConstruct) { json megaConfig = testConfig.globalConf(); - EXPECT_EQ(megaConfig.size(), 68); + EXPECT_EQ(megaConfig.size(), 69); } TEST_F(TestConfig, FunctionalTestConfigEval) { diff --git a/SpiceQL/tests/QueryTests.cpp b/SpiceQL/tests/QueryTests.cpp index 2c87c44daf14dc80d2d4286063765d54254b79d5..a7916ebc0a7c0888aaeb142cc7788e4d8c6134ed 100644 --- a/SpiceQL/tests/QueryTests.cpp +++ b/SpiceQL/tests/QueryTests.cpp @@ -261,6 +261,11 @@ TEST_F(IsisDataDirectory, FunctionalTestLroConf) { FAIL() << e << " was not found in the kernel results"; } } + + kernelToCheck = getKernelsAsVector(res.at("minirf").at("iak")); + expected = {"mrflroAddendum002.ti"}; + EXPECT_EQ(kernelToCheck, expected); + } diff --git a/SpiceQL/tests/data/isisKernelList.txt b/SpiceQL/tests/data/isisKernelList.txt index 53c78748629dc711edea39d5b2f508126be30236..cf286e8a21f232337d1ddf49fd67e9193ced23e4 100644 --- a/SpiceQL/tests/data/isisKernelList.txt +++ b/SpiceQL/tests/data/isisKernelList.txt @@ -12222,6 +12222,7 @@ /usgs/cpkgs/isis3/isis_data/lro/kernels/iak/lro_instrumentAddendum_v01.ti /usgs/cpkgs/isis3/isis_data/lro/kernels/iak/lro_instrumentAddendum_v03.ti /usgs/cpkgs/isis3/isis_data/lro/kernels/iak/lro_instrumentAddendum_v04.ti +/usgs/cpkgs/isis3/isis_data/lro/kernels/iak/mrflroAddendum002.ti /usgs/cpkgs/isis3/isis_data/lro/kernels/spk/fdf29r_2018305_2018335_v01.bsp /usgs/cpkgs/isis3/isis_data/lro/kernels/spk/fdf29r_2014091_2014121_v01.bsp /usgs/cpkgs/isis3/isis_data/lro/kernels/spk/fdf29r_2018121_2018152_v01.bsp