Repository: any23 Updated Branches: refs/heads/master 8f0db89ea -> 258c19150
ANY23-331 put META-INF/services tool entries into correct jar file Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/258c1915 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/258c1915 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/258c1915 Branch: refs/heads/master Commit: 258c191507cd42ba01fcc59d82219b951c2801da Parents: 8f0db89 Author: Hans <[email protected]> Authored: Thu Apr 12 22:10:19 2018 -0500 Committer: Hans <[email protected]> Committed: Thu Apr 12 22:10:19 2018 -0500 ---------------------------------------------------------------------- .../META-INF/services/org.apache.any23.cli.Tool | 6 ++++ .../any23/cli/Any23PluginManagerToolsTest.java | 32 ++++++++++++++++++++ .../META-INF/services/org.apache.any23.cli.Tool | 6 ---- .../any23/plugin/Any23PluginManagerTest.java | 7 ----- 4 files changed, 38 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/258c1915/cli/src/main/resources/META-INF/services/org.apache.any23.cli.Tool ---------------------------------------------------------------------- diff --git a/cli/src/main/resources/META-INF/services/org.apache.any23.cli.Tool b/cli/src/main/resources/META-INF/services/org.apache.any23.cli.Tool new file mode 100644 index 0000000..6e5a533 --- /dev/null +++ b/cli/src/main/resources/META-INF/services/org.apache.any23.cli.Tool @@ -0,0 +1,6 @@ +org.apache.any23.cli.ExtractorDocumentation +org.apache.any23.cli.MicrodataParser +org.apache.any23.cli.MimeDetector +org.apache.any23.cli.PluginVerifier +org.apache.any23.cli.Rover +org.apache.any23.cli.VocabPrinter http://git-wip-us.apache.org/repos/asf/any23/blob/258c1915/cli/src/test/java/org/apache/any23/cli/Any23PluginManagerToolsTest.java ---------------------------------------------------------------------- diff --git a/cli/src/test/java/org/apache/any23/cli/Any23PluginManagerToolsTest.java b/cli/src/test/java/org/apache/any23/cli/Any23PluginManagerToolsTest.java new file mode 100644 index 0000000..f9e6a38 --- /dev/null +++ b/cli/src/test/java/org/apache/any23/cli/Any23PluginManagerToolsTest.java @@ -0,0 +1,32 @@ +package org.apache.any23.cli; + +import org.apache.any23.plugin.Any23PluginManager; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.util.Iterator; + +import static org.junit.Assert.assertTrue; + +public class Any23PluginManagerToolsTest { + + private Any23PluginManager manager; + + @Before + public void before() { + manager = Any23PluginManager.getInstance(); + } + + @After + public void after() { + manager = null; + } + + @Test + public void testGetTools() throws IOException { + Iterator<Tool> tools = manager.getTools(); + assertTrue(tools.hasNext()); // NOTE: Punctual tool detection verification done by ToolRunnerTest.java + } +} http://git-wip-us.apache.org/repos/asf/any23/blob/258c1915/core/src/main/resources/META-INF/services/org.apache.any23.cli.Tool ---------------------------------------------------------------------- diff --git a/core/src/main/resources/META-INF/services/org.apache.any23.cli.Tool b/core/src/main/resources/META-INF/services/org.apache.any23.cli.Tool deleted file mode 100644 index 6e5a533..0000000 --- a/core/src/main/resources/META-INF/services/org.apache.any23.cli.Tool +++ /dev/null @@ -1,6 +0,0 @@ -org.apache.any23.cli.ExtractorDocumentation -org.apache.any23.cli.MicrodataParser -org.apache.any23.cli.MimeDetector -org.apache.any23.cli.PluginVerifier -org.apache.any23.cli.Rover -org.apache.any23.cli.VocabPrinter http://git-wip-us.apache.org/repos/asf/any23/blob/258c1915/core/src/test/java/org/apache/any23/plugin/Any23PluginManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/any23/plugin/Any23PluginManagerTest.java b/core/src/test/java/org/apache/any23/plugin/Any23PluginManagerTest.java index b11d2bb..4b373e5 100644 --- a/core/src/test/java/org/apache/any23/plugin/Any23PluginManagerTest.java +++ b/core/src/test/java/org/apache/any23/plugin/Any23PluginManagerTest.java @@ -29,7 +29,6 @@ import java.util.Iterator; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.apache.any23.cli.Tool; import org.apache.any23.extractor.ExtractorFactory; import org.junit.After; import org.junit.Before; @@ -55,12 +54,6 @@ public class Any23PluginManagerTest { } @Test - public void testGetTools() throws IOException { - Iterator<Tool> tools = manager.getTools(); - assertTrue(tools.hasNext()); // NOTE: Punctual tool detection verification done by ToolRunnerTest.java - } - - @Test public void testGetPlugins() throws IOException { Iterator<ExtractorFactory> extractorPlugins = manager.getExtractors(); assertTrue(extractorPlugins.hasNext());
