4840c7c · bat · git.iko.soy

git.iko.soy/bat

on master help sign in

Tests ~ add predicate normalization for tests using `echo`

4840c7cRoy Ivy III6 years ago

Cargo.toml+1

compare with master

unifiedsplit

@@ -76,6 +76,7 @@ default-features = false

76[dev-dependencies]

77tempdir = "0.3"

78assert_cmd = "1.0.1"

79+predicates = "1.0.4"

80[build-dependencies]

81[build-dependencies]

81clap = { version = "2.33", optional = true }

82clap = { version = "2.33", optional = true }

tests/integration_tests.rs+5−4

@@ -1,4 +1,5 @@

1use assert_cmd::Command;

2+use predicates::{prelude::predicate,str::PredicateStrExt};

2use std::path::Path;

3use std::path::Path;

3use std::str::from_utf8;

4use std::str::from_utf8;

@@ -454,7 +455,7 @@ fn pager_basic() {

454 println!("stdout={:#?}", stdout);

455 println!("stdout={:#?}", stdout);

455 assert

456 assert

456 .success()

457 .success()

457− .stdout("pager-output\n");

458+ .stdout(predicate::eq("pager-output\n").normalize());

458}

459}

459

460

460#[test]

461#[test]

@@ -469,7 +470,7 @@ fn pager_overwrite() {

469 println!("stdout={:#?}", stdout);

470 println!("stdout={:#?}", stdout);

470 assert

471 assert

471 .success()

472 .success()

472− .stdout("pager-output\n");

473+ .stdout(predicate::eq("pager-output\n").normalize());

473}

474}

474

475

475#[test]

476#[test]

@@ -484,7 +485,7 @@ fn pager_disable() {

484 println!("stdout={:#?}", stdout);

485 println!("stdout={:#?}", stdout);

485 assert

486 assert

486 .success()

487 .success()

487− .stdout("hello world\n");

488+ .stdout(predicate::eq("hello world\n").normalize());

488}

489}

489

490

490#[test]

491#[test]

@@ -510,7 +511,7 @@ fn config_read_arguments_from_file() {

510 println!("stdout={:#?}", stdout);

511 println!("stdout={:#?}", stdout);

511 assert

512 assert

512 .success()

513 .success()

513− .stdout("dummy-pager-from-config\n");

514+ .stdout(predicate::eq("dummy-pager-from-config\n").normalize());

514}

515}

515

516

516#[test]

517#[test]