#135: adjust exception assertion to also assert for jar tests

sogis · Aug 16, 2024 · 20b649d · 20b649d
1 parent 140a2be
commit 20b649d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Av2chTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Av2chTest.java
@@ -46,7 +46,7 @@ public void transformationFileSet_Ok() throws Exception {
     public void transformation_Fail() throws Exception {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/Av2chFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "transform");
         });
     }

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/CsvValidatorTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/CsvValidatorTest.java
@@ -21,7 +21,7 @@ public void validationOk() throws Exception {
     public void validationFail() {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/CsvValidatorFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate");
         });
     }

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/CurlTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/CurlTest.java
@@ -72,7 +72,7 @@ public void geodienste_Fail() {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/CurlGeodienste");
         GradleVariable[] variables = { GradleVariable.newGradleProperty("mockWebServerPort", String.valueOf(mockWebServer.getPort())) };
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "uploadData", variables);
         });
     }

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/GpkgValidatorTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/GpkgValidatorTest.java
@@ -21,7 +21,7 @@ public void validationOk() throws Exception {
     public void validationFail() {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/GpkgValidatorFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate");
         });
     }

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateDatasetTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateDatasetTest.java
@@ -51,7 +51,7 @@ public void validateMultipleDataset_Ok() throws Exception {
     public void validateData_Fail() throws Exception {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/Ili2pgValidateDatasetFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate", gradleVariables);
         });
 

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/Ili2pgValidateTest.java
@@ -42,7 +42,7 @@ public void validateData_Ok() throws Exception {
     public void validateData_Fail() throws Exception {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/Ili2pgValidateFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate", gradleVariables);
         });
 

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/IliValidatorTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/IliValidatorTest.java
@@ -27,7 +27,7 @@ public void validationFileSetOk() throws Exception {
     public void validationFail() {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/IliValidatorFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate");
         });
     }

diff --git a/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/ShpValidatorTest.java b/gretl/src/integrationTest/java/ch/so/agi/gretl/jobs/ShpValidatorTest.java
@@ -22,7 +22,7 @@ public void validationOk() throws Exception {
     public void validationFail() {
         File projectDirectory = new File(System.getProperty("user.dir") + "/src/integrationTest/jobs/ShpValidatorFail");
 
-        assertThrows(AssertionError.class, () -> {
+        assertThrows(Throwable.class, () -> {
             IntegrationTestUtil.executeTestRunner(projectDirectory, "validate");
         });
     }