Permalink
Browse files

tests are now working too

  • Loading branch information...
1 parent 5547bf9 commit ef258d82c575ec8a73bfb9f2afbc26761155e54b Dennis Geurts committed Apr 22, 2012
Showing with 12 additions and 4 deletions.
  1. +6 −0 bin/compile
  2. +4 −2 test/compile_test.sh
  3. +1 −1 test/detect_test.sh
  4. +1 −1 test/release_test.sh
View
6 bin/compile
@@ -45,6 +45,12 @@ else
echo "done!"
fi
+
+if [ ! -f $BUILD_DIR/build.xml ] ; then
+ echo "Failed to build app with Apache Ant"
+fi
+
+
# change to build dir to run ant
cd $BUILD_DIR
View
6 test/compile_test.sh
@@ -22,7 +22,8 @@ EOF
testCompile()
{
- createBuildFile "$(withDependency)"
+
+ createBuildFile
compile
@@ -31,7 +32,8 @@ testCompile()
assertCaptured "Installing Apache Ant 1.8.3"
assertTrue "ant should be executable" "[ -x ${BUILD_DIR}/.buildpack/apache-ant-1.8.3/bin/ant ]"
- assertCaptured "executing ${BUILD_DIR}/.buildpack/apache-ant-1.8.3/bin/ant clean install"
+ assertCaptured "executing ${BUILD_DIR}/.buildpack/apache-ant-1.8.3/bin/ant"
+ assertCaptured "clean install"
assertCaptured "BUILD SUCCESS"
}
View
2 test/detect_test.sh
@@ -8,7 +8,7 @@ testDetect()
detect
- assertAppDetected "Java"
+ assertAppDetected "Java (using Apache Ant 1.8.3)"
}
testNoDetectMissingBuildFile()
View
2 test/release_test.sh
@@ -14,7 +14,7 @@ addons:
shared-database:5mb
-EOF
+EOF`
release

0 comments on commit ef258d8

Please sign in to comment.