Merge pull request #24 from mesalock-linux/tests/refactor

Refactor current tests and start to use `assert_cmd`

Author: Arcterus

Cargo.lock

@@ -104,6 +104,9 @@ env_logger = { version = "0.5.11", optional = true }
 tempfile = "3.0.2"
 libc = "0.2.40"
 lazy_static = "1.0.1"
+assert_cmd = "0.6.0"
+assert_fs = "0.3.0"
+predicates = "0.5.2"
 
 [profile.release]
 lto = true

Cargo.toml

@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+get_crate_name()
+{
+  while [[ $# -gt 1 ]] ; do
+    v=$1
+    case $v in
+      --crate-name)
+        echo $2
+        return
+        ;;
+    esac
+    shift
+  done
+}
+
+case $(get_crate_name "$@") in
+    libmesabox)
+    EXTRA=$COVERAGE_OPTIONS
+    ;;
+  *)
+    ;;
+esac
+
+exec "$@" $EXTRA

ci/libmesabox-cov-rustc

@@ -2,7 +2,6 @@
 
 for path in /usr/lib/llvm-3.8/lib/clang/3.8.[0-9]/lib/linux/; do LLVM_PATH=$path; done
 export COVERAGE_OPTIONS="-Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Cpasses=insert-gcov-profiling -Zno-landing-pads -L$LLVM_PATH -lclang_rt.profile-x86_64"
-export RUSTC_WRAPPER="./ci/cov-rustc"
 export CARGO_INCREMENTAL=0
 
 LCOVOPT="--gcov-tool ./ci/llvm-gcov --rc lcov_branch_coverage=1 --rc lcov_excl_line=assert"
@@ -12,25 +11,27 @@ LCOV="/usr/local/bin/lcov"
 rm -rf *.info *.gcda *.gcno
 cargo clean
 
-# unit tests
-cargo rustc --all-features --profile test --lib
-rm ./target/debug/mesabox-*.d
-./target/debug/mesabox-*
-${LCOV} ${LCOVOPT} --capture --directory . --base-directory . -o mesabox.info
+# unit tests of libmesabox
+export RUSTC_WRAPPER="./ci/libmesabox-cov-rustc"
+cargo rustc --package libmesabox --all-features --profile test --lib
+rm ./target/debug/libmesabox-*.d
+./target/debug/libmesabox-*
+${LCOV} ${LCOVOPT} --capture --directory . --base-directory . -o libmesabox.info
 
 # cleanup target
 rm -rf *.gcda *.gcno
 cargo clean
 
 # integration tests
+export RUSTC_WRAPPER="./ci/mesabox-cov-rustc"
 cargo rustc --all-features --test tests
 rm ./target/debug/tests-*.d
 ./target/debug/tests-*
 ${LCOV} ${LCOVOPT} --capture --directory . --base-directory . -o tests.info
 
 # combining and filtering
-${LCOV} ${LCOVOPT} --add mesabox.info --add tests.info -o coverage.info
-${LCOV} ${LCOVOPT} --extract coverage.info `find "$(cd src; pwd)" -name "*.rs"` -o final.info
+${LCOV} ${LCOVOPT} --add libmesabox.info --add tests.info -o coverage.info
+${LCOV} ${LCOVOPT} --extract coverage.info `find "$(cd src; pwd)" "$(cd libmesabox; pwd)" -name "*.rs"` -o final.info
 
 # generate report if not in CI
 if [[ "$CI" != true ]]; then

ci/cov-rustc renamed to ci/mesabox-cov-rustc

@@ -6,30 +6,37 @@
 // For a copy, see the LICENSE file.
 //
 
-use util::*;
+use std::process::Command;
+use assert_cmd::prelude::*;
 
 const NAME: &str = "arch";
 
 #[test]
 #[cfg(target_arch = "x86_64")]
 fn test_x86_64() {
-    new_ucmd!()
-        .succeeds()
-        .stdout_only("x86_64\n");
+    new_cmd!()
+        .assert()
+        .success()
+        .stdout("x86_64\n")
+        .stderr("");
 }
 
 #[test]
 #[cfg(target_arch = "arm")]
 fn test_arm() {
-    new_ucmd!()
-        .succeeds()
-        .stdout_only("arm\n");
+    new_cmd!()
+        .assert()
+        .success()
+        .stdout("arm\n")
+        .stderr("");
 }
 
 #[test]
 #[cfg(target_arch = "aarch64")]
 fn test_aarch64() {
-    new_ucmd!()
-        .succeeds()
-        .stdout_only("aarch64\n");
+    new_cmd!()
+        .assert()
+        .success()
+        .stdout("aarch64\n")
+        .stderr("");
 }

