[arch-commits] Commit in java-meta/trunk (bin_archlinux-java bin_archlinux-java_tests)

[Guillaume Alaux]

    Date: Tuesday, July 22, 2014 @ 18:07:41
  Author: guillaume
Revision: 217732

Fix tests and add check about creation of links

Modified:
  java-meta/trunk/bin_archlinux-java
  java-meta/trunk/bin_archlinux-java_tests

--------------------------+
 bin_archlinux-java       |    8 +++++---
 bin_archlinux-java_tests |   33 ++++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 14 deletions(-)

Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java	2014-07-22 15:43:20 UTC (rev 217731)
+++ bin_archlinux-java	2014-07-22 16:07:41 UTC (rev 217732)
@@ -49,7 +49,7 @@
   echo ${javas[@]}
 }
 
-# $1: Java environment name to test
+# $1: Java environment name to test. MUST NOT BE "${DEFAULT_NAME}"
 is_java_valid() {
   test "x$1" != "x${DEFAULT_NAME}" && test -x ${JVM_DIR}/$1/bin/java
 }
@@ -147,11 +147,13 @@
     fi
     to_check=('java-7-openjdk' 'java-7-openjdk/jre' $(get_installed_javas))
     for java in ${to_check[@]}; do
-      if is_java_valid ${java}; then
+      if ! is_java_valid $(get_default_java) && is_java_valid ${java}; then
         set_default_to ${java}
-        exit 0
       fi
     done
+    if ! is_java_valid $(get_default_java); then
+      echo 'No valid Java environment found'
+    fi
   fi
 }
 

Modified: bin_archlinux-java_tests
===================================================================
--- bin_archlinux-java_tests	2014-07-22 15:43:20 UTC (rev 217731)
+++ bin_archlinux-java_tests	2014-07-22 16:07:41 UTC (rev 217732)
@@ -27,6 +27,8 @@
   JVM_DIR=${test_dir}${INIT_JVM_DIR}
   DEFAULT_PATH=${test_dir}${INIT_DEFAULT_PATH}
   JAVA_NAME=$(get_rand_str)
+  BIN_PATH=${test_dir}/usr/bin
+  mkdir -p ${BIN_PATH}
 }
 
 tearDown() {
@@ -51,14 +53,24 @@
 
 set_default_for_test() {
   ln -s $1 ${DEFAULT_PATH}
+  ln -s ${DEFAULT_PATH}/bin/java ${BIN_PATH}/java
+  if [ -x ${DEFAULT_PATH}/bin/javac ]; then
+    ln -s ${DEFAULT_PATH}/bin/javac ${BIN_PATH}/javac
+  fi
 }
 
 assertDefaultNotSet() {
   assertNull 'Default is set' "$(readlink ${DEFAULT_PATH})"
+  assertNull "PATH has a java binary" "$(readlink ${BIN_PATH}/java)"
+  assertNull "PATH has a javac binary" "$(readlink ${BIN_PATH}/javac)"
 }
 
 assertDefaultSetTo() {
   assertEquals "Default is not set to $1" "$1" "$(readlink ${DEFAULT_PATH})"
+  assertEquals "PATH has no java binary" "${DEFAULT_PATH}/bin/java" "$(readlink ${BIN_PATH}/java)"
+  if [ -d ${DEFAULT_PATH}/jre ]; then
+    assertEquals "PATH has no javac binary" "${DEFAULT_PATH}/bin/javac" "$(readlink ${BIN_PATH}/javac)"
+  fi
 }
 
 
@@ -84,15 +96,14 @@
 }
 
 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}"
+  JAVA_NAME_FIRST_ALPHA="a$(get_rand_str)"
+  JAVA_NAME_SECON_ALPHA="b$(get_rand_str)"
+  JAVA_NAME_THIRD_ALPHA="c$(get_rand_str)"
+  create_valid_jre_env "${JAVA_NAME_FIRST_ALPHA}/jre"
+  create_valid_jre_env "${JAVA_NAME_SECON_ALPHA}/jre"
+  create_valid_jdk_env "${JAVA_NAME_THIRD_ALPHA}"
   list=($(get_installed_javas | sort))
-  expected=("${JAVA_NAME_1}/jre" "${JAVA_NAME_2}/jre" "${JAVA_NAME_3}")
+  expected=("${JAVA_NAME_FIRST_ALPHA}/jre" "${JAVA_NAME_SECON_ALPHA}/jre" "${JAVA_NAME_THIRD_ALPHA}")
   assertTrue "Did not find installed Java environments" "[ '${expected[*]}' == '${list[*]}' ]"
 }
 
@@ -203,9 +214,9 @@
 
 #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"
+  create_valid_jdk_env "${JAVA_NAME}"
+  output=$(try_unset_default "${JAVA_NAME}")
+  expected="'${JAVA_NAME}' is not set as Java environment default"
   assertEquals 'Wrong message' "${expected}" "${output}"
   assertDefaultNotSet
 }