Skip to content
This repository was archived by the owner on Dec 29, 2021. It is now read-only.

Support more than one output assertion #36

Closed
wants to merge 1 commit into from
Closed

Support more than one output assertion #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions src/assert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::default;
use std::process::Command;
use std::path::PathBuf;
use std::vec::Vec;

use errors::*;
use output::{OutputAssertion, StdErr, StdOut};
Expand All @@ -12,8 +13,8 @@ pub struct Assert {
current_dir: Option<PathBuf>,
expect_success: Option<bool>,
expect_exit_code: Option<i32>,
expect_stdout: Option<OutputAssertion<StdOut>>,
expect_stderr: Option<OutputAssertion<StdErr>>,
expect_stdout: Vec<OutputAssertion<StdOut>>,
expect_stderr: Vec<OutputAssertion<StdErr>>,
}

impl default::Default for Assert {
Expand All @@ -27,8 +28,8 @@ impl default::Default for Assert {
current_dir: None,
expect_success: Some(true),
expect_exit_code: None,
expect_stdout: None,
expect_stderr: None,
expect_stdout: vec![],
expect_stderr: vec![],
}
}
}
Expand Down Expand Up @@ -189,7 +190,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn prints<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stdout = Some(OutputAssertion {
self.expect_stdout.push(OutputAssertion {
expect: output.into(),
fuzzy: true,
expected_result: true,
Expand All @@ -210,7 +211,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn prints_exactly<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stdout = Some(OutputAssertion {
self.expect_stdout.push(OutputAssertion {
expect: output.into(),
fuzzy: false,
expected_result: true,
Expand All @@ -233,7 +234,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn prints_error<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stderr = Some(OutputAssertion {
self.expect_stderr.push(OutputAssertion {
expect: output.into(),
fuzzy: true,
expected_result: true,
Expand All @@ -256,7 +257,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn prints_error_exactly<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stderr = Some(OutputAssertion {
self.expect_stderr.push(OutputAssertion {
expect: output.into(),
fuzzy: false,
expected_result: true,
Expand All @@ -278,7 +279,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn doesnt_print<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stdout = Some(OutputAssertion {
self.expect_stdout.push(OutputAssertion {
expect: output.into(),
fuzzy: true,
expected_result: false,
Expand All @@ -300,7 +301,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn doesnt_print_exactly<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stdout = Some(OutputAssertion {
self.expect_stdout.push(OutputAssertion {
expect: output.into(),
fuzzy: false,
expected_result: false,
Expand All @@ -324,7 +325,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn doesnt_print_error<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stderr = Some(OutputAssertion {
self.expect_stderr.push(OutputAssertion {
expect: output.into(),
fuzzy: true,
expected_result: false,
Expand All @@ -348,7 +349,7 @@ impl Assert {
/// .unwrap();
/// ```
pub fn doesnt_print_error_exactly<O: Into<String>>(mut self, output: O) -> Self {
self.expect_stderr = Some(OutputAssertion {
self.expect_stderr.push(OutputAssertion {
expect: output.into(),
fuzzy: false,
expected_result: false,
Expand Down Expand Up @@ -380,7 +381,6 @@ impl Assert {
};
let output = command.output()?;


if let Some(expect_success) = self.expect_success {
if expect_success != output.status.success() {
bail!(ErrorKind::StatusMismatch(
Expand All @@ -399,15 +399,14 @@ impl Assert {
));
}

if let Some(ref ouput_assertion) = self.expect_stdout {
ouput_assertion.execute(&output)
.map_err(|e| ErrorKind::StdoutMismatch(self.cmd.clone(), e))?;
}

if let Some(ref ouput_assertion) = self.expect_stderr {
ouput_assertion.execute(&output)
.map_err(|e| ErrorKind::StderrMismatch(self.cmd.clone(), e))?;
}
self.expect_stdout
.iter()
.map(|a| a.execute(&output).map_err(|e| ErrorKind::StdoutMismatch(self.cmd.clone(), e).into()))
.collect::<Result<Vec<()>>>()?;
self.expect_stderr
.iter()
.map(|a| a.execute(&output).map_err(|e| ErrorKind::StderrMismatch(self.cmd.clone(), e).into()))
.collect::<Result<Vec<()>>>()?;

Ok(())
}
Expand Down