From 7e81f8af1d7e55e924f590ad16596a9b63d7f05e Mon Sep 17 00:00:00 2001 From: Alexander Taepper Date: Wed, 9 Aug 2023 15:21:22 +0200 Subject: [PATCH] refactor: rename test_database_config.yaml to database_config.yaml in exampleDataset --- src/silo/config/database_config.test.cpp | 3 +-- src/silo/database.test.cpp | 2 +- testBaseData/test_database_config.yaml | 29 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 testBaseData/test_database_config.yaml diff --git a/src/silo/config/database_config.test.cpp b/src/silo/config/database_config.test.cpp index eb4b22990..68446a657 100644 --- a/src/silo/config/database_config.test.cpp +++ b/src/silo/config/database_config.test.cpp @@ -80,8 +80,7 @@ INSTANTIATE_TEST_SUITE_P( TEST(DatabaseConfigReader, shouldReadConfigWithCorrectParameters) { DatabaseConfig config; ASSERT_NO_THROW( - config = - DatabaseConfigReader().readConfig("testBaseData/exampleDataset/test_database_config.yaml") + config = DatabaseConfigReader().readConfig("testBaseData/test_database_config.yaml") ); ASSERT_EQ(config.schema.instance_name, "sars_cov-2_minimal_test_config"); diff --git a/src/silo/database.test.cpp b/src/silo/database.test.cpp index bc619c424..8c6af77f7 100644 --- a/src/silo/database.test.cpp +++ b/src/silo/database.test.cpp @@ -18,7 +18,7 @@ silo::Database buildTestDatabase() { .mergeValuesFromOrDefault(silo::preprocessing::OptionalPreprocessingConfig()); const auto database_config = silo::config::ConfigRepository().getValidatedConfig( - input_directory.directory + "test_database_config.yaml" + input_directory.directory + "database_config.yaml" ); return silo::Database::preprocessing(config, database_config); diff --git a/testBaseData/test_database_config.yaml b/testBaseData/test_database_config.yaml new file mode 100644 index 000000000..c314c60d8 --- /dev/null +++ b/testBaseData/test_database_config.yaml @@ -0,0 +1,29 @@ +schema: + instanceName: sars_cov-2_minimal_test_config + metadata: + - name: gisaid_epi_isl + type: string + - name: date + type: date + - name: unsorted_date + type: date + - name: region + type: string + generateIndex: true + - name: country + type: string + generateIndex: true + - name: pango_lineage + type: pango_lineage + - name: division + type: string + generateIndex: true + - name: age + type: int + - name: qc_value + type: float + - name: insertions + type: insertion + primaryKey: gisaid_epi_isl + dateToSortBy: date + partitionBy: pango_lineage \ No newline at end of file