Fix tests

Author: matthewmturner

src/config.rs

@@ -175,8 +175,8 @@ pub struct AppConfig {
     #[cfg(feature = "http")]
     #[serde(default)]
     pub http_server: HttpServerConfig,
-    #[serde(default = "defaul_file_cache_dir")]
-    pub db_dir: PathBuf,
+    #[serde(default = "default_db_config")]
+    pub db: DbConfig,
 }
 
 fn default_execution_config() -> ExecutionConfig {
@@ -191,7 +191,25 @@ fn default_interaction_config() -> InteractionConfig {
     InteractionConfig::default()
 }
 
-fn defaul_file_cache_dir() -> PathBuf {
+#[derive(Debug, Clone, Deserialize)]
+pub struct DbConfig {
+    #[serde(default = "default_db_path")]
+    pub path: PathBuf,
+}
+
+impl Default for DbConfig {
+    fn default() -> Self {
+        default_db_config()
+    }
+}
+
+fn default_db_config() -> DbConfig {
+    DbConfig {
+        path: default_db_path(),
+    }
+}
+
+fn default_db_path() -> PathBuf {
     let base = directories::BaseDirs::new().expect("Base directories should be available");
     base.data_dir().to_path_buf().join("dft")
 }

src/tpch.rs

@@ -66,22 +66,22 @@ impl TryFrom<&str> for GeneratorType {
 }
 
 fn create_tpch_dirs(config: &AppConfig) -> Result<Vec<(GeneratorType, PathBuf)>> {
-    info!("...configured `db_dir` is {:?}", config.db_dir);
-    if config.db_dir.is_file() {
-        eyre::bail!("config `db_path` is a file and it must be a dir")
+    info!("...configured DB directory is {:?}", config.db.path);
+    if config.db.path.is_file() {
+        eyre::bail!("config DB directory is a file and it must be a directory")
     }
 
-    if !config.db_dir.exists() {
-        info!("...`db_dir` does not exist, creating");
-        std::fs::create_dir_all(config.db_dir.clone())?;
+    if !config.db.path.exists() {
+        info!("...DB directory does not exist, creating");
+        std::fs::create_dir_all(config.db.path.clone())?;
     } else {
-        info!("...`db_dir` exists");
+        info!("...DB directory exists");
     }
-    let tpch_dir = config.db_dir.join("tables").join("tpch");
+    let tpch_dir = config.db.path.join("tables").join("tpch");
     if !tpch_dir.exists() {
         info!(
             "...TPC-H table directory ({:?}) does not exist, creating",
-            config.db_dir
+            config.db.path
         );
         create_dir_all(&tpch_dir)?;
     } else {

tests/cli_cases/mod.rs

@@ -18,6 +18,7 @@
 mod basic;
 mod bench;
 mod config;
+mod tpch;
 
 use assert_cmd::Command;
 use predicates::str::ContainsPredicate;

tests/cli_cases/tpch.rs

@@ -0,0 +1,61 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//! Tests for the CLI (e.g. run from files) to make sure config works as expected
+
+use std::fs::DirEntry;
+
+use crate::config::TestConfigBuilder;
+use assert_cmd::Command;
+
+#[test]
+fn test_custom_config() {
+    let tempdir = tempfile::tempdir().unwrap();
+    let db_path = tempdir.path().join("db");
+    std::fs::create_dir_all(&db_path).unwrap();
+    let mut config_builder = TestConfigBuilder::default();
+    config_builder.with_db_path(db_path.to_str().unwrap());
+    let config = config_builder.build("my_config.toml");
+
+    Command::cargo_bin("dft")
+        .unwrap()
+        .arg("--config")
+        .arg(config.path)
+        .arg("generate-tpch")
+        .assert()
+        .success();
+
+    let needed_dirs = [
+        "customers",
+        "orders",
+        "line_items",
+        "nations",
+        "parts",
+        "part_supps",
+        "regions",
+        "suppliers",
+    ];
+    let tables_path = db_path.join("tables").join("tpch");
+    std::fs::read_dir(tables_path).unwrap().for_each(|e| {
+        let entry = e.unwrap();
+        assert!(needed_dirs.contains(&entry.file_name().to_str().unwrap()));
+        let data = entry.path().join("data.parquet");
+        assert!(data.exists());
+        let metadata = data.metadata().unwrap();
+        assert!(metadata.len() > 1000);
+    })
+}

tests/config.rs

@@ -227,7 +227,8 @@ impl TestConfigBuilder {
     }
 
     pub fn with_db_path(&mut self, path: &str) -> &mut Self {
-        self.config_text.push_str(&format!("db_dir = {path}\n"));
+        self.config_text.push_str("[db]\n");
+        self.config_text.push_str(&format!("path = \"{path}\""));
         self
     }
 }