Merge pull request #4 from bodo-run/deepseek-tests

Deepseek R1 tests

Author: mohsen1

.github/workflows/ci.yml

@@ -17,12 +17,22 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo build --all-features
+
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
+      - run: cd examples/basic && cargo build --all-features
+      - run: cd examples/advanced && cargo build --all-features
       - run: cargo test --all-features
       - run: cargo run --example basic
       - run: cargo run --example advanced

Cargo.toml

@@ -43,3 +43,4 @@ path = "examples/basic/src/main.rs"
 [[example]]
 name = "advanced"
 path = "examples/advanced/src/main.rs"
+

examples/advanced/src/main.rs

@@ -1,9 +1,10 @@
 use clap_config_file::ClapConfigFile;
 use serde::{Deserialize, Serialize};
+
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct ExtraSettings {
     pub nesting_level: i64,
-    pub allow_guest: bool,
+    pub allow_guest: Option<bool>,
 }
 
 /// A single struct for both CLI and config file usage

examples/basic/Cargo.toml

@@ -12,4 +12,8 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 toml = "0.8"
 log = "0.4"
-env_logger = "0.10"
+env_logger = "0.10"
+
+[[bin]]
+name = "basic"
+path = "src/main.rs"

examples/basic/src/main.rs

@@ -5,14 +5,16 @@ use clap_config_file::ClapConfigFile;
 #[config_file_name = "app-config"]
 #[config_file_formats = "yaml,toml,json"]
 struct AppConfig {
-    pub database_url: String,
+    #[config_arg()]
+    pub database_url: Option<String>,
 
     #[config_arg(default_value = "8080")]
     pub port: u16,
 
     #[config_arg(default_value = "false")]
     pub debug: Option<bool>,
 }
+
 fn main() {
     let (cfg, maybe_path, maybe_fmt) = AppConfig::parse_info();
     println!("Final config:\n{:#?}", cfg);

tests/advanced.rs

@@ -0,0 +1,76 @@
+use assert_cmd::prelude::*;
+use predicates::prelude::*;
+use std::process::Command;
+use tempfile::TempDir;
+
+#[test]
+fn extend_list_merging() -> Result<(), Box<dyn std::error::Error>> {
+    let dir = TempDir::new()?;
+    std::fs::write(dir.path().join("advanced-config.yaml"), 
+        "extend_list: [\"config_item\"]\noverwrite_list: [\"config_item\"]\nspecial_secret: \"secret\"\nextra_settings: { nesting_level: 3, allow_guest: false }")?;
+
+    Command::cargo_bin("advanced")?
+        .current_dir(dir.path())
+        .arg("--extend-list")
+        .arg("cli_item")
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains("extend_list: [")
+                .and(predicate::str::contains("\"config_item\""))
+                .and(predicate::str::contains("\"cli_item\"")),
+        );
+
+    Ok(())
+}
+
+#[test]
+fn overwrite_list_cli() -> Result<(), Box<dyn std::error::Error>> {
+    let dir = TempDir::new()?;
+    std::fs::write(dir.path().join("advanced-config.yaml"), 
+        "overwrite_list: [\"config_item\"]\nspecial_secret: \"secret\"\nextra_settings: { nesting_level: 3, allow_guest: false }")?;
+
+    Command::cargo_bin("advanced")?
+        .current_dir(dir.path())
+        .arg("--overwrite-list")
+        .arg("cli_item")
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains("overwrite_list: [")
+                .and(predicate::str::contains("\"cli_item\"")),
+        );
+
+    Ok(())
+}
+
+#[test]
+fn config_only_field_from_file() -> Result<(), Box<dyn std::error::Error>> {
+    let dir = TempDir::new()?;
+    std::fs::write(
+        dir.path().join("advanced-config.yaml"),
+        "special_secret: \"from_config\"\nextra_settings: { nesting_level: 3, allow_guest: false }",
+    )?;
+
+    Command::cargo_bin("advanced")?
+        .current_dir(dir.path())
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("special_secret: \"from_config\""));
+
+    Ok(())
+}
+
+#[test]
+fn cli_config_only_field_error() -> Result<(), Box<dyn std::error::Error>> {
+    Command::cargo_bin("advanced")?
+        .arg("--special-secret")
+        .arg("from_cli")
+        .assert()
+        .failure()
+        .stderr(predicate::str::contains(
+            "unexpected argument '--special-secret'",
+        ));
+
+    Ok(())
+}

tests/basic.rs

@@ -0,0 +1,54 @@
+use assert_cmd::prelude::*;
+use predicates::prelude::*;
+use std::path::Path;
+use std::process::Command;
+
+#[test]
+fn with_config_file() -> Result<(), Box<dyn std::error::Error>> {
+    // path to basic example
+    let dir = Path::new("examples/basic");
+
+    Command::cargo_bin("basic")?
+        .current_dir(dir)
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Final config:"))
+        .stdout(predicate::str::contains("port: 8080"))
+        .stdout(predicate::str::contains("postgres://localhost:5432/mydb"))
+        .stdout(predicate::str::contains("Loaded config from:"));
+
+    Ok(())
+}
+
+#[test]
+fn cli_override_port() -> Result<(), Box<dyn std::error::Error>> {
+    // path to basic example
+    let dir = Path::new("examples/basic");
+
+    Command::cargo_bin("basic")?
+        .current_dir(dir)
+        .arg("--port")
+        .arg("9090")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Final config:"))
+        .stdout(predicate::str::contains("port: 9090"))
+        .stdout(predicate::str::contains("postgres://localhost:5432/mydb"))
+        .stdout(predicate::str::contains("Loaded config from:"));
+
+    Ok(())
+}
+
+#[test]
+fn no_config_uses_defaults() -> Result<(), Box<dyn std::error::Error>> {
+    Command::cargo_bin("basic")?
+        .arg("--no-config")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Final config:"))
+        .stdout(predicate::str::contains("port: 8080"))
+        .stdout(predicate::str::contains("database_url: None"))
+        .stdout(predicate::str::contains("No config file used"));
+
+    Ok(())
+}