ci/run-cov

@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2018, The MesaLock Linux Project Contributors
 // All rights reserved.
-// 
+//
 // This work is licensed under the terms of the BSD 3-Clause License.
 // For a copy, see the LICENSE file.
 //
@@ -32,86 +32,97 @@
 //     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-use util::*;
+use assert_cmd::prelude::*;
+use predicates::prelude::*;
+use std::process::Command;
 
 const NAME: &str = "base32";
 
 #[test]
 fn test_encode() {
     let input = "Hello, World!";
-    new_ucmd!()
-        .pipe_in(input)
-        .succeeds()
-        .stdout_only("JBSWY3DPFQQFO33SNRSCC===\n");
+     new_cmd!()
+        .with_stdin().buffer(input)
+        .assert()
+        .success()
+        .stdout("JBSWY3DPFQQFO33SNRSCC===\n")
+        .stderr("");
 }
 
 #[test]
 fn test_decode() {
     for decode_param in vec!["-d", "--decode"] {
         let input = "JBSWY3DPFQQFO33SNRSCC===\n";
-        new_ucmd!()
+        new_cmd!()
             .arg(decode_param)
-            .pipe_in(input)
-            .succeeds()
-            .stdout_only("Hello, World!");
+            .with_stdin().buffer(input)
+            .assert()
+            .success()
+            .stdout("Hello, World!")
+            .stderr("");
     }
 }
 
 #[test]
 fn test_garbage() {
     let input = "aGVsbG8sIHdvcmxkIQ==\0";
-    new_ucmd!()
+    new_cmd!()
         .arg("-d")
-        .pipe_in(input)
-        .fails()
-        .no_stdout()
-        .stderr_contains("invalid length at 16");
+        .with_stdin().buffer(input)
+        .assert()
+        .failure()
+        .stdout("")
+        .stderr(predicate::str::contains("invalid length at 16").from_utf8());
 }
 
 #[test]
 fn test_ignore_garbage() {
     for ignore_garbage_param in vec!["-i", "--ignore-garbage"] {
         let input = "JBSWY\x013DPFQ\x02QFO33SNRSCC===\n";
-        new_ucmd!()
-            .arg("-d")
-            .arg(ignore_garbage_param)
-            .pipe_in(input)
-            .succeeds()
-            .stdout_only("Hello, World!");
+        new_cmd!()
+            .args(&["-d", ignore_garbage_param])
+            .with_stdin().buffer(input)
+            .assert()
+            .success()
+            .stdout("Hello, World!")
+            .stderr("");
     }
 }
 
 #[test]
 fn test_wrap() {
     for wrap_param in vec!["-w", "--wrap"] {
         let input = "The quick brown fox jumps over the lazy dog.";
-        new_ucmd!()
-            .arg(wrap_param)
-            .arg("20")
-            .pipe_in(input)
-            .succeeds()
-            .stdout_only("KRUGKIDROVUWG2ZAMJZG\n653OEBTG66BANJ2W24DT\nEBXXMZLSEB2GQZJANRQX\nU6JAMRXWOLQ=\n");
+        new_cmd!()
+            .args(&[wrap_param, "20"])
+            .with_stdin().buffer(input)
+            .assert()
+            .success()
+            .stdout("KRUGKIDROVUWG2ZAMJZG\n653OEBTG66BANJ2W24DT\nEBXXMZLSEB2GQZJANRQX\nU6JAMRXWOLQ=\n")
+            .stderr("");
     }
 }
 
 #[test]
 fn test_wrap_no_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
-        new_ucmd!()
+        new_cmd!()
             .arg(wrap_param)
-            .fails()
-            .no_stdout()
-            .stderr_contains("requires a value but none was supplied\n");
+            .assert()
+            .failure()
+            .stdout("")
+            .stderr(predicate::str::contains("requires a value but none was supplied\n").from_utf8());
     }
 }
 
 #[test]
 fn test_wrap_bad_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
-        new_ucmd!()
-            .arg(wrap_param).arg("b")
-            .fails()
-            .no_stdout()
-            .stderr_contains("'b' is not a number\n");
+        new_cmd!()
+            .args(&[wrap_param, "b"])
+            .assert()
+            .failure()
+            .stdout("")
+            .stderr(predicate::str::contains("'b' is not a number\n").from_utf8());
     }
 }