Skip to content

[karaf-4.4.x] karaf-maven-plugin: Remove try/catch blocks from tests (#2074) #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbonofre merged 1 commit into from
Oct 5, 2025
Merged

[karaf-4.4.x] karaf-maven-plugin: Remove try/catch blocks from tests (#2074) #2077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-aggregate-features/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-basic-generation/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-check-dependencies-failure/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-check-dependencies/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-feature-dependencies/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-feature-use-base-version/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions ...g/karaf-maven-plugin/src/it/test-feature-use-version-range-transfer-properties/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-feature-use-version-range-transitive/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-feature-use-version-range/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-include-project-artifact/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-input-file/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
1 change: 1 addition & 0 deletions tooling/karaf-maven-plugin/src/it/test-recursive/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-rename-main-feature/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-repository-dependencies/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-simplify-bundles/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-transitive-as-dependency/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
6 changes: 2 additions & 4 deletions tooling/karaf-maven-plugin/src/it/test-type-classifier/verify.bsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Loading