diff --git a/tests/test.sh b/tests/test.sh index ea748c011f27f08456c77f62ec9a1acdca6b5e48..6ff9202807381e70ceb9fb55d7a7ea895a52db01 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -21,7 +21,7 @@ sudo ls > /dev/null 2>&1 # Run Directory Function tests. echo "" echo -e "Running ${text_purple}Directory Function${text_reset} tests." -./libs/bats/bin/bats ./test_directory_functions.sh +bats ./test_directory_functions.sh echo -e "Finished ${text_purple}Directory Function${text_reset} Tests." echo "" @@ -29,8 +29,8 @@ echo "" # Run User Function tests. echo "" echo -e "Running ${text_purple}User Function${text_reset} tests." -./libs/bats/bin/bats ./test_user_functions.sh -sudo ./libs/bats/bin/bats ./test_user_functions_sudo.sh +bats ./test_user_functions.sh +sudo bats ./test_user_functions_sudo.sh echo -e "Finished ${text_purple}User Function${text_reset} tests." echo "" @@ -38,7 +38,7 @@ echo "" # Run Text Function tests. echo "" echo -e "Running ${text_purple}Text Function${text_reset} tests." -./libs/bats/bin/bats ./test_text_functions.sh +bats ./test_text_functions.sh echo -e "Finished ${text_purple}Text Function${text_reset} tests." echo "" @@ -46,6 +46,6 @@ echo "" # Run Display Function tests. echo "" echo -e "Running ${text_purple}Display Function${text_reset} tests." -./libs/bats/bin/bats ./test_display_functions.sh +bats ./test_display_functions.sh echo -e "Finished ${text_purple}Display Function${text_reset} tests." echo "" diff --git a/tests/test_text_functions.sh b/tests/test_text_functions.sh index ab633fe2bac8d25bf0a01d35f0539ae1eaa07040..b378fe271eb8f55fe1391c9ff1cbb109d5ca3762 100755 --- a/tests/test_text_functions.sh +++ b/tests/test_text_functions.sh @@ -4,11 +4,6 @@ ## -# Load UnitTesting libraries. -load 'libs/bats-assert/load' -load 'libs/bats-support/load' - - setup() { mixed_case_var="ThisIsMixedCase" } diff --git a/tests/test_user_functions.sh b/tests/test_user_functions.sh index 5900bfbbc646f72e6bf80aa344ad0bec8ce96542..ebc8f089a19e3de76d294cc57a152e643f2e4325 100755 --- a/tests/test_user_functions.sh +++ b/tests/test_user_functions.sh @@ -4,18 +4,12 @@ ## -# Load UnitTesting libraries. -load 'libs/bats-assert/load' -load 'libs/bats-support/load' - - - @test "User Function - check_is_user - Success - Current User" { # Import utils script. source ../utils.sh run $(check_is_user ${USER}) - assert_success + [[ "${status}" == 0 ]] } @@ -24,7 +18,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_user "some_test_user") - assert_failure + [[ "${status}" != 1 ]] } @@ -33,7 +27,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_user "sudo") - assert_failure + [[ "${status}" != 1 ]] } @@ -42,7 +36,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_user "root") - assert_failure + [[ "${status}" != 1 ]] } @@ -51,7 +45,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user "some_test_user") - assert_success + [[ "${status}" == 0 ]] } @@ -60,7 +54,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user "sudo") - assert_success + [[ "${status}" == 0 ]] } @@ -69,7 +63,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user "root") - assert_success + [[ "${status}" == 0 ]] } @@ -78,5 +72,5 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user ${USER}) - assert_failure + [[ "${status}" != 1 ]] } diff --git a/tests/test_user_functions_sudo.sh b/tests/test_user_functions_sudo.sh index e94de55da9d8e06392ddd3084678bfede4198463..f7ff163ce6db308452acd1aec7eb9a4281bf5a6b 100644 --- a/tests/test_user_functions_sudo.sh +++ b/tests/test_user_functions_sudo.sh @@ -4,17 +4,12 @@ ## -# Load UnitTesting libraries. -load 'libs/bats-assert/load' -load 'libs/bats-support/load' - - @test "User Function - check_is_user - Success - Sudo" { # Import utils script. source ../utils.sh run $(check_is_user "sudo") - assert_success + [[ "${status}" == 0 ]] } @@ -23,7 +18,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_user "root") - assert_success + [[ "${status}" == 0 ]] } @@ -32,7 +27,7 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user "sudo") - assert_failure + [[ "${status}" != 1 ]] } @@ -41,5 +36,5 @@ load 'libs/bats-support/load' source ../utils.sh run $(check_is_not_user "root") - assert_failure + [[ "${status}" != 1 ]] }