From 2dfba0c70840436a93318564cd69f9f71ed5d49d Mon Sep 17 00:00:00 2001 From: Austin Sanders <arsanders@usgs.gov> Date: Mon, 29 Apr 2024 08:53:20 -0600 Subject: [PATCH] Added minirf to lro conf (#29) * Updated for lro minirf * updated changelog * Updated megaconfig size * updated changelog * Updated mega config size * Updated changelog again? --- CHANGELOG.md | 1 + SpiceQL/db/lro.json | 6 ++++++ SpiceQL/tests/FunctionalTestsConfig.cpp | 2 +- SpiceQL/tests/QueryTests.cpp | 5 +++++ SpiceQL/tests/data/isisKernelList.txt | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1699dc6..879769d 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 3398314..1570bdc 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 d4e6a03..da24671 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 2c87c44..a7916eb 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 53c7874..cf286e8 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 -- GitLab