summaryrefslogtreecommitdiff
path: root/libre/java-common/test_parabola-java
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-10-13 00:57:40 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-10-13 00:57:40 -0200
commitf90b5da18e958f987c30494730d4b73af31a0388 (patch)
tree23c66872e2b26415970d0262075854db2d3d3745 /libre/java-common/test_parabola-java
parent39dc767bca041d1fefd7bf2c00909a45001ef772 (diff)
rename java-common to java-runtime-common and add bin links to package. be quieter (FS#41883 -> https://bugs.archlinux.org/task/41883) (FS#41901 -> https://bugs.archlinux.org/task/41901)
Diffstat (limited to 'libre/java-common/test_parabola-java')
-rwxr-xr-xlibre/java-common/test_parabola-java69
1 files changed, 25 insertions, 44 deletions
diff --git a/libre/java-common/test_parabola-java b/libre/java-common/test_parabola-java
index 1051186d6..89b57655a 100755
--- a/libre/java-common/test_parabola-java
+++ b/libre/java-common/test_parabola-java
@@ -12,8 +12,6 @@ declare test_dir
INIT_JVM_DIR=${JVM_DIR}
INIT_DEFAULT_PATH=${DEFAULT_PATH}
INIT_DEFAULT_PATH_JRE=${DEFAULT_PATH_JRE}
-INIT_BIN_PATH=${BIN_PATH}
-INIT_WRAPPER_PATH=${WRAPPER_PATH}
# Redefining this so that tested script can be invoked without root privileges
check_root() {
@@ -31,12 +29,7 @@ setUp() {
DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH}
DEFAULT_PATH_JRE=${test_dir}${INIT_DEFAULT_PATH_JRE}
JAVA_NAME=$(get_rand_str)
- BIN_PATH=${test_dir}${INIT_BIN_PATH}
- mkdir -p ${BIN_PATH}
- WRAPPER_PATH=${test_dir}${INIT_WRAPPER_PATH}
- mkdir -p $(dirname ${WRAPPER_PATH})
- touch ${WRAPPER_PATH}
- chmod +x ${WRAPPER_PATH}
+ mkdir -p ${JVM_DIR}
}
tearDown() {
@@ -64,13 +57,7 @@ create_valid_jdk_env() {
set_default_for_test() {
ln -s $1 ${DEFAULT_PATH}
- for binary in java keytool orbd; do
- ln -s ${WRAPPER_PATH} ${BIN_PATH}/${binary}
- done
if [ -d ${DEFAULT_PATH}/jre ]; then
- for binary in javac javah jhat; do
- ln -s ${WRAPPER_PATH} ${BIN_PATH}/${binary}
- done
ln -s $1/jre ${DEFAULT_PATH_JRE}
else
ln -s $1 ${DEFAULT_PATH_JRE}
@@ -80,8 +67,6 @@ set_default_for_test() {
assertDefaultNotSet() {
assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})"
assertNull 'Default runtime is set' "$(readlink ${DEFAULT_PATH_JRE})"
- assertNull "PATH has a java binary" "$(readlink ${BIN_PATH}/java)"
- assertNull "PATH has a javac binary" "$(readlink ${BIN_PATH}/javac)"
}
assertDefaultSetTo() {
@@ -90,17 +75,6 @@ assertDefaultSetTo() {
if [ ${new_java} == */jre ]; then
assertEquals "Default runtime points at wrong Java env" "${new_java}/jre" "$(readlink ${DEFAULT_PATH_JRE})"
fi
- # For all links in /usr/bin that point at the wrapper
- for lpath in $(find -L ${BIN_PATH} -samefile ${WRAPPER_PATH}); do
- # There is a binary in the JVM bin dir
- assertTrue 'Wrong /usr/bin link' "test -x ${JVM_DIR}/${new_java}/bin/$(basename ${lpath})"
- done
- # For all executable binaries provided by the Java env
- for binary in $(find ${JVM_DIR}/${new_java}/bin -type f -perm /a=x); do
- # There is a link in /usr/bin
- bin_link=${BIN_PATH}/$(basename ${binary})
- assertEquals 'No link in /usr/bin' "${WRAPPER_PATH}" "$(readlink ${bin_link})"
- done
}
# do_status
@@ -155,6 +129,11 @@ test_do_get_without_default() {
assertNull 'Wrong result' "$(do_get)"
}
+test_do_get_without_default() {
+ set_default_for_test "/dev/null"
+ assertNull 'Wrong result' "$(do_get)"
+}
+
# do_set
test_do_set_new_invalid() {
@@ -174,15 +153,6 @@ test_do_set_current_invalid() {
assertDefaultSetTo "${JAVA_NAME}"
}
-test_do_set_same_java_missing_bin_link() {
- create_valid_jdk_env "${JAVA_NAME}"
- set_default_for_test "${JAVA_NAME}"
- unlink ${BIN_PATH}/java
- $(do_set "${JAVA_NAME}")
- assertEquals 'Wrong status returned' 0 $?
- assertDefaultSetTo "${JAVA_NAME}"
-}
-
test_do_set_with_default_already_set() {
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "${JAVA_NAME}/jre"
@@ -219,6 +189,14 @@ test_do_set_cleanup_old_java_default() {
assertDefaultSetTo "${JAVA_NAME}/jre"
}
+test_do_set_devnull() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "/dev/null"
+ output=$(do_set "${JAVA_NAME}/jre")
+ assertEquals 'Wrong status returned' 0 $?
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
# do_unset
test_do_unset_default_not_target() {
@@ -236,6 +214,12 @@ test_do_unset_no_default_link() {
assertDefaultNotSet
}
+test_do_unset_devnull() {
+ set_default_for_test "/dev/null"
+ do_unset
+ assertDefaultNotSet
+}
+
# do_fix
test_do_fix_default_valid() {
@@ -291,14 +275,11 @@ test_do_fix_jdk_but_jre_exists() {
assertDefaultSetTo "${JAVA_NAME}/jre"
}
-test_do_fix_cleanup_old_java_default() {
- create_valid_jre_env "${JAVA_NAME}/jre"
- set_default_for_test "${JAVA_NAME}/jre"
- # Simulate installation of a jre over a jre-headless
- ln -s ${WRAPPER_PATH} ${BIN_PATH}/policytool
- output=$(do_fix "${JAVA_NAME}/jre")
- assertEquals 'Wrong status returned' 0 $?
- assertDefaultSetTo "${JAVA_NAME}/jre"
+test_do_fix_devnull() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "/dev/null"
+ do_fix
+ assertDefaultSetTo "${JAVA_NAME}"
}
# load shunit2