update tests to not overwrite test results
diff --git a/hudson-scripts/tests/all-tests.sh b/hudson-scripts/tests/all-tests.sh
new file mode 100755
index 0000000..12ec22c
--- /dev/null
+++ b/hudson-scripts/tests/all-tests.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# ====================================================================
+# Copyright (c) 2014 Obeo
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Obeo - initial API and implementation
+# ====================================================================
+
+_SCRIPT_PATH="$(dirname "${0}")"
+
+"${_SCRIPT_PATH}/test-publish-nightly.sh"
+"${_SCRIPT_PATH}/test-clean-nightly.sh"
+"${_SCRIPT_PATH}/test-git-publish.sh"
\ No newline at end of file
diff --git a/hudson-scripts/tests/test-clean-nightly.sh b/hudson-scripts/tests/test-clean-nightly.sh
index d6f8fac..f709732 100755
--- a/hudson-scripts/tests/test-clean-nightly.sh
+++ b/hudson-scripts/tests/test-clean-nightly.sh
@@ -41,6 +41,19 @@
# done
# exit 0
+beforeClass_this() {
+ # cleaning test folder
+ if [ -d "${ECLIPSE_DOCUMENT_ROOT}" ]; then
+ LSTEST "Removing test folder '${ECLIPSE_DOCUMENT_ROOT}'"
+ rm -rf "${ECLIPSE_DOCUMENT_ROOT}"
+ fi
+ mkdir -p "${ECLIPSE_DOCUMENT_ROOT}"
+
+ if [ ! -d "${UPDATE_NIGHTLY_HOME}" ]; then
+ mkdir -p "${UPDATE_NIGHTLY_HOME}"
+ fi
+}
+
test01() {
LSTEST "Test clean-nightly 01"
rm -rf "${UPDATE_NIGHTLY_HOME}/"*
@@ -770,7 +783,8 @@
assertEmptyFolder "${UPDATE_NIGHTLY_HOME}" "clean-nightly" "test14 all" "${reports}"
}
-beforeTest "${reports}"
+beforeClass_this
+beforeClass "${reports}"
test01
test02
@@ -787,4 +801,4 @@
test13
test14
-afterTest "${reports}"
\ No newline at end of file
+afterClass "${reports}"
\ No newline at end of file
diff --git a/hudson-scripts/tests/test-git-publish.sh b/hudson-scripts/tests/test-git-publish.sh
index 84c35f5..db99b12 100755
--- a/hudson-scripts/tests/test-git-publish.sh
+++ b/hudson-scripts/tests/test-git-publish.sh
@@ -12,7 +12,6 @@
# Test specific constants
export WORKING_DIRECTORY="$(pwd)/target"
-export ECLIPSE_DOCUMENT_ROOT="${WORKING_DIRECTORY}/tests"
export SCRIPT_PATH="$(dirname "${0}")"
export INIT_PATH="${SCRIPT_PATH}/../init"
@@ -22,9 +21,9 @@
dummyGitRepo="${SCRIPT_PATH}/data/dummy-git-repo.tar.gz"
-remotes="${ECLIPSE_DOCUMENT_ROOT}/remotes"
-locals="${ECLIPSE_DOCUMENT_ROOT}/locals"
-reports="${ECLIPSE_DOCUMENT_ROOT}/results-git-publish.txt"
+remotes="${WORKING_DIRECTORY}/tests/remotes"
+locals="${WORKING_DIRECTORY}/tests/locals"
+reports="${WORKING_DIRECTORY}/tests/results-git-publish.txt"
test01() {
LSTEST "Testing git_updateLocalRepository 01"
@@ -128,11 +127,11 @@
cd "${oldPwd}"
}
-beforeTest "${reports}"
+beforeClass "${reports}"
test01
test02
test03
test04
-afterTest "${reports}"
\ No newline at end of file
+afterClass "${reports}"
\ No newline at end of file
diff --git a/hudson-scripts/tests/test-publish-nightly.sh b/hudson-scripts/tests/test-publish-nightly.sh
index 0edbc1d..92bd77d 100755
--- a/hudson-scripts/tests/test-publish-nightly.sh
+++ b/hudson-scripts/tests/test-publish-nightly.sh
@@ -27,6 +27,20 @@
reports="${WORKING_DIRECTORY}/tests/results-publish-nightly.txt"
dummySite="file:$(pwd)/${SCRIPT_PATH}/data/dummy-site.zip"
+beforeClass_this() {
+ # cleaning test folder
+ if [ -d "${ECLIPSE_DOCUMENT_ROOT}" ]; then
+ LSTEST "Removing test folder '${ECLIPSE_DOCUMENT_ROOT}'"
+ rm -rf "${ECLIPSE_DOCUMENT_ROOT}"
+ fi
+ mkdir -p "${ECLIPSE_DOCUMENT_ROOT}"
+
+ if [ ! -d "${UPDATE_NIGHTLY_HOME}" ]; then
+ mkdir -p "${UPDATE_NIGHTLY_HOME}"
+ fi
+
+}
+
test01() {
LSTEST "Test publish-nightly 1.0.0.A"
${SCRIPT_PATH}/../publish-nightly.sh "${dummySite}" "1.0.0.A"
@@ -406,7 +420,8 @@
"file:${UPDATE_NIGHTLY_HOME}/1.4.6.A"
}
-beforeTest "${reports}"
+beforeClass_this
+beforeClass "${reports}"
test01
test02
@@ -418,4 +433,4 @@
test08
test09
-afterTest "${reports}"
\ No newline at end of file
+afterClass "${reports}"
\ No newline at end of file
diff --git a/hudson-scripts/tests/test-utils.sh b/hudson-scripts/tests/test-utils.sh
index 0111d5a..d50169d 100644
--- a/hudson-scripts/tests/test-utils.sh
+++ b/hudson-scripts/tests/test-utils.sh
@@ -130,27 +130,17 @@
echo "</testsuite>"
}
-beforeTest() {
+beforeClass() {
local reports="${1}"
- # cleaning test folder
- if [ -d "${ECLIPSE_DOCUMENT_ROOT}" ]; then
- LSTEST "Removing test folder '${ECLIPSE_DOCUMENT_ROOT}'"
- rm -rf "${ECLIPSE_DOCUMENT_ROOT}"
- fi
- mkdir -p "${ECLIPSE_DOCUMENT_ROOT}"
-
+
timestamp="$(date)"
echo "# ${timestamp}" > "${reports}"
xmlReports=$(echo "${reports}" | sed 's/\.txt/\.xml/')
echo "<!-- ${timestamp} -->" > "${xmlReports}"
-
- if [ ! -d "${UPDATE_NIGHTLY_HOME}" ]; then
- mkdir -p "${UPDATE_NIGHTLY_HOME}"
- fi
}
-afterTest() {
+afterClass() {
local reports="${1}"
xmlReports=$(echo "${reports}" | sed 's/\.txt/\.xml/')
toJunitXML "${reports}" >> "${xmlReports}"
