[arch-commits] Commit in java-meta/trunk (3 files)
Guillaume Alaux
guillaume at archlinux.org
Wed Jul 16 19:57:45 UTC 2014
Date: Wednesday, July 16, 2014 @ 21:57:45
Author: guillaume
Revision: 216933
Add unit tests
Added:
java-meta/trunk/bin_archlinux-java_tests
java-meta/trunk/install_java-runtime-headless-meta.sh
Modified:
java-meta/trunk/bin_archlinux-java
---------------------------------------+
bin_archlinux-java | 53 +++---
bin_archlinux-java_tests | 274 ++++++++++++++++++++++++++++++++
install_java-runtime-headless-meta.sh | 9 +
3 files changed, 315 insertions(+), 21 deletions(-)
Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java 2014-07-16 17:04:52 UTC (rev 216932)
+++ bin_archlinux-java 2014-07-16 19:57:45 UTC (rev 216933)
@@ -34,16 +34,17 @@
}
get_installed_javas() {
- javas=()
- for dir in $(find ${JVM_DIR} -mindepth 1 -maxdepth 1 -type d | sort); do
- if [ -x ${dir}/bin/javac ]; then
- javas+=(${dir/${JVM_DIR}\/})
- else
- if [ -x ${dir}/jre/bin/java ]; then
- javas+=(${dir/${JVM_DIR}\/}/jre)
+ if [ -d ${JVM_DIR} ]; then
+ for dir in $(find ${JVM_DIR} -mindepth 1 -maxdepth 1 -type d | sort); do
+ if [ -x ${dir}/bin/javac ]; then
+ javas+=(${dir/${JVM_DIR}\/})
+ else
+ if [ -x ${dir}/jre/bin/java ]; then
+ javas+=(${dir/${JVM_DIR}\/}/jre)
+ fi
fi
- fi
- done
+ done
+ fi
echo ${javas[@]}
}
@@ -56,11 +57,12 @@
set_default_to() {
check_root
echo "Setting Java environment '$1' as default"
- ln -s $1 ${DEFAULT_PATH}
+ ln -sf $1 ${DEFAULT_PATH}
}
unset_default() {
check_root
+ echo "Unsetting $(get_default_java) as default"
unlink ${DEFAULT_PATH} 2>/dev/null
}
@@ -67,7 +69,7 @@
# First level functions
give_status() {
- installed_java=$(get_installed_javas)
+ installed_java=($(get_installed_javas))
default_java=$(get_default_java)
if [ ${#installed_java[@]} -eq 0 ]; then
echo 'No compatible Java environment installed'
@@ -80,10 +82,10 @@
echo " ${java}"
fi
done
+ if [ -z ${default_java} ]; then
+ echo "No Java environment set as default"
+ fi
fi
- if [ -z ${default_java} ]; then
- echo "No Java environment set as default"
- fi
}
# $1: Java environment name to try to set
@@ -90,9 +92,14 @@
try_set_default() {
default_java=$(get_default_java)
if is_java_valid ${default_java}; then
- echo "The default Java environment is already set (${default_java})"
+ echo "The default Java environment is already set to ${default_java}"
+ echo "Please use 'archlinux-java --force-set $1' if you want to force it"
else
- force_set_default $1
+ if is_java_valid $1; then
+ set_default_to $1
+ else
+ force_set_default $1
+ fi
fi
}
@@ -100,7 +107,9 @@
force_set_default() {
check_root
if is_java_valid $1; then
- unset_default
+ if [ "x$(get_default_java ${DEFAULT_PATH})" != "x" ]; then
+ unset_default
+ fi
set_default_to $1
else
echo "'${JVM_DIR}/$1' is not a valid Java environment path"
@@ -111,9 +120,9 @@
# $1: Java environment name to try to unset
try_unset_default() {
default=$(get_default_java)
- if [ "x${default}" = "x" -o "x${default}" = "x$1" ]; then
+ if [ "x${default}" != "x" -a "x${default}" = "x$1" ]; then
unset_default
- echo 'Done. No Java environment is set as default any more.'
+ echo 'No Java environment is set as default any more'
else
echo "'$1' is not set as Java environment default"
fi
@@ -124,8 +133,10 @@
if is_java_valid ${default}; then
echo "Current default Java environment is valid: '${default}'"
else
- unset_default
- installed_javas=$(get_installed_javas)
+ if [ "x${default}" != "x" ]; then
+ unset_default
+ fi
+ installed_javas=($(get_installed_javas))
javas=('java-7-openjdk' 'java-7-openjdk/jre' ${installed_javas[@]})
for java in ${javas[@]}; do
if ! is_java_valid $(get_default_java) && is_java_valid ${java}; then
Added: bin_archlinux-java_tests
===================================================================
--- bin_archlinux-java_tests (rev 0)
+++ bin_archlinux-java_tests 2014-07-16 19:57:45 UTC (rev 216933)
@@ -0,0 +1,274 @@
+#! /bin/sh
+#
+# To run this script, ensure shunit2 (https://code.google.com/p/shunit2/)
+# is available on the local directory, then just run sh bin_archlinux-java_tests
+#
+# inotifywait -r -m -e MODIFY . | while read l; do sh bin_archlinux-java_tests; done
+
+declare test_dir
+
+. ./bin_archlinux-java > /dev/null
+
+INIT_JVM_DIR=${JVM_DIR}
+INIT_DEFAULT_PATH=${DEFAULT_PATH}
+
+# Redefining this so that tested script can be invoked without root privileges
+check_root() {
+ true
+}
+
+
+get_rand_str() {
+ echo $(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n 1)
+}
+
+setUp() {
+ test_dir=$(mktemp -d)
+ JVM_DIR=${test_dir}${INIT_JVM_DIR}
+ DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH}
+ JAVA_NAME=$(get_rand_str)
+}
+
+tearDown() {
+ rm -rf ${test_dir}
+}
+
+
+# $1: path of Java environment to create
+create_valid_jre_env() {
+ mkdir -p ${JVM_DIR}/$1/bin
+ touch ${JVM_DIR}/$1/bin/java
+ chmod +x ${JVM_DIR}/$1/bin/java
+}
+
+# $1: path of Java environment to create
+create_valid_jdk_env() {
+ mkdir -p ${JVM_DIR}/$1/bin
+ touch ${JVM_DIR}/$1/bin/javac
+ chmod +x ${JVM_DIR}/$1/bin/javac
+ create_valid_jre_env "$1/jre"
+}
+
+set_default_for_test() {
+ ln -s $1 ${DEFAULT_PATH}
+}
+
+assertDefaultNotSet() {
+ assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})"
+}
+
+assertDefaultSetTo() {
+ assertEquals "Default is not set to $1" "$1" "$(readlink ${DEFAULT_PATH})"
+}
+
+
+test_valid_java_env_valid() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ assertTrue 'Does not detect valid Java env' "is_java_valid ${JAVA_NAME}/jre"
+}
+
+test_valid_java_env_not_valid() {
+ create_valid_jre_env "non_existing"
+ assertFalse 'Does not detect invalid Java env' "is_java_valid ${JAVA_NAME}/jre"
+}
+
+test_get_default_java() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ assertEquals 'Wrong default Java found' "${JAVA_NAME}/jre" "$(get_default_java)"
+}
+
+test_get_default_java_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ assertNull 'Wrong default Java found' "$(get_default_java)"
+}
+
+test_get_installed_javas() {
+ # Add letters to be sure java envs will appear in this alphabetical order
+ JAVA_NAME_1="a$(get_rand_str)"
+ JAVA_NAME_2="b$(get_rand_str)"
+ JAVA_NAME_3="c$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_1}/jre"
+ create_valid_jre_env "${JAVA_NAME_2}/jre"
+ create_valid_jdk_env "${JAVA_NAME_3}"
+ list=($(get_installed_javas | sort))
+ expected=("${JAVA_NAME_1}/jre" "${JAVA_NAME_2}/jre" "${JAVA_NAME_3}")
+ assertTrue "Did not find installed Java environments" "[ '${expected[*]}' == '${list[*]}' ]"
+}
+
+test_get_installed_javas_no_env() {
+ list=($(get_installed_javas))
+ expected=()
+ assertEquals "List of installed Java envs is not 0" 0 "${#list[@]}"
+}
+
+test_set_default_to() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(set_default_to "${JAVA_NAME}")
+ assertEquals 'Success does not yield 0' 0 $?
+ assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}' as default" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
+tests_unset_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ output=$(unset_default)
+ assertEquals 'Success does not yield 0' 0 $?
+ assertEquals 'Wrong message' "Unsetting ${JAVA_NAME}/jre as default" "${output}"
+ assertTrue 'Link was not unset' "[ ! -e ${DEFAULT_PATH} ]"
+}
+
+test_give_status() {
+ JAVA_NAME_1="a$(get_rand_str)"
+ JAVA_NAME_2="b$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_1}/jre"
+ set_default_for_test "${JAVA_NAME_1}/jre"
+ create_valid_jdk_env "${JAVA_NAME_2}"
+ expected=$(echo -e "Available Java environments:\n ${JAVA_NAME_1}/jre (default)\n ${JAVA_NAME_2}")
+ assertEquals 'Wrong status output' "${expected}" "$(give_status)"
+}
+
+test_give_status_no_default() {
+ JAVA_NAME_1="a$(get_rand_str)"
+ JAVA_NAME_2="b$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_1}/jre"
+ create_valid_jdk_env "${JAVA_NAME_2}"
+ mess="Available Java environments:"
+ mess+="\n ${JAVA_NAME_1}/jre"
+ mess+="\n ${JAVA_NAME_2}"
+ mess+="\nNo Java environment set as default"
+ expected=$(echo -e "${mess}")
+ assertEquals 'Wrong status output' "${expected}" "$(give_status)"
+}
+
+test_give_status_no_javas() {
+ output=$(give_status)
+ assertEquals 'Wrong status output' 'No compatible Java environment installed' "${output}"
+}
+
+test_try_set_default_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(try_set_default "${JAVA_NAME}/jre")
+ assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_try_set_default_default_exists() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ output=$(try_set_default "${JAVA_NAME}/jre")
+ mess="The default Java environment is already set to ${JAVA_NAME}/jre"
+ mess+="\nPlease use 'archlinux-java --force-set ${JAVA_NAME}/jre' if you want to force it"
+ expected=$(echo -e "${mess}")
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_try_set_default_default_invalid() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "non_existing"
+ output=$(try_set_default "${JAVA_NAME}/jre")
+ assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_force_set_default_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(force_set_default "${JAVA_NAME}/jre")
+ assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_force_set_default_with_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ JAVA_NAME_2="$(get_rand_str)"
+ create_valid_jre_env "${JAVA_NAME_2}/jre"
+ output=$(force_set_default "${JAVA_NAME_2}/jre")
+ mess="Unsetting ${JAVA_NAME}/jre as default"
+ mess+="\nSetting Java environment '${JAVA_NAME_2}/jre' as default"
+ expected=$(echo -e "${mess}")
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "${JAVA_NAME_2}/jre"
+}
+
+test_force_set_default_target_invalid() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(force_set_default "non_existing")
+ expected="'${JVM_DIR}/non_existing' is not a valid Java environment path"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultNotSet
+}
+
+#no_default
+test_try_unset_default_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(try_unset_default "${JAVA_NAME}/jre")
+ expected="'${JAVA_NAME}/jre' is not set as Java environment default"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultNotSet
+}
+
+test_try_unset_default_default_not_target() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ output=$(try_unset_default "other_java")
+ expected="'other_java' is not set as Java environment default"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_try_unset_default_default_is_target() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ output=$(try_unset_default "${JAVA_NAME}/jre")
+ mess="Unsetting ${JAVA_NAME}/jre as default"
+ mess+="\nNo Java environment is set as default any more"
+ expected=$(echo -e "${mess}")
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultNotSet
+}
+
+test_fix_default_default_valid() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ set_default_for_test "${JAVA_NAME}/jre"
+ output=$(fix_default)
+ expected="Current default Java environment is valid: '${JAVA_NAME}/jre'"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_fix_default_no_default() {
+ create_valid_jre_env "${JAVA_NAME}/jre"
+ output=$(fix_default)
+ expected="Setting Java environment '${JAVA_NAME}/jre' as default"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "${JAVA_NAME}/jre"
+}
+
+test_fix_default_default_invalid_openjdk7_jdk_installed() {
+ create_valid_jdk_env "java-7-openjdk"
+ output=$(fix_default)
+ expected="Setting Java environment 'java-7-openjdk' as default"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "java-7-openjdk"
+}
+
+test_fix_default_default_invalid_openjdk7_jre_installed() {
+ create_valid_jre_env "java-7-openjdk/jre"
+ output=$(fix_default)
+ expected="Setting Java environment 'java-7-openjdk/jre' as default"
+ assertEquals 'Wrong message' "${expected}" "${output}"
+ assertDefaultSetTo "java-7-openjdk/jre"
+}
+
+#test_fix_default_default_invalid_random_java_installed() {
+#}
+#
+#test_fix_default_default_invalid_no_java_installed() {
+#}
+
+
+# load shunit2
+. shunit2-2.1.6/src/shunit2
Property changes on: java-meta/trunk/bin_archlinux-java_tests
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: install_java-runtime-headless-meta.sh
===================================================================
--- install_java-runtime-headless-meta.sh (rev 0)
+++ install_java-runtime-headless-meta.sh 2014-07-16 19:57:45 UTC (rev 216933)
@@ -0,0 +1,9 @@
+post_install() {
+ echo 'Installing multiple non-conflicting Java environments is now supported.'
+ echo 'Check the following wiki section for more info:'
+ echo ' https://wiki.archlinux.org/index.php/Java#Multiple_official_Java_environments'
+}
+
+post_upgrade() {
+ post_install "$@"
+}
More information about the arch-commits
mailing list