This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new b2170220b7 karaf-maven-plugin: Remove try/catch blocks from tests
(#2074)
b2170220b7 is described below
commit b2170220b775b119411f9883a486af281ae09624
Author: Holger Friedrich <[email protected]>
AuthorDate: Tue Sep 30 15:47:07 2025 +0200
karaf-maven-plugin: Remove try/catch blocks from tests (#2074)
Error messages including the root cause are now being printed in case the
test is failing.
Signed-off-by: Holger Friedrich <[email protected]>
---
.../karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh | 6 ++----
tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh | 6 ++----
.../src/it/test-check-dependencies-failure/verify.bsh | 6 ++----
.../karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh | 6 ++----
.../karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh | 6 ++----
.../src/it/test-feature-use-base-version/verify.bsh | 6 ++----
.../test-feature-use-version-range-transfer-properties/verify.bsh | 6 ++----
.../src/it/test-feature-use-version-range-transitive/verify.bsh | 6 ++----
.../src/it/test-feature-use-version-range/verify.bsh | 6 ++----
.../src/it/test-include-project-artifact/verify.bsh | 6 ++----
tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh | 6 ++----
tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh | 1 +
.../karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh | 6 ++----
.../src/it/test-repository-dependencies/verify.bsh | 6 ++----
tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh | 6 ++----
.../src/it/test-transitive-as-dependency/verify.bsh | 6 ++----
tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh | 6 ++----
17 files changed, 33 insertions(+), 64 deletions(-)
diff --git
a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh
index 38c7ae15c8..8f1100bb61 100644
--- a/tooling/karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh
@@ -26,9 +26,7 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"aggregate-features/target/feature/feature.xml");
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git a/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh
index 6af1a7c85e..cf7508a268 100644
--- a/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/verify.bsh
index c5515354e0..b02c83fee2 100644
---
a/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/verify.bsh
+++
b/tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"dependencies-features/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh
index c5515354e0..b02c83fee2 100644
--- a/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"dependencies-features/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh
index c5515354e0..b02c83fee2 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"dependencies-features/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-feature-use-base-version/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-feature-use-base-version/verify.bsh
index 6af1a7c85e..cf7508a268 100644
--- a/tooling/karaf-maven-plugin/src/it/test-feature-use-base-version/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-feature-use-base-version/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/verify.bsh
index 140050291a..5a4f9d1a44 100644
---
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/verify.bsh
+++
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "feature/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transitive/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transitive/verify.bsh
index 140050291a..5a4f9d1a44 100644
---
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transitive/verify.bsh
+++
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transitive/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "feature/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range/verify.bsh
index 6af1a7c85e..cf7508a268 100644
---
a/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range/verify.bsh
+++
b/tooling/karaf-maven-plugin/src/it/test-feature-use-version-range/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/verify.bsh
index 6af1a7c85e..cf7508a268 100644
--- a/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-include-project-artifact/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git a/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh
index 6af1a7c85e..cf7508a268 100644
--- a/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git a/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh
index c2b765a31c..eea2fae856 100644
--- a/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh
@@ -21,6 +21,7 @@ import org.custommonkey.xmlunit.*;
import java.io.*;
import java.lang.*;
+// TODO fix this testcase
//String control = "<features
xmlns=\"http://karaf.apache.org/xmlns/features/v1.0.0\";
name=\"test-basic-generation\"/>";
//
//File generated = new File( basedir, "target/feature/feature.xml" );
diff --git
a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh
index 6af1a7c85e..cf7508a268 100644
--- a/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir, "target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/verify.bsh
index 97f7ccc25c..d0cf5bf106 100644
--- a/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-repository-dependencies/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"dependency-feature-a/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh
index 78f37fd8fa..a6398ae94c 100644
--- a/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh
@@ -26,9 +26,7 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"simplify-features/target/feature/feature.xml");
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git
a/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/verify.bsh
index 78e7571c11..a31e48adcd 100644
--- a/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/verify.bsh
@@ -26,10 +26,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// load the features file pushed to the repository
File generated = new File(basedir,
"transitive-as-dependency-feature/target/feature/feature.xml" );
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
diff --git a/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh
b/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh
index d82e6fff6c..7d1502716f 100644
--- a/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh
+++ b/tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh
@@ -29,10 +29,8 @@ Reader r = new FileReader(new File(basedir, "control.xml"));
// TODO: repository and build offline (see KARAF-2927)
File generated = new File(basedir, "target/feature/feature.xml");
if (generated.exists()) {
- try {
- XMLAssert.assertXMLEqual(r, new FileReader(generated));
- return true;
- } catch (Throwable ignored) { }
+ XMLAssert.assertXMLEqual(r, new FileReader(generated));
+ return true;
}
return false;
