Commit 3b0714a7 authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge pull request #890 from jasonkarns/test-assertions 

Leverage assertion test helpers
parents 9fdc2fb1 84b49768

test/build.bats

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ install_package "jruby-9000.dev" "http://lafo.ssw.uni-linz.ac.at/jruby-9000+graa 
DEF

  assert_success



  assert [ ! -e "$INSTALL_ROOT/build.log" ]

  refute [ -e "$INSTALL_ROOT/build.log" ]

}



@test "JRuby Java 7 missing" {

test/cache.bats

+9 −9
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ setup() { 
  install_fixture definitions/without-checksum



  assert_success

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  assert [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]



  unstub curl

}
@@ -29,7 +29,7 @@ setup() { 
  install_fixture definitions/without-checksum



  assert_success

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  assert [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]



  unstub curl

}
@@ -44,8 +44,8 @@ setup() { 
  install_fixture definitions/with-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]



  unstub curl

  unstub shasum
@@ -65,9 +65,9 @@ setup() { 
  install_fixture definitions/with-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  diff -q "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" "${FIXTURE_ROOT}/package-1.0.0.tar.gz"

  assert [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -e "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]

  assert diff -q "${RUBY_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" "${FIXTURE_ROOT}/package-1.0.0.tar.gz"



  unstub curl

  unstub shasum
@@ -82,8 +82,8 @@ setup() { 
  install_fixture definitions/without-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  [ ! -d "$RUBY_BUILD_CACHE_PATH" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]

  refute [ -d "$RUBY_BUILD_CACHE_PATH" ]



  unstub curl

}

test/checksum.bats

+12 −11
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ export RUBY_BUILD_CACHE_PATH= 
  stub curl "-q -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$3"



  install_fixture definitions/without-checksum

  [ "$status" -eq 0 ]

  [ -x "${INSTALL_ROOT}/bin/package" ]



  assert_success

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl

}
@@ -23,7 +24,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub shasum
@@ -37,7 +38,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-invalid-checksum



  assert_failure

  [ ! -f "${INSTALL_ROOT}/bin/package" ]

  refute [ -f "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub shasum
@@ -51,7 +52,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub shasum
@@ -65,7 +66,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-md5-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub md5
@@ -79,7 +80,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-md5-checksum



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub md5
@@ -93,7 +94,7 @@ export RUBY_BUILD_CACHE_PATH= 
  install_fixture definitions/with-checksum



  assert_failure

  [ ! -f "${INSTALL_ROOT}/bin/package" ]

  refute [ -f "${INSTALL_ROOT}/bin/package" ]



  unstub curl

  unstub shasum
@@ -115,7 +116,7 @@ install_package "package-1.0.0" "http://example.com/packages/package-1.0.0.tar.g 
DEF



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub shasum

}
@@ -137,7 +138,7 @@ install_package "package-1.0.0" "http://example.com/packages/package-1.0.0.tar.g 
DEF



  assert_success

  [ -x "${INSTALL_ROOT}/bin/package" ]

  assert [ -x "${INSTALL_ROOT}/bin/package" ]



  unstub shasum

}
@@ -150,7 +151,7 @@ install_package "package-1.0.0" "http://example.com/packages/package-1.0.0.tar.g 
DEF



  assert_failure

  [ ! -f "${INSTALL_ROOT}/bin/package" ]

  refute [ -f "${INSTALL_ROOT}/bin/package" ]

  assert_output_contains "unexpected checksum length: 29 (checksum_of_unexpected_length)"

  assert_output_contains "expected 0 (no checksum), 32 (MD5), or 64 (SHA2-256)"

}

test/definitions.bats

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ NUM_DEFINITIONS="$(ls "$BATS_TEST_DIRNAME"/../share/ruby-build | wc -l)" 


@test "custom RUBY_BUILD_ROOT: nonexistent" {

  export RUBY_BUILD_ROOT="$TMP"

  assert [ ! -e "${RUBY_BUILD_ROOT}/share/ruby-build" ]

  refute [ -e "${RUBY_BUILD_ROOT}/share/ruby-build" ]

  run ruby-build --definitions

  assert_success ""

}

test/hooks.bats

+1 −1
Original line number Diff line number Diff line
@@ -52,5 +52,5 @@ rehashed 
after.

OUT



  assert [ ! -d "${RBENV_ROOT}/versions/2.0.0" ]

  refute [ -d "${RBENV_ROOT}/versions/2.0.0" ]

}