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

[Guillaume Alaux]

    Date: Thursday, July 17, 2014 @ 00:09:56
  Author: guillaume
Revision: 216936

Add unit tests to archlinux-java

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

--------------------------+
 bin_archlinux-java       |   19 ++++++++++++-------
 bin_archlinux-java_tests |   17 ++++++++++++-----
 2 files changed, 24 insertions(+), 12 deletions(-)

Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java	2014-07-16 22:00:57 UTC (rev 216935)
+++ bin_archlinux-java	2014-07-16 22:09:56 UTC (rev 216936)
@@ -136,13 +136,18 @@
     if [ "x${default}" != "x" ]; then
       unset_default
     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
-        set_default_to ${java}
-        exit 0
-      fi
-    done
+    installed=($(get_installed_javas))
+    if [ ${#installed[@]} -eq 0 ]; then
+      echo 'No valid Java environment found'
+    else
+      to_check=('java-7-openjdk' 'java-7-openjdk/jre' ${installed})
+      for java in ${to_check[@]}; do
+        if is_java_valid ${java}; then
+          set_default_to ${java}
+          exit 0
+        fi
+      done
+    fi
   fi
 }
 

Modified: bin_archlinux-java_tests
===================================================================
--- bin_archlinux-java_tests	2014-07-16 22:00:57 UTC (rev 216935)
+++ bin_archlinux-java_tests	2014-07-16 22:09:56 UTC (rev 216936)
@@ -263,12 +263,19 @@
   assertDefaultSetTo "java-7-openjdk/jre"
 }
 
-#test_fix_default_default_invalid_random_java_installed() {
-#}
-#
-#test_fix_default_default_invalid_no_java_installed() {
-#}
+test_fix_default_default_invalid_random_java_installed() {
+  create_valid_jdk_env "${JAVA_NAME}"
+  output=$(fix_default)
+  expected="Setting Java environment '${JAVA_NAME}' as default"
+  assertEquals 'Wrong message' "${expected}" "${output}"
+  assertDefaultSetTo "${JAVA_NAME}"
+}
 
+test_fix_default_default_invalid_no_java_installed() {
+  assertEquals 'Wrong message' "No valid Java environment found" "$(fix_default)"
+  assertDefaultNotSet
+}
 
+
 # load shunit2
 . shunit2-2.1.6/src/shunit2