This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository jboss-modules.
commit 8410be24e001250fe305ae881fa10641edf58d26 Author: Markus Koschany <[email protected]> Date: Sun Feb 18 18:52:07 2018 +0100 Add no-ModuleIteratorTest because shrinkrwap is not available. --- debian/patches/no-ModuleIteratorTest.patch | 155 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 156 insertions(+) diff --git a/debian/patches/no-ModuleIteratorTest.patch b/debian/patches/no-ModuleIteratorTest.patch new file mode 100644 index 0000000..9d5699a --- /dev/null +++ b/debian/patches/no-ModuleIteratorTest.patch @@ -0,0 +1,155 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 18 Feb 2018 18:51:48 +0100 +Subject: no ModuleIteratorTest + +--- + .../java/org/jboss/modules/ModuleIteratorTest.java | 140 --------------------- + 1 file changed, 140 deletions(-) + delete mode 100644 src/test/java/org/jboss/modules/ModuleIteratorTest.java + +diff --git a/src/test/java/org/jboss/modules/ModuleIteratorTest.java b/src/test/java/org/jboss/modules/ModuleIteratorTest.java +deleted file mode 100644 +index 5b834f0..0000000 +--- a/src/test/java/org/jboss/modules/ModuleIteratorTest.java ++++ /dev/null +@@ -1,140 +0,0 @@ +-/* +- * JBoss, Home of Professional Open Source. +- * Copyright 2014 Red Hat, Inc., and individual contributors +- * as indicated by the @author tags. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.jboss.modules; +- +-import java.io.File; +-import java.io.IOException; +-import java.util.Iterator; +-import java.util.jar.JarFile; +- +-import org.jboss.modules.filter.PathFilter; +-import org.jboss.modules.filter.PathFilters; +-import org.jboss.modules.util.TestModuleLoader; +-import org.jboss.shrinkwrap.api.ShrinkWrap; +-import org.jboss.shrinkwrap.api.asset.StringAsset; +-import org.jboss.shrinkwrap.api.exporter.ZipExporter; +-import org.jboss.shrinkwrap.api.spec.JavaArchive; +-import org.junit.Assert; +-import org.junit.Test; +- +-/** +- * +- * +- * @author [email protected] +- */ +-public class ModuleIteratorTest extends AbstractModuleTestCase { +- +- private static final ModuleIdentifier MODULE_A = ModuleIdentifier.fromString("a"); +- private static final ModuleIdentifier MODULE_B = ModuleIdentifier.fromString("b"); +- +- @Test +- public void testMetaInfServicesIterator() throws Exception { +- TestModuleLoader moduleLoader = new TestModuleLoader(); +- +- ModuleSpec.Builder builder = ModuleSpec.build(MODULE_A); +- builder.addDependency(new ModuleDependencySpecBuilder() +- .setName(MODULE_B.toString()) +- .build()); +- PathFilter importFilter = PathFilters.getMetaInfServicesFilter(); +- builder.addDependency(new ModuleDependencySpecBuilder() +- .setImportFilter(importFilter) +- .setExport(true) +- .setModuleLoader(moduleLoader) +- .setName(MODULE_B.toString()) +- .build()); +- moduleLoader.addModuleSpec(builder.create()); +- +- builder = ModuleSpec.build(MODULE_B); +- ResourceLoader resB = new JarFileResourceLoader("jarB", toJarFile(getModuleB())); +- builder.addResourceRoot(ResourceLoaderSpec.createResourceLoaderSpec(resB)); +- builder.addDependency(DependencySpec.createLocalDependencySpec()); +- moduleLoader.addModuleSpec(builder.create()); +- +- Module moduleA = moduleLoader.loadModule(MODULE_A); +- Iterator<Resource> itres = moduleA.iterateResources(PathFilters.getMetaInfServicesFilter()); +- Assert.assertTrue("Found a resource", itres.hasNext()); +- Assert.assertEquals("META-INF/services/org/apache/camel/component/jms", itres.next().getName()); +- Assert.assertFalse("No other resource", itres.hasNext()); +- } +- +- @Test +- public void testIterateModules() throws Exception { +- IterableModuleFinder fakeFinder = new IterableModuleFinder() { +- private ModuleIdentifier[] modules = { ModuleIdentifier.create("a"), ModuleIdentifier.create("b")}; +- +- @Override +- public Iterator<ModuleIdentifier> iterateModules(ModuleIdentifier baseIdentifier, boolean recursive) { +- return new Iterator<ModuleIdentifier>() { +- private int pos = 0; +- +- @Override +- public boolean hasNext() { +- return pos < modules.length; +- } +- +- @Override +- public ModuleIdentifier next() { +- return modules[pos++]; +- } +- +- @Override +- public void remove() { +- throw new UnsupportedOperationException(); +- } +- }; +- } +- +- @Override +- public ModuleSpec findModule(String name, ModuleLoader delegateLoader) +- throws ModuleLoadException { +- for (ModuleIdentifier m : modules) { +- if (m.equals(name)) { +- return ModuleSpec.build(m).create(); +- } +- } +- return null; +- } +- }; +- +- ModuleLoader loader = new ModuleLoader(new ModuleFinder[]{fakeFinder}); +- +- Iterator<ModuleIdentifier> it = loader.iterateModules((ModuleIdentifier) null, true); +- int count = 0; +- while (it.hasNext()) { +- it.next(); +- count++; +- } +- +- Assert.assertEquals(2, count); +- } +- +- private JarFile toJarFile(JavaArchive archive) throws IOException { +- ZipExporter exporter = archive.as(ZipExporter.class); +- File targetFile = new File("target/shrinkwrap/" + archive.getName()); +- targetFile.getParentFile().mkdirs(); +- exporter.exportTo(targetFile, true); +- return new JarFile(targetFile); +- } +- +- private JavaArchive getModuleB() { +- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "moduleB"); +- archive.addAsManifestResource(new StringAsset("someContent"), "services/org/apache/camel/component/jms"); +- return archive; +- } +-} diff --git a/debian/patches/series b/debian/patches/series index ca4b8a7..27d1eec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ build.patch duplicate-tag.patch invalid-release-flag.patch +no-ModuleIteratorTest.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-modules.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
