From efd0bae2a9d85f8ecf093de18e5fd9893828487b Mon Sep 17 00:00:00 2001 From: Arnoud Glimmerveen Date: Fri, 20 Dec 2024 10:11:29 +0000 Subject: [PATCH] Removed integration tests within the maven sub project, as it is functionally covered by RunResolutionTest Signed-off-by: Arnoud Glimmerveen --- .../invoker.properties | 7 --- .../pom.xml | 50 ------------------- .../postbuild.groovy | 39 --------------- .../test.bndrun | 11 ---- .../invoker.properties | 7 --- .../src/it/resolve-with-runstartlevel/pom.xml | 50 ------------------- .../postbuild.groovy | 39 --------------- .../it/resolve-with-runstartlevel/test.bndrun | 9 ---- 8 files changed, 212 deletions(-) delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/invoker.properties delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/pom.xml delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/postbuild.groovy delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/test.bndrun delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/invoker.properties delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/pom.xml delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/postbuild.groovy delete mode 100644 maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/test.bndrun diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/invoker.properties b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/invoker.properties deleted file mode 100644 index 9c7a7746f7..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/invoker.properties +++ /dev/null @@ -1,7 +0,0 @@ -invoker.goals=--no-transfer-progress package - -# Run mvn with --debug for debug logging -#invoker.debug=true - -# Run mvn in debugging mode and wait for a debugger to attach -#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/pom.xml b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/pom.xml deleted file mode 100644 index f513843804..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - 4.0.0 - - - biz.aQute.bnd-test - resolver-test - 0.0.1 - ../parent - - - resolve-with-starlevel-and-runbundles-decorator - 0.0.1 - pom - - - - org.slf4j - slf4j-api - 1.7.36 - - - ch.qos.logback - logback-classic - 1.2.13 - - - org.apache.felix - org.apache.felix.eventadmin - 1.4.8 - runtime - - - org.apache.felix - org.apache.felix.framework - 5.4.0 - runtime - - - - - - - biz.aQute.bnd - bnd-resolver-maven-plugin - - - - diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/postbuild.groovy b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/postbuild.groovy deleted file mode 100644 index 9bce9db49c..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/postbuild.groovy +++ /dev/null @@ -1,39 +0,0 @@ -import aQute.bnd.build.Workspace -import aQute.bnd.build.model.BndEditModel -import aQute.bnd.osgi.Processor -import aQute.bnd.properties.Document -import aQute.lib.io.IO; - -// The resolve-with-starlevel-and-runbundles-decorator case - -// Check the bndrun file exist! -File bndrunFile = new File(basedir, 'test.bndrun') -assert bndrunFile.isFile() - -// Load the BndEditModel of the bndrun file so we can inspect the result -Processor processor = new Processor() -processor.setProperties(bndrunFile) -BndEditModel bem = new BndEditModel(Workspace.createStandaloneWorkspace(processor, bndrunFile.toURI())) -Document doc = new Document(IO.collect(bndrunFile)) -bem.loadFrom(doc) - -// Get the -runbundles. -def bemRunBundles = bem.getRunBundles() -assert bemRunBundles -assert bemRunBundles.size() == 4 - -StringBuilder sb = new StringBuilder() -bemRunBundles.get(0).formatTo(sb) -assert sb.toString() == "org.apache.felix.eventadmin;version='[1.4.8,1.4.9)';startlevel=1000" - -sb = new StringBuilder() -bemRunBundles.get(1).formatTo(sb) -assert sb.toString() == "ch.qos.logback.core;version='[1.2.13,1.2.14)';startlevel=1001" - -sb = new StringBuilder() -bemRunBundles.get(2).formatTo(sb) -assert sb.toString() == "ch.qos.logback.classic;version='[1.2.13,1.2.14)';startlevel=1002" - -sb = new StringBuilder() -bemRunBundles.get(3).formatTo(sb) -assert sb.toString() == "slf4j.api;version='[1.7.36,1.7.37)';startlevel=999" diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/test.bndrun b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/test.bndrun deleted file mode 100644 index 063c026bb0..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel-and-runbundles-decorator/test.bndrun +++ /dev/null @@ -1,11 +0,0 @@ --runfw: org.apache.felix.framework --runrequires: \ - osgi.identity;filter:='(osgi.identity=org.apache.felix.eventadmin)',\ - osgi.identity;filter:='(osgi.identity=slf4j.api)' - --runbundles+: slf4j.api; startlevel=999 - --runstartlevel: \ - order = leastdependenciesfirst, \ - begin = 1000, \ - step = 1 diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/invoker.properties b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/invoker.properties deleted file mode 100644 index 9c7a7746f7..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/invoker.properties +++ /dev/null @@ -1,7 +0,0 @@ -invoker.goals=--no-transfer-progress package - -# Run mvn with --debug for debug logging -#invoker.debug=true - -# Run mvn in debugging mode and wait for a debugger to attach -#invoker.environmentVariables.MAVEN_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/pom.xml b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/pom.xml deleted file mode 100644 index 29fd2812b2..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - 4.0.0 - - - biz.aQute.bnd-test - resolver-test - 0.0.1 - ../parent - - - resolve-with-starlevel - 0.0.1 - pom - - - - org.slf4j - slf4j-api - 1.7.36 - - - ch.qos.logback - logback-classic - 1.2.13 - - - org.apache.felix - org.apache.felix.eventadmin - 1.4.8 - runtime - - - org.apache.felix - org.apache.felix.framework - 5.4.0 - runtime - - - - - - - biz.aQute.bnd - bnd-resolver-maven-plugin - - - - diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/postbuild.groovy b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/postbuild.groovy deleted file mode 100644 index 6b26baa52c..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/postbuild.groovy +++ /dev/null @@ -1,39 +0,0 @@ -import aQute.bnd.build.Workspace -import aQute.bnd.build.model.BndEditModel -import aQute.bnd.osgi.Processor -import aQute.bnd.properties.Document -import aQute.lib.io.IO; - -// The resolve-with-starlevel case - -// Check the bndrun file exist! -File bndrunFile = new File(basedir, 'test.bndrun') -assert bndrunFile.isFile() - -// Load the BndEditModel of the bndrun file so we can inspect the result -Processor processor = new Processor() -processor.setProperties(bndrunFile) -BndEditModel bem = new BndEditModel(Workspace.createStandaloneWorkspace(processor, bndrunFile.toURI())) -Document doc = new Document(IO.collect(bndrunFile)) -bem.loadFrom(doc) - -// Get the -runbundles. -def bemRunBundles = bem.getRunBundles() -assert bemRunBundles -assert bemRunBundles.size() == 4 - -StringBuilder sb = new StringBuilder() -bemRunBundles.get(0).formatTo(sb) -assert sb.toString() == "org.apache.felix.eventadmin;version='[1.4.8,1.4.9)';startlevel=1000" - -sb = new StringBuilder() -bemRunBundles.get(1).formatTo(sb) -assert sb.toString() == "ch.qos.logback.core;version='[1.2.13,1.2.14)';startlevel=1001" - -sb = new StringBuilder() -bemRunBundles.get(2).formatTo(sb) -assert sb.toString() == "ch.qos.logback.classic;version='[1.2.13,1.2.14)';startlevel=1002" - -sb = new StringBuilder() -bemRunBundles.get(3).formatTo(sb) -assert sb.toString() == "slf4j.api;version='[1.7.36,1.7.37)';startlevel=1003" diff --git a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/test.bndrun b/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/test.bndrun deleted file mode 100644 index 161f5fe2a9..0000000000 --- a/maven-plugins/bnd-resolver-maven-plugin/src/it/resolve-with-runstartlevel/test.bndrun +++ /dev/null @@ -1,9 +0,0 @@ --runfw: org.apache.felix.framework --runrequires: \ - osgi.identity;filter:='(osgi.identity=org.apache.felix.eventadmin)',\ - osgi.identity;filter:='(osgi.identity=slf4j.api)' - --runstartlevel: \ - order = leastdependenciesfirst, \ - begin = 1000, \ - step = 1