fix tests

ls1intum · Dec 31, 2023 · 8f49585 · 8f49585
1 parent e7f77df
commit 8f49585
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 17 deletions.
diff --git a/src/main/resources/templates/aeolus/assembler/default.sh b/src/main/resources/templates/aeolus/assembler/default.sh
@@ -47,7 +47,8 @@ junit () {
   chmod -R 777 .
 
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/haskell/default.sh b/src/main/resources/templates/aeolus/haskell/default.sh
@@ -14,7 +14,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/haskell/default_sequential.sh b/src/main/resources/templates/aeolus/haskell/default_sequential.sh
@@ -23,7 +23,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/java/plain_gradle_static.sh b/src/main/resources/templates/aeolus/java/plain_gradle_static.sh
@@ -17,7 +17,8 @@ setup_working_directory_for_cleanup () {
   echo '⚙️ executing setup_working_directory_for_cleanup'
   chmod -R 777 .
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/java/plain_gradle_static_coverage.sh b/src/main/resources/templates/aeolus/java/plain_gradle_static_coverage.sh
@@ -17,7 +17,8 @@ setup_working_directory_for_cleanup () {
   echo '⚙️ executing setup_working_directory_for_cleanup'
   chmod -R 777 .
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/java/plain_maven_static.sh b/src/main/resources/templates/aeolus/java/plain_maven_static.sh
@@ -10,7 +10,8 @@ static_analysis () {
   echo '⚙️ executing static_analysis'
   mvn spotbugs:spotbugs checkstyle:checkstyle pmd:pmd pmd:cpd
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/java/plain_maven_static_coverage.sh b/src/main/resources/templates/aeolus/java/plain_maven_static_coverage.sh
@@ -15,7 +15,8 @@ maven_1 () {
   echo '⚙️ executing maven_1'
   mvn spotbugs:spotbugs checkstyle:checkstyle pmd:pmd pmd:cpd
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/kotlin/default.sh b/src/main/resources/templates/aeolus/kotlin/default.sh
@@ -10,7 +10,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/kotlin/default_coverage.sh b/src/main/resources/templates/aeolus/kotlin/default_coverage.sh
@@ -15,7 +15,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/kotlin/default_sequential.sh b/src/main/resources/templates/aeolus/kotlin/default_sequential.sh
@@ -17,7 +17,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/ocaml/default.sh b/src/main/resources/templates/aeolus/ocaml/default.sh
@@ -14,7 +14,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/python/default.sh b/src/main/resources/templates/aeolus/python/default.sh
@@ -14,7 +14,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/python/default_sequential.sh b/src/main/resources/templates/aeolus/python/default_sequential.sh
@@ -21,7 +21,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/swift/plain.sh b/src/main/resources/templates/aeolus/swift/plain.sh
@@ -39,7 +39,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/swift/plain_static.sh b/src/main/resources/templates/aeolus/swift/plain_static.sh
@@ -46,7 +46,8 @@ cd assignment
 swiftlint > ../target/swiftlint-result.xml
 
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/main/resources/templates/aeolus/vhdl/default.sh b/src/main/resources/templates/aeolus/vhdl/default.sh
@@ -45,7 +45,8 @@ junit () {
   echo '⚙️ executing junit'
   #empty script action, just for the results
 }
-function final_aeolus_post_action () {
+
+final_aeolus_post_action () {
   set +e # from now on, we don't exit on errors
   echo '⚙️ executing final_aeolus_post_action'
   cd "${AEOLUS_INITIAL_DIRECTORY}"

diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTemplateResourceTest.java b/src/test/java/de/tum/in/www1/artemis/connectors/AeolusTemplateResourceTest.java
@@ -93,11 +93,11 @@ void testValidWindfileWithInvalidAction() {
         String invalidWindfile = "{\n\"api\": \"v0.0.1\",\n\"metadata\": {\n\"name\": \"example windfile\",\n\"description\": \"example windfile\",\n\"id\": \"example-windfile\"\n},\n\"actions\": [\n{\n\"name\": \"valid-action\",\n\"clsas\": \"script-action\",\n\"scri\": \"echo $PATH\",\n\"runAlways\": true\n}\n]\n}";
         try {
             Windfile.deserialize(invalidWindfile);
+            fail("Should have thrown an exception as there is no script or platform in the actions object");
         }
         catch (JsonParseException exception) {
             assertThat(exception.getMessage()).isEqualTo("Cannot determine type");
         }
-        fail("Should have thrown an exception as there is no script or platform in the actions object");
     }
 
     @Test