Unverified Commit 7b3eaa56 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Adds config for lo (#19) 

* Added lo config, tests, and test data

* Update changelog
parent c587922b

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ release. 
## [Unreleased]



### Added

- Adds support for LO [#11](ihttps://github.com/DOI-USGS/SpiceQL/issues/11)



### Fixed

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/juno.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kaguya.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/lro.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/lo.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mess.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mex.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/mgs.json

SpiceQL/db/lo.json

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{

    "lo": {

        "spk": {

            "reconstructed": {

                "kernels": ["lo[0-9]{1}_photo_support_ME.bsp"]

            }

        },

        "lsk": {

            "kernels": ["naif[0-9]{4}.tls$"]

        },

        "iak": {

            "kernels": ["lunarOrbiterAddendum[0-9]{3}.ti$"]

        },

        "ik": {

            "kernels": ["lo[0-9]{2}.ti$"]

        },

        "ck": {

            "reconstructed": {

                "kernels": ["lo[0-9]{1}_photo_support_ME.bc$"]

            }

        },

        "sclk": {

            "kernels": ["lo[0-9]{0,1}_fict.tsc$"]

        },

        "deps" : ["/base/pck"]

    }

}
 
 No newline at end of file

SpiceQL/tests/FunctionalTestsConfig.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ using namespace SpiceQL; 
TEST_F(TestConfig, FunctionalTestConfigConstruct) {

  json megaConfig = testConfig.globalConf();



  EXPECT_EQ(megaConfig.size(), 62);

  EXPECT_EQ(megaConfig.size(), 63);

}



TEST_F(TestConfig, FunctionalTestConfigEval) {
@@ -149,7 +149,7 @@ TEST_F(TestConfig, FunctionalTestsConfigGetRecursive) { 


  json resJson = testConfig.getRecursive("sclk");



  EXPECT_EQ(resJson.size(), 56);

  EXPECT_EQ(resJson.size(), 57);

  for (auto &[key, val] : resJson.items()) {

    EXPECT_TRUE(val.contains("sclk"));

  }

SpiceQL/tests/QueryTests.cpp

+31 −0
Original line number Diff line number Diff line
@@ -526,3 +526,34 @@ TEST_F(IsisDataDirectory, FunctionalTestListMissionKernelsMex) { 
  CompareKernelSets(getKernelsAsVector(res.at("mex").at("spk").at("reconstructed")), expected);  



}



TEST_F(IsisDataDirectory, FunctionalTestListMissionKernelsLo) {

  fs::path dbPath = getMissionConfigFile("lo");

  

  compareKernelSets("lo");



  ifstream i(dbPath);

  nlohmann::json conf = nlohmann::json::parse(i);



  MockRepository mocks;

  mocks.OnCallFunc(ls).Return(files);



  nlohmann::json res = listMissionKernels("doesn't matter", conf);



  set<string> kernels = getKernelsAsSet(res);set<string> mission = missionMap.at("lo");

  

  vector<string> expected = {"lo3_photo_support_ME.bsp", "lo4_photo_support_ME.bsp", "lo5_photo_support_ME.bsp"};

  CompareKernelSets(getKernelsAsVector(res.at("lo").at("spk").at("reconstructed")), expected);



  expected = {"lo3_photo_support_ME.bc", "lo4_photo_support_ME.bc", "lo5_photo_support_ME.bc"};

  CompareKernelSets(getKernelsAsVector(res.at("lo").at("ck").at("reconstructed")), expected); 



  expected = {"lo01.ti", "lo02.ti"};

  CompareKernelSets(getKernelsAsVector(res.at("lo").at("ik")), expected);



  expected = {"lunarOrbiterAddendum001.ti", "lunarOrbiterAddendum002.ti"};

  CompareKernelSets(getKernelsAsVector(res.at("lo").at("iak")), expected);



  expected = {"lo_fict.tsc", "lo_fict1.tsc","lo_fict2.tsc","lo_fict3.tsc","lo_fict4.tsc","lo_fict5.tsc"};

  CompareKernelSets(getKernelsAsVector(res.at("lo").at("sclk")), expected);

}
 
 No newline at end of file